diff --git a/app/Locales/de_DE/translations.php b/app/Locales/de_DE/translations.php index 2bd0fabb1..b32b97789 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 #%d' => '', + // '[%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 c9b534394..a061c6ef5 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 #%d' => '', + // '[%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 5f4b2c4e1..e146be7c9 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 #%d' => '', + // '[%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 5084477a7..5f5a5c201 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 1984d0592..88ccdeb42 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 #%d' => '', + // '[%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 bedcfd711..064105357 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 #%d' => '', + // '[%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 4c273077b..1856b0867 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 #%d' => '', + // '[%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 5e66a3608..682b8bd5b 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 #%d' => '', + // '[%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 b762aedb9..9b2ca1887 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 #%d' => '', + // '[%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 d4bd084c8..b242c2f87 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 #%d' => '', + // '[%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 a494e42d2..5da385956 100644 --- a/app/Templates/user_password.php +++ b/app/Templates/user_password.php @@ -10,7 +10,7 @@
- +
diff --git a/app/helpers.php b/app/helpers.php index 85a2507d4..3586c3b35 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()