* finish task #7539.

This commit is contained in:
z
2020-07-25 11:03:33 +08:00
parent f4987f4a04
commit deed071f8e
7 changed files with 41 additions and 37 deletions
+1 -1
View File
@@ -25,6 +25,7 @@ $config->dev->group['casestep'] = 'qa';
$config->dev->group['testtask'] = 'qa';
$config->dev->group['testreport'] = 'qa';
$config->dev->group['testsuite'] = 'qa';
$config->dev->group['caselib'] = 'qa';
$config->dev->group['testresult'] = 'qa';
$config->dev->group['testrun'] = 'qa';
$config->dev->group['suitecase'] = 'qa';
@@ -79,7 +80,6 @@ $config->dev->group['repofiles'] = 'repo';
$config->dev->group['repohistory'] = 'repo';
$config->dev->group['repobranch'] = 'repo';
$config->dev->tableMap['storyspec'] = 'story';
$config->dev->tableMap['storystage'] = 'story';
$config->dev->tableMap['burn'] = 'task';
+1 -8
View File
@@ -88,6 +88,7 @@ $lang->dev->tableList['svn'] = 'SVN';
$lang->dev->tableList['testcase'] = 'Test Case';
$lang->dev->tableList['testreport'] = 'Test Report';
$lang->dev->tableList['testsuite'] = 'Test Suite';
$lang->dev->tableList['caselib'] = 'Case Library';
$lang->dev->tableList['tree'] = 'Module Tree';
$lang->dev->tableList['upgrade'] = 'Update';
$lang->dev->tableList['cron'] = 'Cron';
@@ -109,14 +110,6 @@ $lang->dev->tableList['repo'] = 'Code';
$lang->dev->tableList['repohistory'] = 'Repo History';
$lang->dev->tableList['repofiles'] = 'Repo Files';
$lang->dev->tableList['repobranch'] = 'Repo Branch';
$lang->dev->tableList['im_chatuser'] = 'Client Users';
$lang->dev->tableList['im_message'] = 'Client Message';
$lang->dev->tableList['im_messagestatus'] = 'Client Message Status';
$lang->dev->tableList['im_chat'] = 'Client Chat';
$lang->dev->tableList['im_client'] = 'Client Upgrade';
$lang->dev->tableList['im_conference'] = 'Client Conference';
$lang->dev->tableList['im_conferenceaction'] = 'Client Conference Action';
$lang->dev->tableList['im_queue'] = 'Client Queue';
$lang->dev->groupList['my'] = 'Dashboard';
$lang->dev->groupList['product'] = $lang->productCommon;
+1 -8
View File
@@ -88,6 +88,7 @@ $lang->dev->tableList['svn'] = 'SVN';
$lang->dev->tableList['testcase'] = '测试用例';
$lang->dev->tableList['testreport'] = '测试报告';
$lang->dev->tableList['testsuite'] = '测试套件';
$lang->dev->tableList['caselib'] = '用例库';
$lang->dev->tableList['tree'] = '模块关系';
$lang->dev->tableList['upgrade'] = '更新';
$lang->dev->tableList['cron'] = '定时任务';
@@ -109,14 +110,6 @@ $lang->dev->tableList['repo'] = '代码';
$lang->dev->tableList['repohistory'] = '版本历史';
$lang->dev->tableList['repofiles'] = '代码文件';
$lang->dev->tableList['repobranch'] = '代码分支';
$lang->dev->tableList['im_chatuser'] = '客户端用户';
$lang->dev->tableList['im_message'] = '客户端消息';
$lang->dev->tableList['im_messagestatus'] = '客户端状态';
$lang->dev->tableList['im_chat'] = '客户端会话';
$lang->dev->tableList['im_client'] = '客户端版本更新';
$lang->dev->tableList['im_conference'] = '音视频会议';
$lang->dev->tableList['im_conferenceaction'] = '会议action';
$lang->dev->tableList['im_queue'] = '客户端推送';
$lang->dev->groupList['my'] = '我的地盘';
$lang->dev->groupList['product'] = $lang->productCommon;
+1 -1
View File
@@ -43,7 +43,7 @@ class devModel extends model
{
if(isset($this->config->dev->tableMap[$module])) $aliasModule = $this->config->dev->tableMap[$module];
if(strpos($aliasModule, '-') !== false) list($aliasModule, $subLang) = explode('-', $aliasModule);
if(strpos($module, 'im_') === false) $this->app->loadLang($aliasModule ? $aliasModule : $module);
if(empty($aliasModule) and strpos($module, 'im_') === false) $this->app->loadLang($aliasModule ? $aliasModule : $module);
}
catch(PDOException $e)
{
+17 -11
View File
@@ -1,13 +1,19 @@
<?php
$config->dev->group['im'] = 'api';
$config->dev->group['im_chat'] = 'api';
$config->dev->group['im_message'] = 'api';
$config->dev->group['im_client'] = 'api';
$config->dev->group['im_chatuser'] = 'api';
$config->dev->group['im_messagestatus'] = 'api';
$config->dev->group['im'] = 'xuanxuan';
$config->dev->group['im_chatuser'] = 'xuanxuan';
$config->dev->group['im_message'] = 'xuanxuan';
$config->dev->group['im_messagestatus'] = 'xuanxuan';
$config->dev->group['im_chat'] = 'xuanxuan';
$config->dev->group['im_client'] = 'xuanxuan';
$config->dev->group['im_conference'] = 'xuanxuan';
$config->dev->group['im_conferenceaction'] = 'xuanxuan';
$config->dev->group['im_queue'] = 'xuanxuan';
$config->dev->tableMap['im_chat'] = 'api';
$config->dev->tableMap['im_message'] = 'api';
$config->dev->tableMap['im_client'] = 'api';
$config->dev->tableMap['im_chatuser'] = 'api';
$config->dev->tableMap['im_messagestatus'] = 'api';
$config->dev->tableMap['im_chatuser'] = 'im';
$config->dev->tableMap['im_message'] = 'message';
$config->dev->tableMap['im_messagestatus'] = 'message';
$config->dev->tableMap['im_chat'] = 'im';
$config->dev->tableMap['im_client'] = 'client';
$config->dev->tableMap['im_conference'] = 'owt';
$config->dev->tableMap['im_conferenceaction'] = 'owt';
$config->dev->tableMap['im_queue'] = 'message';
+10 -4
View File
@@ -1,5 +1,11 @@
<?php
$lang->dev->tableList['im_chat'] = 'Chat List';
$lang->dev->tableList['im_message'] = 'Chat Message';
$lang->dev->tableList['im_chatuser'] = 'Chat User';
$lang->dev->tableList['im_messagestatus'] = 'Chat Status';
$lang->dev->groupList['xuanxuan']= 'Client';
$lang->dev->tableList['im_chatuser'] = 'Client Users';
$lang->dev->tableList['im_message'] = 'Client Message';
$lang->dev->tableList['im_messagestatus'] = 'Client Message Status';
$lang->dev->tableList['im_chat'] = 'Client Chat';
$lang->dev->tableList['im_client'] = 'Client Upgrade';
$lang->dev->tableList['im_conference'] = 'Client Conference';
$lang->dev->tableList['im_conferenceaction'] = 'Client Conference Action';
$lang->dev->tableList['im_queue'] = 'Client Queue';
@@ -1,5 +1,11 @@
<?php
$lang->dev->tableList['im_chat'] = '喧喧列表';
$lang->dev->tableList['im_message'] = '喧喧消息';
$lang->dev->tableList['im_chatuser'] = '喧喧用户';
$lang->dev->tableList['im_messagestatus'] = '喧喧消息状态';
$lang->dev->groupList['xuanxuan']= '客户端';
$lang->dev->tableList['im_chatuser'] = '客户端用户';
$lang->dev->tableList['im_message'] = '客户端消息';
$lang->dev->tableList['im_messagestatus'] = '客户端状态';
$lang->dev->tableList['im_chat'] = '客户端会话';
$lang->dev->tableList['im_client'] = '客户端版本更新';
$lang->dev->tableList['im_conference'] = '音视频会议';
$lang->dev->tableList['im_conferenceaction'] = '会议action';
$lang->dev->tableList['im_queue'] = '客户端推送';