summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Action/TaskAssignColorColumn.php (renamed from app/Action/TaskAssignColor.php)2
-rw-r--r--app/Locale/da_DK/translations.php1
-rw-r--r--app/Locale/de_DE/translations.php1
-rw-r--r--app/Locale/es_ES/translations.php1
-rw-r--r--app/Locale/fi_FI/translations.php1
-rw-r--r--app/Locale/fr_FR/translations.php1
-rw-r--r--app/Locale/hu_HU/translations.php1
-rw-r--r--app/Locale/it_IT/translations.php1
-rw-r--r--app/Locale/ja_JP/translations.php1
-rw-r--r--app/Locale/nl_NL/translations.php1
-rw-r--r--app/Locale/pl_PL/translations.php1
-rw-r--r--app/Locale/pt_BR/translations.php1
-rw-r--r--app/Locale/ru_RU/translations.php1
-rw-r--r--app/Locale/sr_Latn_RS/translations.php1
-rw-r--r--app/Locale/sv_SE/translations.php1
-rw-r--r--app/Locale/th_TH/translations.php1
-rw-r--r--app/Locale/tr_TR/translations.php1
-rw-r--r--app/Locale/zh_CN/translations.php1
-rw-r--r--app/Model/Action.php2
-rw-r--r--docs/api-json-rpc.markdown2
-rw-r--r--tests/units/ActionTaskAssignColorColumnTest.php (renamed from tests/units/ActionTaskAssignColorTest.php)4
21 files changed, 22 insertions, 5 deletions
diff --git a/app/Action/TaskAssignColor.php b/app/Action/TaskAssignColorColumn.php
index b1da17e9..2d10b776 100644
--- a/app/Action/TaskAssignColor.php
+++ b/app/Action/TaskAssignColorColumn.php
@@ -9,7 +9,7 @@ use Model\Task;
*
* @package action
*/
-class TaskAssignColor extends Base
+class TaskAssignColorColumn extends Base
{
/**
* Get the list of compatible events
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index 51397129..b8417071 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index 82319766..12d5bda8 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 4fa07781..0ce50bce 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index 239d5a51..9673c380 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 7cca5aa6..013e7739 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -847,4 +847,5 @@ return array(
'Check my code' => 'Vérifier mon code',
'Secret key: ' => 'Clé secrète : ',
'Test your device' => 'Testez votre appareil',
+ 'Assign a color when the task is moved to a specific column' => 'Assigner une couleur lorsque la tâche est déplacée dans une colonne spécifique',
);
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index af5c8cb7..50c09eef 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index b4cdf9f0..8b9e2742 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index ff563073..f1f8bff8 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index eba573d2..55d1fd99 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index bad64238..bf2364c0 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 787aa2d0..025aaa52 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index bcf216cc..754af11a 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 0229a030..77460766 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 3e52818b..8ae8702f 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index 400c0c26..c2be430b 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 0f8a2802..617e8269 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index 5f3eacf0..e48dbe14 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -845,4 +845,5 @@ return array(
// 'Check my code' => '',
// 'Secret key: ' => '',
// 'Test your device' => '',
+ // 'Assign a color when the task is moved to a specific column' => '',
);
diff --git a/app/Model/Action.php b/app/Model/Action.php
index 91bd9608..4489bca7 100644
--- a/app/Model/Action.php
+++ b/app/Model/Action.php
@@ -41,13 +41,13 @@ class Action extends Base
$values = array(
'TaskClose' => t('Close a task'),
'TaskOpen' => t('Open a task'),
- 'TaskAssignColor' => t('Assign a color to a task'),
'TaskAssignSpecificUser' => t('Assign the task to a specific user'),
'TaskAssignCurrentUser' => t('Assign the task to the person who does the action'),
'TaskDuplicateAnotherProject' => t('Duplicate the task to another project'),
'TaskMoveAnotherProject' => t('Move the task to another project'),
'TaskMoveColumnAssigned' => t('Move the task to another column when assigned to a user'),
'TaskMoveColumnUnAssigned' => t('Move the task to another column when assignee is cleared'),
+ 'TaskAssignColorColumn' => t('Assign a color when the task is moved to a specific column'),
'TaskAssignColorUser' => t('Assign a color to a specific user'),
'TaskAssignColorCategory' => t('Assign automatically a color based on a category'),
'TaskAssignCategoryColor' => t('Assign automatically a category based on a color'),
diff --git a/docs/api-json-rpc.markdown b/docs/api-json-rpc.markdown
index 3c02e818..e7f5a6b6 100644
--- a/docs/api-json-rpc.markdown
+++ b/docs/api-json-rpc.markdown
@@ -1390,7 +1390,7 @@ Response example:
"id": 1433237746,
"result": {
"TaskLogMoveAnotherColumn" : "Add a comment logging moving the task between columns",
- "TaskAssignColor" : "Assign a color to a task",
+ "TaskAssignColorColumn" : "Assign a color when the task is moved to a specific column",
"TaskAssignColorUser" : "Assign a color to a specific user",
"TaskAssignCategoryColor" : "Assign automatically a category based on a color",
"TaskAssignColorCategory" : "Assign automatically a color based on a category",
diff --git a/tests/units/ActionTaskAssignColorTest.php b/tests/units/ActionTaskAssignColorColumnTest.php
index 4d2ea70a..363bb05c 100644
--- a/tests/units/ActionTaskAssignColorTest.php
+++ b/tests/units/ActionTaskAssignColorColumnTest.php
@@ -8,11 +8,11 @@ use Model\TaskCreation;
use Model\TaskFinder;
use Model\Project;
-class ActionTaskAssignColorTest extends Base
+class ActionTaskAssignColorColumnTest extends Base
{
public function testColorChange()
{
- $action = new Action\TaskAssignColor($this->container, 1, Task::EVENT_MOVE_COLUMN);
+ $action = new Action\TaskAssignColorColumn($this->container, 1, Task::EVENT_MOVE_COLUMN);
$action->setParam('column_id', 2);
$action->setParam('color_id', 'green');