Merge pull request #188 from jumpserver/dev_interface

[Update] Interface - 修改显示信息

coco/interactive.py

@@ -80,11 +80,11 @@ class InteractiveServer:
     #
 
     def display_banner(self):
-        default_title = _('Jumpserver open source fortress system')
-        header_title = config.get('HEADER_TITLE', default_title)
+        default_title = _('Welcome to use Jumpserver open source fortress system')
+        header_title = config.get('HEADER_TITLE') or default_title
         self.client.send(char.CLEAR_CHAR)
         self.display_logo()
-        header = _("\n{T}{T}{title} {user}, Welcome to use {header_title} {end}{R}{R}")
+        header = _("\n{T}{T}{title} {user}, {header_title} {end}{R}{R}")
         menu = [
             _("{T}1) Enter {green}ID{end} directly login or enter {green}part IP, Hostname, Comment{end} to search login(if unique).{R}"),
             _("{T}2) Enter {green}/{end} + {green}IP, Hostname{end} or {green}Comment {end} search, such as: /ip.{R}"),

locale/en/LC_MESSAGES/coco.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-21 19:20+0800\n"
+"POT-Creation-Date: 2019-02-21 20:00+0800\n"
 "PO-Revision-Date: 2018-08-10 10:42+0800\n"
 "Last-Translator: BaiJiangjie <bugatti_it@163.com>\n"
 "Language-Team: Language locale/en/LC\n"
@@ -21,14 +21,14 @@ msgid "Connect idle more than {} minutes, disconnect"
 msgstr ""
 
 #: coco/interactive.py:83
-msgid "Jumpserver open source fortress system"
+msgid "Welcome to use Jumpserver open source fortress system"
 msgstr ""
 
 #: coco/interactive.py:87
 #, python-brace-format
 msgid ""
 "\n"
-"{T}{T}{title} {user}, Welcome to use {header_title} {end}{R}{R}"
+"{T}{T}{title} {user}, {header_title} {end}{R}{R}"
 msgstr ""
 
 #: coco/interactive.py:89

locale/zh_CN/LC_MESSAGES/coco.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-02-21 19:20+0800\n"
+"POT-Creation-Date: 2019-02-21 20:00+0800\n"
 "PO-Revision-Date: 2018-08-10 10:42+0800\n"
 "Last-Translator: BaiJiangjie <bugatti_it@163.com>\n"
 "Language-Team: Language locale/zh\n"
@@ -21,16 +21,16 @@ msgid "Connect idle more than {} minutes, disconnect"
 msgstr "空闲时间超过 {} 分钟，断开连接"
 
 #: coco/interactive.py:83
-msgid "Jumpserver open source fortress system"
-msgstr "Jumpserver开源跳板机系统"
+msgid "Welcome to use Jumpserver open source fortress system"
+msgstr "欢迎使用Jumpserver开源跳板机系统"
 
 #: coco/interactive.py:87
 msgid ""
 "\n"
-"{T}{T}{title} {user}, Welcome to use {header_title} {end}{R}{R}"
+"{T}{T}{title} {user}, {header_title} {end}{R}{R}"
 msgstr ""
 "\n"
-"{T}{T}{title} {user}, 欢迎使用{header_title} {end}{R}{R}"
+"{T}{T}{title} {user}, {header_title} {end}{R}{R}"
 
 #: coco/interactive.py:89
 #, python-brace-format