summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Locales/de_DE/translations.php7
-rw-r--r--app/Locales/es_ES/translations.php7
-rw-r--r--app/Locales/fi_FI/translations.php7
-rw-r--r--app/Locales/fr_FR/translations.php1
-rw-r--r--app/Locales/it_IT/translations.php7
-rw-r--r--app/Locales/pl_PL/translations.php7
-rw-r--r--app/Locales/pt_BR/translations.php7
-rw-r--r--app/Locales/ru_RU/translations.php7
-rw-r--r--app/Locales/sv_SE/translations.php7
-rw-r--r--app/Locales/zh_CN/translations.php7
-rw-r--r--app/Templates/user_password.php2
-rw-r--r--app/helpers.php5
12 files changed, 68 insertions, 3 deletions
diff --git a/app/Locales/de_DE/translations.php b/app/Locales/de_DE/translations.php
index 2bd0fabb..b32b9778 100644
--- a/app/Locales/de_DE/translations.php
+++ b/app/Locales/de_DE/translations.php
@@ -496,4 +496,11 @@ return array(
// 'Activity' => '',
// 'Default values are "%s"' => '',
// 'Default columns for new projects (Comma-separated)' => '',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/es_ES/translations.php b/app/Locales/es_ES/translations.php
index c9b53439..a061c6ef 100644
--- a/app/Locales/es_ES/translations.php
+++ b/app/Locales/es_ES/translations.php
@@ -496,4 +496,11 @@ return array(
'Activity' => 'Actividad',
'Default values are "%s"' => 'Los valores por defecto son "%s"',
'Default columns for new projects (Comma-separated)' => 'Columnas por defecto de los nuevos proyectos (Separadas mediante comas)',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/fi_FI/translations.php b/app/Locales/fi_FI/translations.php
index 5f4b2c4e..e146be7c 100644
--- a/app/Locales/fi_FI/translations.php
+++ b/app/Locales/fi_FI/translations.php
@@ -496,4 +496,11 @@ return array(
// 'Activity' => '',
// 'Default values are "%s"' => '',
// 'Default columns for new projects (Comma-separated)' => '',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/fr_FR/translations.php b/app/Locales/fr_FR/translations.php
index 5084477a..5f5a5c20 100644
--- a/app/Locales/fr_FR/translations.php
+++ b/app/Locales/fr_FR/translations.php
@@ -502,4 +502,5 @@ return array(
'[%s][Column Change] %s (#%d)' => '[%s][Changement de colonne] %s (#%d)',
'[%s][Position Change] %s (#%d)' => '[%s][Changement de position] %s (#%d)',
'[%s][Assignee Change] %s (#%d)' => '[%s][Changement d\'assigné] %s (#%d)',
+ 'New password for the user "%s"' => 'Nouveau mot de passe pour l\'utilisateur « %s »',
);
diff --git a/app/Locales/it_IT/translations.php b/app/Locales/it_IT/translations.php
index 1984d059..88ccdeb4 100644
--- a/app/Locales/it_IT/translations.php
+++ b/app/Locales/it_IT/translations.php
@@ -496,4 +496,11 @@ return array(
// 'Activity' => '',
// 'Default values are "%s"' => '',
// 'Default columns for new projects (Comma-separated)' => '',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/pl_PL/translations.php b/app/Locales/pl_PL/translations.php
index bedcfd71..06410535 100644
--- a/app/Locales/pl_PL/translations.php
+++ b/app/Locales/pl_PL/translations.php
@@ -496,4 +496,11 @@ return array(
// 'Activity' => '',
// 'Default values are "%s"' => '',
// 'Default columns for new projects (Comma-separated)' => '',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/pt_BR/translations.php b/app/Locales/pt_BR/translations.php
index 4c273077..1856b086 100644
--- a/app/Locales/pt_BR/translations.php
+++ b/app/Locales/pt_BR/translations.php
@@ -496,4 +496,11 @@ return array(
// 'Activity' => '',
// 'Default values are "%s"' => '',
// 'Default columns for new projects (Comma-separated)' => '',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/ru_RU/translations.php b/app/Locales/ru_RU/translations.php
index 5e66a360..682b8bd5 100644
--- a/app/Locales/ru_RU/translations.php
+++ b/app/Locales/ru_RU/translations.php
@@ -496,4 +496,11 @@ return array(
'Activity' => 'Активность',
'Default values are "%s"' => 'Колонки по умолчанию: "%s"',
'Default columns for new projects (Comma-separated)' => 'Колонки по умолчанию для новых проектов (разделять запятой)',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/sv_SE/translations.php b/app/Locales/sv_SE/translations.php
index b762aedb..9b2ca188 100644
--- a/app/Locales/sv_SE/translations.php
+++ b/app/Locales/sv_SE/translations.php
@@ -496,4 +496,11 @@ return array(
// 'Activity' => '',
// 'Default values are "%s"' => '',
// 'Default columns for new projects (Comma-separated)' => '',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Locales/zh_CN/translations.php b/app/Locales/zh_CN/translations.php
index d4bd084c..b242c2f8 100644
--- a/app/Locales/zh_CN/translations.php
+++ b/app/Locales/zh_CN/translations.php
@@ -496,4 +496,11 @@ return array(
// 'Activity' => '',
// 'Default values are "%s"' => '',
// 'Default columns for new projects (Comma-separated)' => '',
+ // 'Task assignee change' => '',
+ // '%s change the assignee of the task #%d' => '',
+ // '%s change the assignee of the task <a href="?controller=task&amp;action=show&amp;task_id=%d">#%d</a>' => '',
+ // '[%s][Column Change] %s (#%d)' => '',
+ // '[%s][Position Change] %s (#%d)' => '',
+ // '[%s][Assignee Change] %s (#%d)' => '',
+ // 'New password for the user "%s"' => '',
);
diff --git a/app/Templates/user_password.php b/app/Templates/user_password.php
index a494e42d..5da38595 100644
--- a/app/Templates/user_password.php
+++ b/app/Templates/user_password.php
@@ -10,7 +10,7 @@
<?= Helper\form_label(t('Current password for the user "%s"', Helper\get_username()), 'current_password') ?>
<?= Helper\form_password('current_password', $values, $errors) ?><br/>
- <?= Helper\form_label(t('Password'), 'password') ?>
+ <?= Helper\form_label(t('New password for the user "%s"', Helper\get_username($user)), 'password') ?>
<?= Helper\form_password('password', $values, $errors) ?><br/>
<?= Helper\form_label(t('Confirmation'), 'confirmation') ?>
diff --git a/app/helpers.php b/app/helpers.php
index 85a2507d..3586c3b3 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -35,9 +35,10 @@ function is_admin()
return $_SESSION['user']['is_admin'] == 1;
}
-function get_username()
+function get_username($user = false)
{
- return $_SESSION['user']['name'] ?: $_SESSION['user']['username'];
+ return $user ? ($user['name'] ?: $user['username'])
+ : ($_SESSION['user']['name'] ?: $_SESSION['user']['username']);
}
function get_user_id()
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-27 05:18:46 +0000