From 474da336c18a6374f1128e31bfbbaa237372631c Mon Sep 17 00:00:00 2001 From: wwccss Date: Thu, 18 Jan 2018 12:11:59 +0800 Subject: [PATCH] * adjust Install module. --- module/install/control.php | 2 +- module/install/css/common.css | 4 +- module/install/lang/en.php | 64 +++++++++++++++--------------- module/install/lang/zh-cn.php | 6 +-- module/install/model.php | 17 ++++++++ module/install/view/step1.html.php | 4 +- module/install/view/step2.html.php | 6 +-- 7 files changed, 60 insertions(+), 43 deletions(-) diff --git a/module/install/control.php b/module/install/control.php index 6c3002daee..1750b294eb 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -52,7 +52,7 @@ class install extends control public function license() { $this->view->title = $this->lang->install->welcome; - $this->view->license = file_get_contents($this->app->getBasePath() . 'doc/LICENSE'); + $this->view->license = $this->install->getLicense(); $this->display(); } diff --git a/module/install/css/common.css b/module/install/css/common.css index 111d2a692b..389a4a841c 100644 --- a/module/install/css/common.css +++ b/module/install/css/common.css @@ -11,5 +11,5 @@ body{background: #f1f1f1;} @media (max-width: 700px){.modal-dialog{padding: 0;} .modal-content{box-shadow: none;border-width: 1px 0;border-radius: 0}} -.ok{background:green; color:white} -.fail{background:red; color:white} +#checker .ok{background:green; color:white} +#checker .fail{background:red; color:white} \ No newline at end of file diff --git a/module/install/lang/en.php b/module/install/lang/en.php index af3bc742f9..e8af7a2985 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -20,18 +20,18 @@ $lang->install->error = 'Error '; $lang->install->start = 'Start to Install'; $lang->install->keepInstalling = 'Continue installing this version.'; $lang->install->seeLatestRelease = 'View Latest Version'; -$lang->install->welcome = 'Welcome to ZenTao Project Management Software!'; +$lang->install->welcome = 'Thanks for using ZenTao Project Management Software!'; $lang->install->license = 'ZenTao PMS is under Z PUBLIC LICENSE(ZPL) 1.2'; $lang->install->desc = <<ZPL. It us an open source and free project management software, integrated with Product Management、Project Management、QA Management, as weel as Todo Management, Company Managementetc, which is the best choice for small and medium organizations to manage projects. +ZenTao Project Management Software is an open source software released under ZPL license. It integrates with Product Management、Project Management、QA Management, Document Management, as weel as To-Dos Management, Company Managementetc. ZenTao is the best choice for software project management. -ZenTao PMS uses PHP + MySQL as programming langugages and is based on ZenTaoPHP, an independent framwork developed by our team. Third party developers/organizations can develop extensions or customization tailored to their needs. +ZenTao PMS uses PHP + MySQL as programming langugages and is based on ZenTaoPHP, an independent framwork developed by our team. Third party developers/organizations can develop extensions or customization tailored to their needs. EOT; $lang->install->links = <<Qingdao Nature Easy Soft Co., LTD. -Officila Wensite http://www.zentao.net -Technical Support http://www.zentao.net/ask/ -Weibo：http://weibo.com/easysoft +ZenTao PMS is developed by Nature Easy Soft Co., LTD. +Official Website http://www.zentao.pm +Technical Support http://www.zentao.pm/ask/ +Twitter: cneasysoft You are installing ZenTao %s Version. EOT; @@ -62,38 +62,38 @@ $lang->install->pdoMySQL = 'PDO_MySQL'; $lang->install->pdoMySQLFail = 'Edit PHP ini file to load PDO_MySQL extsion.'; $lang->install->json = 'JSON Extension'; $lang->install->jsonFail = 'Edit the php.ini file to load JSON extension.'; -$lang->install->openssl = 'OPENSSL Extension'; +$lang->install->openssl = 'OpenSSL Extension'; $lang->install->opensslFail = 'Edit the php.ini file to load openssl extension.'; -$lang->install->mbstring = 'MBSTRING Extension'; +$lang->install->mbstring = 'Mbstring Extension'; $lang->install->mbstringFail = 'Edit the php.ini file to load mbstring extension.'; -$lang->install->zlib = 'ZLIB Extension'; +$lang->install->zlib = 'Zlib Extension'; $lang->install->zlibFail = 'Edit the php.ini file to load zlib extension.'; -$lang->install->curl = 'CURL Extension'; +$lang->install->curl = 'Curl Extension'; $lang->install->curlFail = 'Edit the php.ini file to load curl extension.'; -$lang->install->filter = 'FILTER Extension'; +$lang->install->filter = 'Filter Extension'; $lang->install->filterFail = 'Edit the php.ini file to load filter extension.'; $lang->install->gd = 'GD Extension'; $lang->install->gdFail = 'Edit the php.ini file to load gd extension.'; -$lang->install->iconv = 'ICONV Extension'; +$lang->install->iconv = 'Iconv Extension'; $lang->install->iconvFail = 'Edit the php.ini file to load iconv extension.'; -$lang->install->tmpRoot = 'Temp File Directory'; +$lang->install->tmpRoot = 'Temp Directory'; $lang->install->dataRoot = 'Uploaded File Directory'; $lang->install->session = 'Session Save Path'; $lang->install->sessionFail = 'Edit the php.ini file to set session.save_path.'; -$lang->install->mkdirWin = '

%s directory has to be created.
Run
mkdir %s

command line.'; +$lang->install->mkdirWin = '

%s directory has to be created.
Run mkdir %s to create it.

'; $lang->install->chmodWin = ' "%s" privilege has to be changed.'; -$lang->install->mkdirLinux = '

%s directory has to be created.
Run
mkdir -p %s

command line.'; -$lang->install->chmodLinux = ' "%s" privilege has to be changed.
Run
chmod o=rwx -R %s command line.'; +$lang->install->mkdirLinux = '

%s directory has to be created.
Run mkdir -p %s to create it.

'; +$lang->install->chmodLinux = ' "%s" privilege has to be changed.
Run chmod o=rwx -R %s to change it.'; -$lang->install->defaultLang = 'Default Lang'; +$lang->install->defaultLang = 'Default Language'; $lang->install->dbHost = 'Database Host'; $lang->install->dbHostNote = 'If 127.0.0.1 is not accessible, try localhost.'; -$lang->install->dbPort = 'host Port'; +$lang->install->dbPort = 'Host Port'; $lang->install->dbUser = 'Database User'; $lang->install->dbPassword = 'Database Password'; -$lang->install->dbName = 'Database Library'; -$lang->install->dbPrefix = 'Database Table Prefix'; -$lang->install->clearDB = 'Clear Database'; +$lang->install->dbName = 'Database Name'; +$lang->install->dbPrefix = 'Table Prefix'; +$lang->install->clearDB = 'Clean tables if already exist.'; $lang->install->importDemoData = 'Import Demo Data'; $lang->install->working = 'Working way'; @@ -172,27 +172,27 @@ $lang->install->product = array('chanzhi', 'ranzhi'); $lang->install->promotion = "Products of Nature Easy Soft:"; $lang->install->chanzhi = new stdclass(); -$lang->install->chanzhi->name = 'Zsite CMS'; +$lang->install->chanzhi->name = 'ZSITE content management system.'; $lang->install->chanzhi->logo = 'images/main/chanzhi_en.png'; $lang->install->chanzhi->url = 'http://www.zsite.net'; $lang->install->chanzhi->desc = << -
  • Professional Content Management Sysytem
    • -
  • Rich features and simple to apply
    • -
  • Aims at details for SEO
    • -
  • Open source and free
    • +
  • Article, Blog, Manual, Member, Shop, Forum, Feedback……
    • +
  • Customize page freely by theme, effect, widget, css, js and layout
    • +
  • Support desktop and mobile in one system
    • +
  • Deeply optimized for search engine
    • EOD; $lang->install->ranzhi = new stdclass(); -$lang->install->ranzhi->name = 'Zdoo Collaborative System'; +$lang->install->ranzhi->name = 'ZDOO Collaborative System'; $lang->install->ranzhi->logo = 'images/main/zdoo_org.png'; $lang->install->ranzhi->url = 'http://www.zdoo.org'; $lang->install->ranzhi->desc = << -
  • Customer Management and Order Tracking
    • -
  • Project/Task and Announcement/Document
    • -
  • Income/Expense and Account In/Out
    • -
  • Forum/Blog and Dynamic/News
    • +
  • CRM: Customer Management and Order Tracking
    • +
  • OA: Approve, Announce, Trip, Leave and so on.
    • +
  • Project，Task and Document management
    • +
  • Money: Income, Expense, Transfer, Invest and Debt
    • EOD; diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 5a0ce60726..675f9b34ef 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -80,10 +80,10 @@ $lang->install->tmpRoot = '临时文件目录'; $lang->install->dataRoot = '上传文件目录'; $lang->install->session = 'Session存储目录'; $lang->install->sessionFail = '修改PHP配置文件，设置session.save_path'; -$lang->install->mkdirWin = '

    需要创建目录%s。命令行下面命令为：
    mkdir %s

    '; +$lang->install->mkdirWin = '

    需要创建目录%s。命令为：
    mkdir %s

    '; $lang->install->chmodWin = '需要修改目录 "%s" 的权限。'; -$lang->install->mkdirLinux = '

    需要创建目录%s。
    命令行下面命令为：
    mkdir -p %s

    '; -$lang->install->chmodLinux = '需要修改目录 "%s" 的权限。
    命令行下面命令为：
    chmod o=rwx -R %s'; +$lang->install->mkdirLinux = '

    需要创建目录%s。
    命令为：
    mkdir -p %s

    '; +$lang->install->chmodLinux = '需要修改目录 "%s" 的权限。
    命令为：
    chmod o=rwx -R %s'; $lang->install->defaultLang = '默认语言'; $lang->install->dbHost = '数据库服务器'; diff --git a/module/install/model.php b/module/install/model.php index d4c7abd923..bf9e69bd7c 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -13,6 +13,23 @@ app->getClientLang(); + + $licenseCN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.CN'); + $licenseEN = file_get_contents($this->app->getBasePath() . 'doc/LICENSE.EN'); + + if($clientLang == 'zh' or $clientLang == 'zh-tw') return $licenseCN . $licenseEN; + return $licenseEN . $licenseCN; + } + /** * Check version of zentao. * diff --git a/module/install/view/step1.html.php b/module/install/view/step1.html.php index 46774fc9e4..2025f53cce 100644 --- a/module/install/view/step1.html.php +++ b/module/install/view/step1.html.php @@ -14,9 +14,9 @@
    install->checking;?>
    - +
    - + diff --git a/module/install/view/step2.html.php b/module/install/view/step2.html.php index 9f1cd3059f..5845cb7d1d 100644 --- a/module/install/view/step2.html.php +++ b/module/install/view/step2.html.php @@ -17,9 +17,9 @@
    install->checkItem;?> install->current?> install->result?>
    - - - + + +
    install->key;?>install->value?>
    install->key;?>install->value?>