AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve and translate pull-request

This commit is contained in:
Frederic Guillot 2015-03-22 19:20:17 -04:00
parent 0e5cdfa6ab
commit 92510eefb1
20 changed files with 78 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Action/TaskMoveColumnAssigned.php
View File

@ -34,8 +34,8 @@ class TaskMoveColumnAssigned extends Base
public function getActionRequiredParameters()
{
return array(
'src_column_id' => t('From column'),
'dest_column_id' => t('To column')
'src_column_id' => t('Source column'),
'dest_column_id' => t('Destination column')
);
}
@ -85,7 +85,6 @@ class TaskMoveColumnAssigned extends Base
*/
public function hasRequiredCondition(array $data)
{
return $data['column_id'] == $this->getParam('src_column_id') &&
$data['owner_id'];
return $data['column_id'] == $this->getParam('src_column_id') && $data['owner_id'];
}
}

7
app/Action/TaskMoveColumnUnAssigned.php
View File

@ -34,8 +34,8 @@ class TaskMoveColumnUnAssigned extends Base
public function getActionRequiredParameters()
{
return array(
'src_column_id' => t('From column'),
'dest_column_id' => t('To column')
'src_column_id' => t('Source column'),
'dest_column_id' => t('Destination column')
);
}
@ -85,7 +85,6 @@ class TaskMoveColumnUnAssigned extends Base
*/
public function hasRequiredCondition(array $data)
{
return $data['column_id'] == $this->getParam('src_column_id') &&
!$data['owner_id'];
return $data['column_id'] == $this->getParam('src_column_id') && ! $data['owner_id'];
}
}

4
app/Locale/da_DK/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/de_DE/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/es_ES/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/fi_FI/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/fr_FR/translations.php
View File

@ -806,4 +806,8 @@ return array(
'Unable to remove this budget line.' => 'Impossible de supprimer cette ligne budgétaire.',
'USD - US Dollar' => 'USD - Dollar américain',
'Remaining' => 'Restant',
'Destination column' => 'Colonne de destination',
'Move the task to another column when assigned to a user' => 'Déplacer la tâche dans une autre colonne lorsque celle-ci est assignée à quelqu\'un',
'Move the task to another column when assignee is cleared' => 'Déplacer la tâche dans une autre colonne lorsque celle-ci n\'est plus assignée',
'Source column' => 'Colonne d\'origine',
);

4
app/Locale/hu_HU/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/it_IT/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/ja_JP/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/nl_NL/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/pl_PL/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/pt_BR/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/ru_RU/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/sr_Latn_RS/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/sv_SE/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/th_TH/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/tr_TR/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

4
app/Locale/zh_CN/translations.php
View File

@ -804,4 +804,8 @@ return array(
// 'Unable to remove this budget line.' => '',
// 'USD - US Dollar' => '',
// 'Remaining' => '',
// 'Destination column' => '',
// 'Move the task to another column when assigned to a user' => '',
// 'Move the task to another column when assignee is cleared' => '',
// 'Source column' => '',
);

6
app/Model/TaskPosition.php
View File

@ -21,6 +21,7 @@ class TaskPosition extends Base
* @param integer $column_id Column id
* @param integer $position Position (must be >= 1)
* @param integer $swimlane_id Swimlane id
* @param boolean $fire_events Fire events
* @return boolean
*/
public function movePosition($project_id, $task_id, $column_id, $position, $swimlane_id = 0, $fire_events = true)
@ -30,13 +31,14 @@ class TaskPosition extends Base
$result = $this->calculateAndSave($project_id, $task_id, $column_id, $position, $swimlane_id);
if ($result) {
if ($original_task['swimlane_id'] != $swimlane_id) {
$this->calculateAndSave($project_id, 0, $column_id, 1, $original_task['swimlane_id']);
}
if ($fire_events)
if ($fire_events) {
$this->fireEvents($original_task, $column_id, $position, $swimlane_id);
}
}
return $result;