From 298e1f9dc010a7b2e2b13ea9a96d1c1ee2b3c2ae Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 31 Mar 2023 13:31:56 +0800 Subject: [PATCH 1/2] * Modify module edit language. --- module/tree/lang/de.php | 2 ++ module/tree/lang/en.php | 2 ++ module/tree/lang/fr.php | 2 ++ module/tree/lang/zh-cn.php | 2 ++ module/tree/view/edit.html.php | 4 ++-- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php index 21e0e0ab65..90cc9e0f50 100755 --- a/module/tree/lang/de.php +++ b/module/tree/lang/de.php @@ -78,6 +78,8 @@ $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->dirName = "Directory Name"; $lang->tree->emptyHistory = "No History"; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 578bc00667..01f6030f04 100755 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -78,6 +78,8 @@ $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->dirName = "Directory Name"; $lang->tree->emptyHistory = "No History"; diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php index 02ecf93415..ecf250244a 100755 --- a/module/tree/lang/fr.php +++ b/module/tree/lang/fr.php @@ -78,6 +78,8 @@ $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->dirName = "Directory Name"; $lang->tree->emptyHistory = "Pas Historique"; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 78d8ac05e1..32317a61ad 100755 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -78,6 +78,8 @@ $lang->tree->short = '简称'; $lang->tree->all = '所有模块'; $lang->tree->executionDoc = "{$lang->executionCommon}文档"; $lang->tree->product = "所属{$lang->productCommon}"; +$lang->tree->editDir = "编辑目录"; +$lang->tree->dirName = "目录名称"; $lang->tree->emptyHistory = "暂时没有历史记录。"; diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index ce940864cf..7958ca8919 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -23,7 +23,7 @@ if(isset($pageCSS)) css::internal($pageCSS); 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); tree->name; - if($type == 'doc') $lblTreeName = $lang->tree->cate; + if($type == 'doc' or $type == 'api') $lblTreeName = $lang->tree->dirName; if($type == 'line') $lblTreeName = $lang->tree->line; echo $lblTreeName; ?> From eda1b7541adf4eff4def244ef4daaf5b6d451503 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 31 Mar 2023 13:47:29 +0800 Subject: [PATCH 2/2] * Modify tips language. --- module/tree/lang/de.php | 2 +- module/tree/lang/en.php | 2 +- module/tree/lang/fr.php | 2 +- module/tree/lang/zh-cn.php | 2 +- module/tree/model.php | 2 +- module/tree/view/edit.html.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php index 90cc9e0f50..8d5867a151 100755 --- a/module/tree/lang/de.php +++ b/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'; @@ -79,7 +80,6 @@ $lang->tree->all = 'Alle Module'; $lang->tree->executionDoc = "{$lang->executionCommon} Dok"; $lang->tree->product = $lang->productCommon; $lang->tree->editDir = "Edit Directory"; -$lang->tree->dirName = "Directory Name"; $lang->tree->emptyHistory = "No History"; diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 01f6030f04..38fa6164c3 100755 --- a/module/tree/lang/en.php +++ b/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'; @@ -79,7 +80,6 @@ $lang->tree->all = 'All Modules'; $lang->tree->executionDoc = "{$lang->executionCommon} Document"; $lang->tree->product = $lang->productCommon; $lang->tree->editDir = "Edit Directory"; -$lang->tree->dirName = "Directory Name"; $lang->tree->emptyHistory = "No History"; diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php index ecf250244a..c962924249 100755 --- a/module/tree/lang/fr.php +++ b/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'; @@ -79,7 +80,6 @@ $lang->tree->all = 'Tous les Modules'; $lang->tree->executionDoc = "Document {$lang->executionCommon}"; $lang->tree->product = $lang->productCommon; $lang->tree->editDir = "Edit Directory"; -$lang->tree->dirName = "Directory Name"; $lang->tree->emptyHistory = "Pas Historique"; diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index 32317a61ad..354364e383 100755 --- a/module/tree/lang/zh-cn.php +++ b/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}模块"; @@ -79,7 +80,6 @@ $lang->tree->all = '所有模块'; $lang->tree->executionDoc = "{$lang->executionCommon}文档"; $lang->tree->product = "所属{$lang->productCommon}"; $lang->tree->editDir = "编辑目录"; -$lang->tree->dirName = "目录名称"; $lang->tree->emptyHistory = "暂时没有历史记录。"; diff --git a/module/tree/model.php b/module/tree/model.php index a01acc3c99..41744c407a 100644 --- a/module/tree/model.php +++ b/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; } diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index 7958ca8919..20299500b7 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -69,7 +69,7 @@ if(isset($pageCSS)) css::internal($pageCSS); tree->name; - if($type == 'doc' or $type == 'api') $lblTreeName = $lang->tree->dirName; + if($type == 'doc' or $type == 'api') $lblTreeName = $lang->tree->dir; if($type == 'line') $lblTreeName = $lang->tree->line; echo $lblTreeName; ?>