From df0f6cfac41e36f393290298bcfe2760b8dc686d Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Mon, 28 Mar 2022 14:56:27 +0800 Subject: [PATCH] * fix chat priv and menu, bug #21175. --- extension/lite/common/ext/lang/en/lite.php | 32 +++++++++++++++++++ extension/lite/common/ext/lang/zh-cn/lite.php | 32 +++++++++++++++++++ extension/lite/group/ext/lang/resource.php | 28 +++++++++++++++- .../xuan/common/ext/lang/zh-cn/xuanxuan.php | 2 +- 4 files changed, 92 insertions(+), 2 deletions(-) diff --git a/extension/lite/common/ext/lang/en/lite.php b/extension/lite/common/ext/lang/en/lite.php index 44395058dd..ef507ff592 100644 --- a/extension/lite/common/ext/lang/en/lite.php +++ b/extension/lite/common/ext/lang/en/lite.php @@ -263,3 +263,35 @@ $lang->createObjects['execution'] = 'TaskKanban'; $lang->createObjects['kanban'] = 'Kanban'; $lang->createIcons['execution'] = 'kanban'; + +/* Xuan */ +global $config; +if(isset($config->xuanxuan)) +{ + $lang->xuanxuan = new stdclass(); + $lang->admin->menu->xuanxuan = array('link' => 'Chat|admin|xuanxuan', 'subModule' => 'client,setting'); + $lang->admin->menuOrder[6] = 'xuanxuan'; + + $lang->admin->menu->xuanxuan['subMenu'] = new stdclass(); + $lang->admin->menu->xuanxuan['subMenu']->index = array('link' => 'Home|admin|xuanxuan'); + $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => 'Parameter|setting|xuanxuan'); + $lang->admin->menu->xuanxuan['subMenu']->update = array('link' => 'Update|client|browse', 'subModule' => 'client'); + + $lang->admin->menu->xuanxuan['menuOrder'][0] = 'index'; + $lang->admin->menu->xuanxuan['menuOrder'][5] = 'setting'; + $lang->admin->menu->xuanxuan['menuOrder'][10] = 'update'; + + if($config->edition != 'open') + { + $lang->admin->menu->xuanxuan['subModule'] = 'client,setting,conference'; + $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => 'Conference|conference|admin'); + $lang->admin->menu->xuanxuan['menuOrder'][7] = 'conference'; + $lang->navGroup->conference = 'admin'; + } + + $lang->navGroup->im = 'admin'; + $lang->navGroup->setting = 'admin'; + $lang->navGroup->client = 'admin'; + + $lang->confirmDelete = 'Do you want to delete it?'; +} diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php index c01a054394..9e37799292 100644 --- a/extension/lite/common/ext/lang/zh-cn/lite.php +++ b/extension/lite/common/ext/lang/zh-cn/lite.php @@ -263,3 +263,35 @@ $lang->createObjects['execution'] = '任务看板'; $lang->createObjects['kanban'] = '通用看板'; $lang->createIcons['execution'] = 'kanban'; + +/* Xuan */ +global $config; +if(isset($config->xuanxuan)) +{ + $lang->xuanxuan = new stdclass(); + $lang->admin->menu->xuanxuan = array('link' => '聊天|admin|xuanxuan', 'subModule' => 'client,setting'); + $lang->admin->menuOrder[6] = 'xuanxuan'; + + $lang->admin->menu->xuanxuan['subMenu'] = new stdclass(); + $lang->admin->menu->xuanxuan['subMenu']->index = array('link' => '首页|admin|xuanxuan'); + $lang->admin->menu->xuanxuan['subMenu']->setting = array('link' => '参数|setting|xuanxuan'); + $lang->admin->menu->xuanxuan['subMenu']->update = array('link' => '更新|client|browse', 'subModule' => 'client'); + + $lang->admin->menu->xuanxuan['menuOrder'][0] = 'index'; + $lang->admin->menu->xuanxuan['menuOrder'][5] = 'setting'; + $lang->admin->menu->xuanxuan['menuOrder'][10] = 'update'; + + if($config->edition != 'open') + { + $lang->admin->menu->xuanxuan['subModule'] = 'client,setting,conference'; + $lang->admin->menu->xuanxuan['subMenu']->conference = array('link' => '音视频|conference|admin'); + $lang->admin->menu->xuanxuan['menuOrder'][7] = 'conference'; + $lang->navGroup->conference = 'admin'; + } + + $lang->navGroup->im = 'admin'; + $lang->navGroup->setting = 'admin'; + $lang->navGroup->client = 'admin'; + + $lang->confirmDelete = '您确定要执行删除操作吗？'; +} diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php index 87b12ff20e..c8a9006006 100644 --- a/extension/lite/group/ext/lang/resource.php +++ b/extension/lite/group/ext/lang/resource.php @@ -1,4 +1,7 @@ moduleOrder = array(); @@ -35,8 +38,27 @@ $lang->moduleOrder[200] = 'backup'; $lang->moduleOrder[205] = 'cron'; $lang->moduleOrder[215] = 'message'; +/* Backup xuan related stuff. */ +if(isset($config->xuanxuan)) +{ + $imResource = $lang->resource->im; + $clientResource = $lang->resource->client; + $settingResource = $lang->resource->setting; +} + +/* Reset resource. */ $lang->resource = new stdclass(); +/* Reapply xuan stuff. */ +if(isset($config->xuanxuan)) +{ + $lang->resource->im = $imResource; + $lang->resource->client = $clientResource; + $lang->resource->setting = $settingResource; + $lang->admin->methodOrder[26] = 'xuanxuan'; + $lang->setting->methodOrder[26] = 'xuanxuan'; +} + /* Index module. */ $lang->resource->index = new stdclass(); $lang->resource->index->index = 'index'; @@ -127,7 +149,6 @@ $lang->personnel->methodOrder[15] = 'whitelist'; $lang->personnel->methodOrder[20] = 'addWhitelist'; $lang->personnel->methodOrder[25] = 'unbindWhitelist'; -global $config; if($config->systemMode == 'new') { $lang->resource->my->project = 'project'; @@ -795,6 +816,11 @@ $lang->admin->methodOrder[20] = 'sso'; $lang->admin->methodOrder[25] = 'register'; $lang->admin->methodOrder[30] = 'ztCompany'; +if(isset($config->xuanxuan)) +{ + $lang->resource->admin->xuanxuan = 'xuanxuan'; +} + /* Extension. */ $lang->resource->extension = new stdclass(); $lang->resource->extension->browse = 'browseAction'; diff --git a/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php b/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php index f6582077ba..192158a8e7 100644 --- a/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php +++ b/xuanxuan/extension/xuan/common/ext/lang/zh-cn/xuanxuan.php @@ -1,6 +1,6 @@ xuanxuan = new stdclass(); -$lang->admin->menu->xuanxuan = array('link' => '客户端|admin|xuanxuan', 'subModule' => 'client,setting'); +$lang->admin->menu->xuanxuan = array('link' => '聊天|admin|xuanxuan', 'subModule' => 'client,setting'); $lang->admin->menuOrder[6] = 'xuanxuan'; $lang->admin->menu->xuanxuan['subMenu'] = new stdclass();