From 2c1b3579ecb6ce6e614f3ede1342e90421fe0cbc Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Thu, 7 Oct 2021 10:14:24 +0200 Subject: [PATCH] related to #1503 Translation adjustments, api fonction implementation date --- admin/themes/default/js/cat_list.js | 14 ++++++++++++-- include/ws_functions/pwg.categories.php | 2 +- include/ws_functions/pwg.php | 4 ++-- language/fr_FR/admin.lang.php | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/admin/themes/default/js/cat_list.js b/admin/themes/default/js/cat_list.js index 0a8b16f24..af4b82797 100644 --- a/admin/themes/default/js/cat_list.js +++ b/admin/themes/default/js/cat_list.js @@ -50,7 +50,11 @@ function setDisplayCompact() { padding: "8px" }); - $(".albumInfos p").css("margin", "0"); + $(".albumInfos p").css({ + margin: "0", + textAlign: "center", + whiteSpace: "normal" + }); $(".albumInfos p:last-child").css({ width: "auto" }); @@ -200,7 +204,8 @@ function setDisplayLine() { $(".albumInfos p").css({ textAlign: "right", - margin: "0" + margin: "0", + whiteSpace: "nowrap" }); $(".albumInfos p:last-child").css({ @@ -314,6 +319,11 @@ function setDisplayTile() { $(".albumInfos p:last-child").css({ width: "auto" }); + $(".albumInfos p").css({ + margin: "0", + textAlign: "center", + whiteSpace: "normal" + }); $(".albumIcon").css({ height: "80px" diff --git a/include/ws_functions/pwg.categories.php b/include/ws_functions/pwg.categories.php index 20ca842c5..2ffd6621c 100644 --- a/include/ws_functions/pwg.categories.php +++ b/include/ws_functions/pwg.categories.php @@ -1057,8 +1057,8 @@ SELECT id, name, dir /** * API method * Return the number of orphan photos if an album is deleted + * @since 12 */ - function ws_categories_calculateOrphans($param, &$service) { global $conf; diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php index 11b149d25..ca893c7a9 100644 --- a/include/ws_functions/pwg.php +++ b/include/ws_functions/pwg.php @@ -418,8 +418,8 @@ function ws_session_getStatus($params, &$service) /** * API method * Returns lines of users activity + * @since 12 */ - function ws_getActivityList($param, &$service) { global $conf; @@ -565,8 +565,8 @@ SELECT /** * API method * Returns lines of users activity + * @since 12 */ - function ws_activity_downloadLog($param, &$service) { global $conf; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index 03ec349db..2ddae3c6b 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1252,4 +1252,4 @@ $lang['action succesfully performed.'] = 'action effectuée avec succès.'; $lang['%s lines'] = "%s lignes"; $lang['%s line'] = "%s ligne"; $lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Les albums vérrouillés sont désactivé pour maintenance. Seul les administrateurs peuvent les voir dans la gallerie. Vérrouiller cet album vérouillera aussi ses sous-albums'; -$lang['Webmaster status required'] = 'Status Webmaster obligatoire'; +$lang['Webmaster status required'] = 'Statut Webmaster nécéssaire';