From 9c292e522ad5c97313ce25bf0676d3839ce15c3d Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 12 Jun 2018 13:38:55 +0800 Subject: [PATCH] * Format codes. --- module/common/lang/zh-cn.php | 2 +- module/common/lang/zh-tw.php | 12 +++++++----- module/custom/model.php | 2 +- module/tutorial/lang/zh-tw.php | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index a4377b1ec2..d3bd44204b 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -442,7 +442,7 @@ $lang->error = new stdclass(); $lang->error->companyNotFound = "您访问的域名 %s 没有对应的公司。"; $lang->error->length = array("『%s』长度错误，应当为『%s』", "『%s』长度应当不超过『%s』，且大于『%s』。"); $lang->error->reg = "『%s』不符合格式，应当为:『%s』。"; -$lang->error->unique = "『%s』已经有『%s』这条记录了。如果您确定该记录已删除，请到后台管理-回收站还原。。"; +$lang->error->unique = "『%s』已经有『%s』这条记录了。如果您确定该记录已删除，请到后台管理-回收站还原。"; $lang->error->gt = "『%s』应当大于『%s』。"; $lang->error->ge = "『%s』应当不小于『%s』。"; $lang->error->notempty = "『%s』不能为空。"; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index fbe90b5326..882a0cff5e 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -161,11 +161,13 @@ $lang->lang = 'Language'; /* 風格列表。*/ $lang->theme = '主題'; -$lang->themes['default'] = '預設'; -$lang->themes['green'] = '綠色'; -$lang->themes['red'] = '紅色'; -$lang->themes['lightblue'] = '亮藍'; +$lang->themes['default'] = '禪道藍（預設）'; +$lang->themes['green'] = '葉蘭綠'; +$lang->themes['red'] = '赤誠紅'; +$lang->themes['purple'] = '玉煙紫'; +$lang->themes['pink'] = '芙蕖粉'; $lang->themes['blackberry'] = '黑莓'; +$lang->themes['classic'] = '經典'; /* 首頁菜單設置。*/ $lang->index = new stdclass(); @@ -440,7 +442,7 @@ $lang->error = new stdclass(); $lang->error->companyNotFound = "您訪問的域名 %s 沒有對應的公司。"; $lang->error->length = array("『%s』長度錯誤，應當為『%s』", "『%s』長度應當不超過『%s』，且大於『%s』。"); $lang->error->reg = "『%s』不符合格式，應當為:『%s』。"; -$lang->error->unique = "『%s』已經有『%s』這條記錄了。如果您確定該記錄已刪除，請到後台管理-資源回收筒還原。。"; +$lang->error->unique = "『%s』已經有『%s』這條記錄了。如果您確定該記錄已刪除，請到後台管理-資源回收筒還原。"; $lang->error->gt = "『%s』應當大於『%s』。"; $lang->error->ge = "『%s』應當不小於『%s』。"; $lang->error->notempty = "『%s』不能為空。"; diff --git a/module/custom/model.php b/module/custom/model.php index 3d75d73b64..00edbbd4f3 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -289,7 +289,7 @@ class customModel extends model if($module != 'main' and isset($lang->menugroup->$module)) $module = $lang->menugroup->$module; $flowModule = $config->global->flow . '_' . $module; $customMenu = isset($config->customMenu->$flowModule) ? $config->customMenu->$flowModule : array(); - if(commonModel::isTutorialMode() && $module === 'main')$customMenu = 'my,product,project,qa,company'; + if(commonModel::isTutorialMode() && $module === 'main') $customMenu = 'my,product,project,qa,company'; if(!empty($customMenu) && is_string($customMenu) && substr($customMenu, 0, 1) === '[') $customMenu = json_decode($customMenu); if($module == 'my' && empty($config->global->scoreStatus)) unset($allMenu->score); $menu = self::setMenuByConfig($allMenu, $customMenu, $module); diff --git a/module/tutorial/lang/zh-tw.php b/module/tutorial/lang/zh-tw.php index fffb263c39..d38466eb8a 100644 --- a/module/tutorial/lang/zh-tw.php +++ b/module/tutorial/lang/zh-tw.php @@ -35,11 +35,11 @@ $lang->tutorial->dataNotSave = "教程任務中，數據不會保存。"; $lang->tutorial->tasks = array(); $lang->tutorial->tasks['createAccount'] = array('title' => '創建帳號'); -$lang->tutorial->tasks['createAccount']['nav'] = array('module' => 'user', 'method' => 'create', 'menuModule' => 'company', 'menu' => 'addUser', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加用戶'); +$lang->tutorial->tasks['createAccount']['nav'] = array('module' => 'user', 'method' => 'create', 'menuModule' => 'company', 'menu' => 'browseUser', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-user-btn', 'targetPageName' => '添加用戶'); $lang->tutorial->tasks['createAccount']['desc'] = "

在系統創建一個新的用戶帳號：

"; $lang->tutorial->tasks['createProduct'] = array('title' => '創建產品'); -$lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加產品'); +$lang->tutorial->tasks['createProduct']['nav'] = array('module' => 'product', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#createForm', 'submit' => '#submit', 'target' => '.create-product-btn', 'targetPageName' => '添加產品'); $lang->tutorial->tasks['createProduct']['desc'] = "

在系統創建一個新的產品：

"; $lang->tutorial->tasks['createStory'] = array('title' => '創建需求'); @@ -47,7 +47,7 @@ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'meth $lang->tutorial->tasks['createStory']['desc'] = "

在系統創建一個新的需求：

"; $lang->tutorial->tasks['createProject'] = array('title' => '創建項目'); -$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => 'create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '添加項目'); +$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加項目'); $lang->tutorial->tasks['createProject']['desc'] = "

在系統創建一個新的項目：

"; $lang->tutorial->tasks['manageTeam'] = array('title' => '管理團隊');