diff options
Diffstat (limited to 'app')
27 files changed, 48 insertions, 42 deletions
diff --git a/app/Controller/SubtaskController.php b/app/Controller/SubtaskController.php index 134b057e..5fa55f6b 100644 --- a/app/Controller/SubtaskController.php +++ b/app/Controller/SubtaskController.php @@ -49,6 +49,7 @@ class SubtaskController extends BaseController { $values = array( 'task_id' => $task['id'], + 'user_id' => $task['owner_id'], 'another_subtask' => $this->request->getIntegerParam('another_subtask', 0) ); @@ -76,7 +77,12 @@ class SubtaskController extends BaseController } if (isset($values['another_subtask']) && $values['another_subtask'] == 1) { - return $this->create(array('project_id' => $task['project_id'], 'task_id' => $task['id'], 'another_subtask' => 1)); + return $this->create(array( + 'project_id' => $task['project_id'], + 'task_id' => $task['id'], + 'user_id' => $values['user_id'], + 'another_subtask' => 1 + )); } return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true); diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php index 6518d917..fe60bb2f 100644 --- a/app/Locale/bs_BA/translations.php +++ b/app/Locale/bs_BA/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php index eb991bb5..a42b103d 100644 --- a/app/Locale/cs_CZ/translations.php +++ b/app/Locale/cs_CZ/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php index 02797797..65095cbe 100644 --- a/app/Locale/da_DK/translations.php +++ b/app/Locale/da_DK/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php index 4bcb1f49..14bf71e6 100644 --- a/app/Locale/de_DE/translations.php +++ b/app/Locale/de_DE/translations.php @@ -1296,20 +1296,20 @@ return array( 'Credentials' => 'Anmeldeinformationen', 'New user' => 'Neuer Benutzer', 'This username is already taken' => 'Dieser Benutzername ist bereits vergeben', - // 'A link to reset your password has been sent by email.' => '', - // 'Your profile must have a valid email address.' => '', - // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', - // 'TRL - Turkish Lira' => '', - // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', - // 'The email configuration has been disabled by the administrator.' => '', - // 'Close this project' => '', - // 'Open this project' => '', - // 'Close a project' => '', - // 'Do you really want to close this project: "%s"?' => '', - // 'Reopen a project' => '', - // 'Do you really want to reopen this project: "%s"?' => '', - // 'This project is open' => '', - // 'This project is closed' => '', - // 'Unable to upload files, check the permissions of your data folder.' => '', + 'A link to reset your password has been sent by email.' => 'Ein Link zum Zurücksetzen Ihres Passworts wurde per E-Mail gesendet.', + 'Your profile must have a valid email address.' => 'Ihr Profil muss eine gültige E-Mail-Adresse haben.', + 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => 'Leider können wir Ihr Passwort nicht zurücksetzen. Haben Sie einen gültigen Benutzernamen eingegeben? Haben Sie eine E-Mail-Adresse in Ihrem Profil?', + 'TRL - Turkish Lira' => 'TRL - Türkische Lira', + 'The project email is optional and could be used by several plugins.' => 'Die Projekt-E-Mail ist optional und kann von mehreren Plugins verwendet werden.', + // 'The project email must be unique across all projects' => '', + 'The email configuration has been disabled by the administrator.' => 'Die E-Mail-Konfiguration wurde vom Administrator deaktiviert.', + 'Close this project' => 'Dieses Projekt schließen', + 'Open this project' => 'Dieses Projekt öffnen', + 'Close a project' => 'Ein Projekt schließen', + 'Do you really want to close this project: "%s"?' => 'Möchten Sie dieses Projekt wirklich schließen: "%s"?', + 'Reopen a project' => 'Ein Projekt wieder öffnen', + 'Do you really want to reopen this project: "%s"?' => 'Möchten Sie dieses Projekt wirklich wieder öffnen: "%s"?', + 'This project is open' => 'Dieses Projekt ist offen', + 'This project is closed' => 'Dieses Projekt ist geschlossen', + 'Unable to upload files, check the permissions of your data folder.' => 'Dateien können nicht hochgeladen werden, überprüfen Sie die Berechtigungen Ihres Datenordners.', ); diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php index 496224c8..8aab2e54 100644 --- a/app/Locale/el_GR/translations.php +++ b/app/Locale/el_GR/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php index f6bd60b2..db1ad870 100644 --- a/app/Locale/es_ES/translations.php +++ b/app/Locale/es_ES/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php index 9f1cdbf8..e3e8ef37 100644 --- a/app/Locale/fi_FI/translations.php +++ b/app/Locale/fi_FI/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 6bd6ae54..dea558cd 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -1301,7 +1301,7 @@ return array( 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => 'Malheureusement, nous ne pouvons pas réinitialiser votre mot de passe. Avez-vous saisi un nom d\'utilisateur valide ? Avez-vous une adresse e-mail dans votre profil ?', 'TRL - Turkish Lira' => 'TRL - Livre turque', 'The project email is optional and could be used by several plugins.' => 'L\'adresse email d\'un projet est optionnel et pourrait être utilisé par plusieurs extensions.', - 'The email project must be unique across all projects' => 'L\'adresse email d\'un projet doit être unique pour tous les projets', + 'The project email must be unique across all projects' => 'L\'adresse email d\'un projet doit être unique pour tous les projets', 'The email configuration has been disabled by the administrator.' => 'La configuration des emails a été désactivée par l\'administrateur.', 'Close this project' => 'Fermer ce projet', 'Open this project' => 'Ouvrir ce projet', diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php index b1a78ef2..f4567dce 100644 --- a/app/Locale/hu_HU/translations.php +++ b/app/Locale/hu_HU/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php index 620e9b58..6891c411 100644 --- a/app/Locale/id_ID/translations.php +++ b/app/Locale/id_ID/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php index 057034c8..5e75d036 100644 --- a/app/Locale/it_IT/translations.php +++ b/app/Locale/it_IT/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php index 7ebb84ef..0a379357 100644 --- a/app/Locale/ja_JP/translations.php +++ b/app/Locale/ja_JP/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/ko_KR/translations.php b/app/Locale/ko_KR/translations.php index c85b06ed..fca221a6 100644 --- a/app/Locale/ko_KR/translations.php +++ b/app/Locale/ko_KR/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php index 19a4e207..9f0768f4 100644 --- a/app/Locale/my_MY/translations.php +++ b/app/Locale/my_MY/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php index 858efcc2..2f98533d 100644 --- a/app/Locale/nb_NO/translations.php +++ b/app/Locale/nb_NO/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php index 0a68c20f..13fbc074 100644 --- a/app/Locale/nl_NL/translations.php +++ b/app/Locale/nl_NL/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php index b80b8ede..0689f459 100644 --- a/app/Locale/pl_PL/translations.php +++ b/app/Locale/pl_PL/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php index b8bce402..b4c549b0 100644 --- a/app/Locale/pt_BR/translations.php +++ b/app/Locale/pt_BR/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php index b4048710..a8f9ab62 100644 --- a/app/Locale/pt_PT/translations.php +++ b/app/Locale/pt_PT/translations.php @@ -1301,7 +1301,7 @@ return array( 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => 'Infelizmente, não conseguimos redefinir a sua password. Colocou um utilizador válido? Tem um endereço de email definido no seu perfil?', 'TRL - Turkish Lira' => 'TRL - Lira Turca', 'The project email is optional and could be used by several plugins.' => 'O e-mail do projeto é opcional e pode ser usado por vários plugins.', - 'The email project must be unique across all projects' => 'O e-mail do projeto tem de ser único em todos os projetos', + 'The project email must be unique across all projects' => 'O e-mail do projeto tem de ser único em todos os projetos', 'The email configuration has been disabled by the administrator.' => 'A configuração de e-mail foi desativada pelo administrador.', 'Close this project' => 'Fechar este projeto', 'Open this project' => 'Abrir este projeto', diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php index 9c92c6d2..8e691371 100644 --- a/app/Locale/ru_RU/translations.php +++ b/app/Locale/ru_RU/translations.php @@ -1301,7 +1301,7 @@ return array( 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => 'К сожалению, мы не смогли сбросить Ваш пароль. Возможно, Вы ошиблись при вводе имени пользователя или к аккаунту не привязан e-mail адрес.', 'TRL - Turkish Lira' => 'TRL - Турецкая лира', 'The project email is optional and could be used by several plugins.' => 'E-mail проекта является необязательным атрибутом и может быть использован некоторыми плагинами', - 'The email project must be unique across all projects' => 'E-mail проекта должен быть уникальным для каждого проекта', + 'The project email must be unique across all projects' => 'E-mail проекта должен быть уникальным для каждого проекта', 'The email configuration has been disabled by the administrator.' => 'Настройка e-mail была отключена администратором.', 'Close this project' => 'Закрыть этот проект', 'Open this project' => 'Открыть этот проект', diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php index 0fc35aac..b5228d1f 100644 --- a/app/Locale/sr_Latn_RS/translations.php +++ b/app/Locale/sr_Latn_RS/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php index 562f3808..cfecd415 100644 --- a/app/Locale/sv_SE/translations.php +++ b/app/Locale/sv_SE/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php index 07177c3b..67f8c442 100644 --- a/app/Locale/th_TH/translations.php +++ b/app/Locale/th_TH/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php index 1af8d2dd..c403894f 100644 --- a/app/Locale/tr_TR/translations.php +++ b/app/Locale/tr_TR/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php index 074231b7..ca476aa2 100644 --- a/app/Locale/zh_CN/translations.php +++ b/app/Locale/zh_CN/translations.php @@ -1301,7 +1301,7 @@ return array( // 'Unfortunately, we are unable to reset your password. Did you entered a valid username? Do you have an email address in your profile?' => '', // 'TRL - Turkish Lira' => '', // 'The project email is optional and could be used by several plugins.' => '', - // 'The email project must be unique across all projects' => '', + // 'The project email must be unique across all projects' => '', // 'The email configuration has been disabled by the administrator.' => '', // 'Close this project' => '', // 'Open this project' => '', diff --git a/app/Validator/ProjectValidator.php b/app/Validator/ProjectValidator.php index 8d8053a3..2fc3c28e 100644 --- a/app/Validator/ProjectValidator.php +++ b/app/Validator/ProjectValidator.php @@ -35,7 +35,7 @@ class ProjectValidator extends BaseValidator new Validators\AlphaNumeric('identifier', t('This value must be alphanumeric')) , new Validators\Unique('identifier', t('The identifier must be unique'), $this->db->getConnection(), ProjectModel::TABLE), new Validators\Email('email', t('Email address invalid')) , - new Validators\Unique('email', t('The email project must be unique across all projects'), $this->db->getConnection(), ProjectModel::TABLE), + new Validators\Unique('email', t('The project email must be unique across all projects'), $this->db->getConnection(), ProjectModel::TABLE), ); } |