adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-20 00:23:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

related to #1378 language mistakes + csv error + changed logout icon

Browse Source
This commit is contained in:
Matthieu Leproux
2021-06-23 13:57:06 +02:00
parent cd3e07613b
commit 1c29b84932
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/themes/default/template/user_activity.tpl
+8 -7
View File
@@ -29,7 +29,8 @@ var actionType_add = "{'add'|translate}";
var actionType_delete = "{'deletion'|translate}";
var actionType_move = "{'move'|translate}";
var actionType_edit = "{'edit'|translate}";
var actionType_log = "{'log'|translate}";
var actionType_login = "{'login'|translate}";
var actionType_logout = "{'logout'|translate}";
{* Album keys *}
@@ -299,7 +300,7 @@ function lineConstructor(line) {
newLine.find(".action-icon").addClass("icon-key");
newLine.find(".action-section").addClass("icon-user-1");
newLine.find(".action-name").html(actionType_log);
newLine.find(".action-name").html(actionType_login);
console.log("userS Logged in");
final_albumInfos = actionInfos_users_logged_in.replace('%d', line.counter);
@@ -309,10 +310,10 @@ function lineConstructor(line) {
case "logout":
newLine.find(".action-type").addClass("icon-purple");
newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]);
newLine.find(".action-icon").addClass("icon-key");
newLine.find(".action-icon").addClass("icon-logout");
newLine.find(".action-section").addClass("icon-user-1");
newLine.find(".action-name").html(actionType_log);
newLine.find(".action-name").html(actionType_logout);
console.log("userS Logged in");
final_albumInfos = actionInfos_users_logged_out.replace('%d', line.counter);
@@ -482,7 +483,7 @@ function lineConstructor(line) {
newLine.find(".action-icon").addClass("icon-key");
newLine.find(".action-section").addClass("icon-user-1");
newLine.find(".action-name").html(actionType_log);
newLine.find(".action-name").html(actionType_login);
final_albumInfos = actionInfos_user_logged_in.replace('%d', line.counter);
@@ -490,10 +491,10 @@ function lineConstructor(line) {
case "logout":
newLine.find(".action-type").addClass("icon-purple");
newLine.find(".user-pic").addClass(color_icons[line.user_id % 5]);
newLine.find(".action-icon").addClass("icon-key");
newLine.find(".action-icon").addClass("icon-logout");
newLine.find(".action-section").addClass("icon-user-1");
newLine.find(".action-name").html(actionType_log);
newLine.find(".action-name").html(actionType_logout);
final_albumInfos = actionInfos_user_logged_out.replace('%d', line.counter);
include/ws_functions/pwg.php
-1
View File
@@ -466,7 +466,6 @@ function ws_activity_downloadLog($param, &$service) {
'ip_address' => $row['ip_address'],
'details' => $row['details'],
);
$line_id++;
}
header('Content-type: application/csv');
language/en_UK/admin.lang.php
+2 -1
View File
@@ -1180,7 +1180,8 @@ $lang['add'] = 'add';
$lang['deletion'] = 'deletion';
$lang['move'] = 'move';
$lang['edit'] = 'edit';
$lang['log'] = 'log';
$lang['logout'] = 'logout';
$lang['login'] = 'login';
$lang['%d album added'] = '%d album added';
$lang['%d album deleted'] = '%d album deleted';
$lang['%d album edited'] = '%d album edited';
language/fr_FR/admin.lang.php
+2 -1
View File
@@ -1182,7 +1182,8 @@ $lang['add'] = 'ajout';
$lang['deletion'] = 'suppression';
$lang['move'] = 'déplacement';
$lang['edit'] = 'édition';
$lang['log'] = 'connexion';
$lang['logout'] = 'déconnexion';
$lang['login'] = 'connection';
$lang['%d album added'] = '%d album ajouté';
$lang['%d album deleted'] = '%d album supprimé';
$lang['%d album edited'] = '%d album édité';