Add missed translations

lynchlee · Dec 28, 2017 · 521dd32 · 521dd32
1 parent 8c70e43
commit 521dd32
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/app/Helpers/DateHelper.php b/app/Helpers/DateHelper.php
@@ -79,7 +79,9 @@ public function duration($seconds)
         $dtF = new DateTime('@0');
         $dtT = new DateTime("@$seconds");
 
-        return $dtF->diff($dtT)->format('%a days, %h hours, %i minutes and %s seconds');
+        $format = sprintf('%%d %s, %%h %s, %%i %s, %%s %s', t('days'), t('hours'), t('minutes'), t('seconds'));
+
+        return $dtF->diff($dtT)->format($format);
     }
 
     /**

diff --git a/resources/lang/zh_CN/jitamin.php b/resources/lang/zh_CN/jitamin.php
@@ -192,16 +192,16 @@
     'Remove an automatic action' => '删除一个触发动作',
     'Assign the task to a specific user' => '将该任务指派给一个用户',
     'Assign the task to the person who does the action' => '将任务指派给产生该动作的用户',
-    'Duplicate the task to another project' => '复制该任务到另一项目',
+    'Duplicate the task to another project' => '克隆该任务到另一项目',
     'Move a task to another column' => '移动任务到另一栏目',
     'Task modification' => '任务修改',
     'Task creation' => '任务创建',
     'Closing a task' => '正在关闭任务',
     'Assign a color to a specific user' => '分配颜色: 为指定的用户的任务',
     'Column title' => '栏目名称',
     'Position' => '位置',
-    'Duplicate to another project' => '复制到另一项目',
-    'Duplicate' => '复制',
+    'Duplicate to another project' => '克隆到另一项目',
+    'Duplicate' => '克隆',
     'link' => '连接',
     'Comment updated successfully.' => '评论成功更新。',
     'Unable to update your comment.' => '无法更新您的评论。',
@@ -276,7 +276,10 @@
     'Spent:' => '花费：',
     'Do you really want to remove this sub-task?' => '请确认是否要删除此子任务？',
     'Remaining:' => '剩余时间：',
+    'days' => '天',
     'hours' => '小时',
+    'minutes' => '分钟',
+    'seconds' => '秒',
     'spent' => '花费',
     'estimated' => '评估',
     'Sub-Tasks' => '子任务',
@@ -629,9 +632,9 @@
     'The identifier must be unique' => '标识符必须唯一',
     'This linked task id doesn\'t exists' => '关联任务不存在',
     'This value must be alphanumeric' => '此值必须是字母或者数字',
-    'Edit recurrence' => '编辑循环周期',
-    'Generate recurrent task' => '生成循环任务',
-    'Trigger to generate recurrent task' => '生成循环任务的触发器',
+    'Edit recurrence' => '设置任务重复',
+    'Generate recurrent task' => '生成重复任务',
+    'Trigger to generate recurrent task' => '生成重复任务的触发器',
     'Factor to calculate new due date' => '超期因素',
     'Timeframe to calculate new due date' => '计算到期时间表',
     'Base date to calculate new due date' => '计算超期基准日期',
@@ -1121,7 +1124,7 @@
     'New internal link' => '创建内部链接',
     'Display list of keyboard shortcuts' => '显示快捷键列表',
     'Menu' => '菜单',
-    'Set start date' => '设置启动日期',
+    'Set start date' => '现在开始',
     'Avatar' => '头像',
     'Upload my avatar image' => '上传头像',
     'Remove my image' => '删除头像',

diff --git a/resources/views/task/attachment/create.php b/resources/views/task/attachment/create.php
@@ -21,6 +21,7 @@
     data-url="<?= $this->url->href('Task/TaskFileController', 'store', ['task_id' => $task['id'], 'project_id' => $task['project_id']]) ?>">
     <div id="file-dropzone-inner">
         <?= t('Drag and drop your files here') ?> <?= t('or') ?> <a href="#" id="file-browser"><?= t('choose files') ?></a>
+        <p class="file-tooltip"><?= t('The maximum allowed file size is %sB.', $this->text->bytes($max_size)) ?></p>
     </div>
 </div>
 

diff --git a/resources/views/task/details.php b/resources/views/task/details.php
@@ -141,12 +141,14 @@
                         <span><?= $this->dt->datetime($task['date_started']) ?></span>
                     </li>
                     <?php endif ?>
+                    <!--
                     <?php if ($task['date_moved']): ?>
                     <li>
                         <?= t('Moved:') ?>
                         <span><?= $this->dt->datetime($task['date_moved']) ?></span>
                     </li>
                     <?php endif ?>
+                    -->
 
                     <?= $this->hook->render('template:task:details:fourth-column', ['task' => $task]) ?>
                 </ul>
@@ -164,7 +166,7 @@
     </div>
 
     <?php if ($editable && empty($task['date_started'])): ?>
-        <?= $this->url->button('fa-play', t('Set start date'), 'Task/TaskController', 'start', ['task_id' => $task['id'], 'project_id' => $task['project_id']], 'btn-default btn-header') ?>
+        <?= $this->url->button('fa-play', t('Set start date'), 'Task/TaskController', 'start', ['task_id' => $task['id'], 'project_id' => $task['project_id']], 'btn-success btn-header') ?>
     <?php endif ?>
 
     <?= $this->hook->render('template:task:details:bottom', ['task' => $task]) ?>

diff --git a/resources/views/task/subside.php b/resources/views/task/subside.php
@@ -5,13 +5,9 @@
             <i class="fa fa-pencil-square-o fa-fw"></i>
             <?= $this->url->link(t('Edit the task'), 'Task/TaskController', 'edit', ['task_id' => $task['id'], 'project_id' => $task['project_id']], false, 'popover large') ?>
         </li>
-        <li>
-            <i class="fa fa-refresh fa-rotate-90 fa-fw"></i>
-            <?= $this->url->link(t('Edit recurrence'), 'Task/TaskRecurrenceController', 'edit', ['task_id' => $task['id'], 'project_id' => $task['project_id']], false, 'popover') ?>
-        </li>
         <li>
             <i class="fa fa-plus fa-fw"></i>
-            <?= $this->url->link(t('Add a sub-task'), 'Task/Subtask/SubtaskController', 'create', ['task_id' => $task['id'], 'project_id' => $task['project_id']], false, 'popover') ?>
+            <?= $this->url->link(t('Add a sub-task'), 'Task/Subtask/SubtaskController', 'create', ['task_id' => $task['id'], 'project_id' => $task['project_id']], false, 'popover small') ?>
         </li>
         <li>
             <i class="fa fa-code-fork fa-fw"></i>
@@ -45,6 +41,10 @@
             <i class="fa fa-clone fa-fw"></i>
             <?= $this->url->link(t('Move to another project'), 'Task/TaskDuplicationController', 'move', ['task_id' => $task['id'], 'project_id' => $task['project_id']], false, 'popover') ?>
         </li>
+        <li>
+            <i class="fa fa-refresh fa-rotate-90 fa-fw"></i>
+            <?= $this->url->link(t('Edit recurrence'), 'Task/TaskRecurrenceController', 'edit', ['task_id' => $task['id'], 'project_id' => $task['project_id']], false, 'popover') ?>
+        </li>
         <?php if ($task['is_active'] == 1 && $this->projectRole->isSortableColumn($task['project_id'], $task['column_id'])): ?>
             <li>
                 <i class="fa fa-arrows fa-fw"></i>