From 82fe380a4cacb6f6e3631f3ba418ac27816ceca6 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 8 Feb 2023 10:03:41 +0800 Subject: [PATCH] * Refactor. --- extension/lite/custom/ext/lang/de/lite.php | 2 +- extension/lite/custom/ext/lang/en/lite.php | 2 +- extension/lite/custom/ext/lang/fr/lite.php | 2 +- extension/lite/custom/ext/lang/zh-cn/lite.php | 2 +- module/admin/model.php | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/extension/lite/custom/ext/lang/de/lite.php b/extension/lite/custom/ext/lang/de/lite.php index f3ee432ea4..42dd81bdee 100644 --- a/extension/lite/custom/ext/lang/de/lite.php +++ b/extension/lite/custom/ext/lang/de/lite.php @@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); -$lang->custom->task->fields['required'] = 'Required Field'; +$lang->custom->task->fields['required'] = $lang->custom->required; $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; diff --git a/extension/lite/custom/ext/lang/en/lite.php b/extension/lite/custom/ext/lang/en/lite.php index f3ee432ea4..42dd81bdee 100644 --- a/extension/lite/custom/ext/lang/en/lite.php +++ b/extension/lite/custom/ext/lang/en/lite.php @@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); -$lang->custom->task->fields['required'] = 'Required Field'; +$lang->custom->task->fields['required'] = $lang->custom->required; $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; diff --git a/extension/lite/custom/ext/lang/fr/lite.php b/extension/lite/custom/ext/lang/fr/lite.php index f3ee432ea4..42dd81bdee 100644 --- a/extension/lite/custom/ext/lang/fr/lite.php +++ b/extension/lite/custom/ext/lang/fr/lite.php @@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); -$lang->custom->task->fields['required'] = 'Required Field'; +$lang->custom->task->fields['required'] = $lang->custom->required; $lang->custom->task->fields['priList'] = 'Priority'; $lang->custom->task->fields['typeList'] = 'Type'; diff --git a/extension/lite/custom/ext/lang/zh-cn/lite.php b/extension/lite/custom/ext/lang/zh-cn/lite.php index fc184d77d3..79a5a3ae29 100644 --- a/extension/lite/custom/ext/lang/zh-cn/lite.php +++ b/extension/lite/custom/ext/lang/zh-cn/lite.php @@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user'; $lang->custom->menuOrder[35] = 'block'; $lang->custom->task = new stdClass(); -$lang->custom->task->fields['required'] = '必填项'; +$lang->custom->task->fields['required'] = $lang->custom->required; $lang->custom->task->fields['priList'] = '优先级'; $lang->custom->task->fields['typeList'] = '类型'; diff --git a/module/admin/model.php b/module/admin/model.php index 473552b348..7758f89356 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -293,7 +293,6 @@ class adminModel extends model $this->lang->admin->menu->$subMenuKey = $subMenu; } - } if(isset($this->lang->admin->menuList->$menuKey['menuOrder'])) $this->lang->admin->menuOrder = $this->lang->admin->menuList->$menuKey['menuOrder'];