调整语言包

Apollolan · May 15, 2016 · a5c1590 · a5c1590
1 parent 8d1c310
commit a5c1590
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/config/console.php b/config/console.php
@@ -2,7 +2,7 @@
 // Merged web + local configuration is available in $web
 $params = [
     'version'   => 'v1.2.0',
-    'buildTime' => '2016-04-30',
+    'buildTime' => '2016-05-16',
 ];
 return [
     'id'                  => 'console',

diff --git a/messages/en/conf.php b/messages/en/conf.php
@@ -48,6 +48,8 @@
     'post_release_delay tip' => 'In order to do advanced tasks on each target server, and it will be paused x seconds on each target server. default set to 0.',
     'branch tip' => 'Recommended options of test，maybe you would chose branch+commit',
     'tag tip' => 'Recommended options of production',
+    'nontrunk' => 'non-trunk/non-branches',
+    'nontrunk tip' => 'no trunk, no branches, no tags directories in svn repository',
     'audit tip' => 'development bill should be audited before deploying',
     'ansible tip' => 'use ansible to accelerate the speed of deploying, you need to have installed ansible on "Hosted Server"',
     'ansible hosts save error' => 'Unable to save ansible hosts file: "{path}"',

diff --git a/messages/en/task.php b/messages/en/task.php
@@ -33,4 +33,9 @@
     'file list placeholder' => '1.Distribute specified directory：dir_name<br />2.Distribute specified file：file_name<br />3.Distribute specified file：file*',
     'file list' => 'File list',
     'diff tip' => 'Auto get the diff files between two commit id of branch/tag',
+    'file transmission mode' => 'full/part:',
+    'file transmission mode full' => 'Deploy all files',
+    'file transmission mode part' => 'Deploy specified files',
+    'file transmission mode full tip' => 'Deploy all files, and delete the files not in the repository',
+    'file transmission mode part tip' => 'Deploy distribute specified files',
 ];
diff --git a/messages/zh-CN/conf.php b/messages/zh-CN/conf.php
@@ -50,6 +50,8 @@
         设置为大于 0 的值会出现代码发布阶段各个服务器业务代码逻辑不一致的情况，请谨慎配置',
     'branch tip' => '测试环境推荐选项，可以选择branch+commit',
     'tag tip' => '生产环境推荐选项',
+    'nontrunk' => '无trunk/无branches',
+    'nontrunk tip' => 'svn仓库下没有trunk、branches、tags目录时选择',
     'audit tip' => '开启时，用户提交上线任务需要审核方可上线',
     'ansible tip' => '开启时，通过Ansible并发传输文件，加快多机器时的代码发布速度。需安装 ansible，详见文档',
     'open tip' => '关闭时，用户不能对此项目发起上线',

diff --git a/messages/zh-CN/task.php b/messages/zh-CN/task.php
@@ -33,4 +33,9 @@
     'file list placeholder' => '1.上线指定目录：dir_name<br />2.上线指定文件：file_name<br />3.通配符 file*',
     'file list' => '文件列表',
     'diff tip' => '自动获取该分支/tag下的两提交历史间的文件',
+    'file transmission mode' => '全量/增量:',
+    'file transmission mode full' => '全量上线',
+    'file transmission mode part' => '指定文件',
+    'file transmission mode full tip' => '全量上线所有文件, 删除不在代码仓库中的文件',
+    'file transmission mode part tip' => '指定文件列表, 只发布指定的文件和目录',
 ];
diff --git a/views/conf/edit.php b/views/conf/edit.php
@@ -283,7 +283,7 @@
             <div id="div-repo_mode_nontrunk" class="radio" style="display: <?php if ($conf->repo_type == Project::REPO_SVN) { echo 'inline';} else {echo 'none';} ?>;" data-rel="tooltip" data-title="<?= yii::t('conf', 'nontrunk tip') ?>" data-placement="right">
                 <label>
                     <input name="Project[repo_mode]" value="<?= Project::REPO_MODE_NONTRUNK ?>" <?= $conf->repo_mode == Project::REPO_MODE_NONTRUNK ? 'checked="checked"' : '' ?> type="radio" class="ace">
-                    <span class="lbl"> 无trunk/无branches </span>
+                    <span class="lbl"><?= yii::t('conf', 'nontrunk') ?></span>
                 </label>
             </div>
         </div>

diff --git a/views/task/submit-git.php b/views/task/submit-git.php
@@ -35,19 +35,19 @@
           <!-- 全量/增量 -->
           <div class="form-group">
               <label class="text-right bolder blue">
-                  全量/增量:
+                  <?= yii::t('task', 'file transmission mode'); ?>
               </label>
-              <div id="transmission-full-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="全量上线所有文件, 删除不在代码仓库中的文件" data-placement="right">
+              <div id="transmission-full-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="<?= yii::t('task', 'file transmission mode full tip') ?>" data-placement="right">
                   <label>
                       <input name="Task[file_transmission_mode]" value="<?= Task::FILE_TRANSMISSION_MODE_FULL ?>" checked="checked" type="radio" class="ace">
-                      <span class="lbl"> 全量上线 </span>
+                      <span class="lbl"><?= yii::t('task', 'file transmission mode full') ?></span>
                   </label>
               </div>
 
-              <div id="transmission-part-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="指定文件列表, 只发布指定的文件和目录" data-placement="right">
+              <div id="transmission-part-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="<?= yii::t('task', 'file transmission mode part tip') ?>" data-placement="right">
                   <label>
                       <input name="Task[file_transmission_mode]" value="<?= Task::FILE_TRANSMISSION_MODE_PART ?>" type="radio" class="ace">
-                      <span class="lbl"> 指定文件 </span>
+                      <span class="lbl"><?= yii::t('task', 'file transmission mode part') ?></span>
                   </label>
               </div>
           </div>

diff --git a/views/task/submit-svn.php b/views/task/submit-svn.php
@@ -49,19 +49,19 @@
           <!-- 全量/增量 -->
           <div class="form-group">
               <label class="text-right bolder blue">
-                  全量/增量:
+                  <?= yii::t('task', 'file transmission mode'); ?>
               </label>
-              <div id="transmission-full-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="全量上线所有文件, 删除不在代码仓库中的文件" data-placement="right">
+              <div id="transmission-full-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="<?= yii::t('task', 'file transmission mode full tip') ?>" data-placement="right">
                   <label>
                       <input name="Task[file_transmission_mode]" value="<?= Task::FILE_TRANSMISSION_MODE_FULL ?>" checked="checked" type="radio" class="ace">
-                      <span class="lbl"> 全量上线 </span>
+                      <span class="lbl"><?= yii::t('task', 'file transmission mode full') ?></span>
                   </label>
               </div>
 
-              <div id="transmission-part-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="指定文件列表, 只发布指定的文件和目录" data-placement="right">
+              <div id="transmission-part-ctl" class="radio" style="display: inline;" data-rel="tooltip" data-title="<?= yii::t('task', 'file transmission mode part tip') ?>" data-placement="right">
                   <label>
                       <input name="Task[file_transmission_mode]" value="<?= Task::FILE_TRANSMISSION_MODE_PART ?>" type="radio" class="ace">
-                      <span class="lbl"> 指定文件 </span>
+                      <span class="lbl"><?= yii::t('task', 'file transmission mode part') ?></span>
                   </label>
               </div>
           </div>