Merge branch 'sprint/lite6_lwr_tweak_chat' into 'master'
Tweak chat, rename xuan to chat and disable by default. See merge request easycorp/zentaopms!2474
This commit is contained in:
王怡栋
@@ -3774,7 +3774,7 @@ class upgradeModel extends model
|
||||
|
||||
$this->dao->update(TABLE_CONFIG)->set('module')->eq('common')->set('section')->eq('xuanxuan')->where('id')->eq($keyID)->exec();
|
||||
$this->saveLogs($this->dao->get());
|
||||
$this->setting->setItem('system.common.xuanxuan.turnon', '1');
|
||||
$this->setting->setItem('system.common.xuanxuan.turnon', '0');
|
||||
$this->setting->setItem('system.common.xxserver.noticed', '1');
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ $xxConfig = array();
|
||||
foreach($xxItems as $xxItem) $xxConfig[$xxItem->key] = $xxItem->value;
|
||||
if(empty($xxConfig['key']))
|
||||
{
|
||||
$this->setting->setItem('system.common.xuanxuan.turnon', 1);
|
||||
$this->setting->setItem('system.common.xuanxuan.turnon', 0);
|
||||
$this->setting->setItem('system.common.xuanxuan.key', $this->setting->computeSN());
|
||||
}
|
||||
if(!isset($xxConfig['chatPort'])) $this->setting->setItem('system.common.xuanxuan.chatPort', 11444);
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<?php
|
||||
$lang->dev->groupList['xuanxuan']= 'Client';
|
||||
$lang->dev->groupList['xuanxuan']= 'Chat';
|
||||
|
||||
$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->tableList['im_chatuser'] = 'Chat Users';
|
||||
$lang->dev->tableList['im_message'] = 'Chat Message';
|
||||
$lang->dev->tableList['im_messagestatus'] = 'Chat Message Status';
|
||||
$lang->dev->tableList['im_chat'] = 'Chats';
|
||||
$lang->dev->tableList['im_client'] = 'Chat Client Upgrade';
|
||||
$lang->dev->tableList['im_conference'] = 'Chat Conference';
|
||||
$lang->dev->tableList['im_conferenceaction'] = 'Chat Conference Action';
|
||||
$lang->dev->tableList['im_queue'] = 'Chat Push Queue';
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<?php
|
||||
$lang->dev->groupList['xuanxuan']= '客户端';
|
||||
$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_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->tableList['im_conferenceaction'] = '会议动作';
|
||||
$lang->dev->tableList['im_queue'] = '聊天推送';
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
<?php
|
||||
$lang->im->common = 'Desktop';
|
||||
$lang->im->common = 'Chat';
|
||||
$lang->im->turnon = 'On';
|
||||
$lang->im->help = 'Help';
|
||||
$lang->im->settings = 'Settings';
|
||||
$lang->im->xxdServer = 'ZenTao Server';
|
||||
$lang->im->downloadXXD = 'Download XXD';
|
||||
$lang->im->zentaoIntegrate = 'ZenTao Integrated';
|
||||
$lang->im->zentaoClient = 'ZenTao Desktop is added!';
|
||||
$lang->im->zentaoClient = 'ZenTao Desktop Client is added!';
|
||||
$lang->im->getChatUsers = 'Get Chat Users';
|
||||
$lang->im->getChatGroups = 'Get Chat Groups';
|
||||
$lang->im->notifyMSG = 'Notification';
|
||||
@@ -25,7 +25,6 @@ $lang->im->turnonList = array();
|
||||
$lang->im->turnonList[1] = 'Enable';
|
||||
$lang->im->turnonList[0] = 'Disable';
|
||||
|
||||
$lang->im->info = "ZenTao Desktop is powered by <a href='https://xuan.im/' target='_blank'>Xuanxuan</a>, a secure and open source Instant Messenger by Nature Easy Soft. It is a self-hosted and cross-platform tool with numerous plug-ins and robust features. In Xuanxuan, you can code your own plug-ins. Click <a href='https://xuan.im/' target='_blank'>HERE</a> for more.";
|
||||
$lang->im->xxClientConfirm = 'Click Download ZenTao Desktop at the right bottom to download it!';
|
||||
$lang->im->xxServerConfirm = 'Go to User dropmenu to download the ZenTao Desktop Server!';
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
$lang->im->common = '客户端';
|
||||
$lang->im->common = '聊天';
|
||||
$lang->im->turnon = '是否打开';
|
||||
$lang->im->help = '使用说明';
|
||||
$lang->im->settings = '服务器设置';
|
||||
$lang->im->xxdServer = '禅道服务器';
|
||||
$lang->im->downloadXXD = '下载喧喧服务端';
|
||||
$lang->im->downloadXXD = '下载聊天服务端';
|
||||
$lang->im->zentaoIntegrate = '禅道集成';
|
||||
$lang->im->zentaoClient = '新增禅道客户端！';
|
||||
$lang->im->getChatUsers = '获取用户';
|
||||
@@ -25,7 +25,6 @@ $lang->im->turnonList = array();
|
||||
$lang->im->turnonList[1] = '是';
|
||||
$lang->im->turnonList[0] = '否';
|
||||
|
||||
$lang->im->info = "禅道客户端由易软天创旗下另外一款免费、开源、安全的IM产品<a href='https://xuan.im/' target='_blank'>喧喧</a>驱动，支持私有部署，跨平台操作，内置大量插件，功能丰富，在喧喧里，您甚至还可以为自己编写个性化的插件，<a href='https://xuan.im/' target='_blank'>点击查看</a>。";
|
||||
$lang->im->xxClientConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！点击界面右上角用户下拉菜单中下载禅道客户端。';
|
||||
$lang->im->xxServerConfirm = '与禅道深度集成，支持成员沟通，小组讨论，文件传输，任务指派，更加方便的项目管理，更加流畅的团队协作！进入后台-客户端进行下载配置。';
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
$lang->message->typeList['xuanxuan'] = 'Client';
|
||||
$lang->message->typeList['xuanxuan'] = 'Chat';
|
||||
|
||||
$lang->message->sender = 'ZenTao';
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
$lang->message->typeList['xuanxuan'] = '客户端';
|
||||
$lang->message->typeList['xuanxuan'] = '聊天';
|
||||
|
||||
$lang->message->sender = '禅道项目管理';
|
||||
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
<?php
|
||||
$lang->setting->common = 'Settings';
|
||||
$lang->setting->xuanxuan = 'Client';
|
||||
$lang->setting->xuanxuan = 'Chat';
|
||||
$lang->setting->downloadXXD = 'Download XXD';
|
||||
$lang->setting->langs['zh-cn'] = 'Simplified Chinese';
|
||||
$lang->setting->langs['zh-tw'] = 'Traditional Chinese';
|
||||
$lang->setting->langs['en'] = 'English';
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
$lang->setting->common = '设置';
|
||||
$lang->setting->xuanxuan = '客户端集成';
|
||||
$lang->setting->downloadXXD = '下载喧喧服务端';
|
||||
$lang->setting->xuanxuan = '聊天集成';
|
||||
$lang->setting->downloadXXD = '下载聊天服务端';
|
||||
$lang->setting->langs['zh-cn'] = '简体';
|
||||
$lang->setting->langs['zh-tw'] = '繁體';
|
||||
$lang->setting->langs['en'] = 'English';
|
||||
|
||||
@@ -146,9 +146,6 @@
|
||||
</tr>
|
||||
</table>
|
||||
</form>
|
||||
<?php if($type != 'edit'):?>
|
||||
<div class='alert alert-info mg-0'><?php echo $lang->im->info;?></div>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
</div>
|
||||
<?php include $app->getModuleRoot() . 'common/view/footer.html.php';?>
|
||||
|
||||
Reference in New Issue
Block a user