Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

module/tree/lang/de.php

@@ -52,6 +52,7 @@ $lang->tree->noSubmodule          = "There are no copyable submodules under the
 $lang->tree->successSave          = 'Saved.';
 $lang->tree->successFixed         = 'Fixed.';
 $lang->tree->repeatName           = 'The name "%s" exists!';
+$lang->tree->repeatDirName        = 'The name "%s" exists!';
 $lang->tree->shouldNotBlank       = 'Module name should not be blank!';
 $lang->tree->syncProductModule    = 'Sync Module';
 
@@ -78,6 +79,7 @@ $lang->tree->short        = 'Sortierung';
 $lang->tree->all          = 'Alle Module';
 $lang->tree->executionDoc = "{$lang->executionCommon} Dok";
 $lang->tree->product      = $lang->productCommon;
+$lang->tree->editDir      = "Edit Directory";
 
 $lang->tree->emptyHistory = "No History";
 

module/tree/lang/en.php

@@ -52,6 +52,7 @@ $lang->tree->noSubmodule          = "There are no copyable submodules under the
 $lang->tree->successSave          = 'Saved.';
 $lang->tree->successFixed         = 'Fixed.';
 $lang->tree->repeatName           = 'The name "%s" exists!';
+$lang->tree->repeatDirName        = 'The name "%s" exists!';
 $lang->tree->shouldNotBlank       = 'Module name should not be blank!';
 $lang->tree->syncProductModule    = 'Sync Module';
 
@@ -78,6 +79,7 @@ $lang->tree->short        = 'Abbr.';
 $lang->tree->all          = 'All Modules';
 $lang->tree->executionDoc = "{$lang->executionCommon} Document";
 $lang->tree->product      = $lang->productCommon;
+$lang->tree->editDir      = "Edit Directory";
 
 $lang->tree->emptyHistory = "No History";
 

module/tree/lang/fr.php

@@ -52,6 +52,7 @@ $lang->tree->noSubmodule          = "There are no copyable submodules under the
 $lang->tree->successSave          = 'Sauvé.';
 $lang->tree->successFixed         = 'Corrigé.';
 $lang->tree->repeatName           = 'Le nom "%s" existe déjà !';
+$lang->tree->repeatDirName        = 'The name "%s" exists!';
 $lang->tree->shouldNotBlank       = 'Module name should not be blank!';
 $lang->tree->syncProductModule    = 'Sync Module';
 
@@ -78,6 +79,7 @@ $lang->tree->short        = 'Abbr.';
 $lang->tree->all          = 'Tous les Modules';
 $lang->tree->executionDoc = "Document {$lang->executionCommon}";
 $lang->tree->product      = $lang->productCommon;
+$lang->tree->editDir      = "Edit Directory";
 
 $lang->tree->emptyHistory = "Pas Historique";
 

module/tree/lang/zh-cn.php

@@ -52,6 +52,7 @@ $lang->tree->noSubmodule          = "当前模块下没有可复制的子模块
 $lang->tree->successSave          = '成功保存';
 $lang->tree->successFixed         = '成功修正数据！';
 $lang->tree->repeatName           = '模块名“%s”已经存在！';
+$lang->tree->repeatDirName        = '目录名“%s”已经存在！';
 $lang->tree->shouldNotBlank       = '模块名不能为空格！';
 $lang->tree->syncProductModule    = "同步{$lang->productCommon}模块";
 
@@ -78,6 +79,7 @@ $lang->tree->short        = '简称';
 $lang->tree->all          = '所有模块';
 $lang->tree->executionDoc = "{$lang->executionCommon}文档";
 $lang->tree->product      = "所属{$lang->productCommon}";
+$lang->tree->editDir      = "编辑目录";
 
 $lang->tree->emptyHistory = "暂时没有历史记录。";
 

module/tree/model.php

@@ -2353,7 +2353,7 @@ class treeModel extends model
         $repeatName = $this->checkUnique($module);
         if($repeatName)
         {
-            dao::$errors[] = sprintf($this->lang->tree->repeatName, $repeatName);
+            dao::$errors[] = sprintf($this->lang->tree->repeatDirName, $repeatName);
             return false;
         }
 

module/tree/view/edit.html.php

@@ -23,7 +23,7 @@ if(isset($pageCSS)) css::internal($pageCSS);
       <strong>
         <?php
         $lblEditTree = $lang->tree->edit;
-        if($type == 'doc') $lblEditTree = $lang->doc->editType;
+        if($type == 'doc' or $type == 'api') $lblEditTree = $lang->tree->editDir;
         if($type == 'line') $lblEditTree = $lang->tree->manageLine;
         echo $lblEditTree;
         ?>
@@ -69,7 +69,7 @@ if(isset($pageCSS)) css::internal($pageCSS);
           <th class='thWidth'>
             <?php
             $lblTreeName = $lang->tree->name;
-            if($type == 'doc') $lblTreeName = $lang->tree->cate;
+            if($type == 'doc' or $type == 'api') $lblTreeName = $lang->tree->dir;
             if($type == 'line') $lblTreeName = $lang->tree->line;
             echo $lblTreeName;
             ?>