diff --git a/Makefile b/Makefile index 944e1c9320..2dd791442a 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ zentaoxx: cp -r xuan/xxb/module/common/view/footer.modal.html.php zentaoxx/module/common/view mkdir -p zentaoxx/www/js/ cp -r xuan/xxb/www/js/markedjs zentaoxx/www/js/ + cp -r xuan/xxb/www/x.php zentaoxx/www/ mkdir zentaoxx/module/action cp -r xuan/xxb/module/action/ext zentaoxx/module/action cp -r xuanxuan/config/* zentaoxx/config/ diff --git a/framework/router.class.php b/framework/router.class.php index eaf72e96b1..a9dc4a87ce 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -112,8 +112,8 @@ class router extends baseRouter $productProject = $productProject->value; list($productCommon, $projectCommon) = explode('_', $productProject); } - $lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['zh-cn'][0]; - $lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['zh-cn'][0]; + $lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['en'][0]; + $lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['en'][0]; } parent::loadLang($moduleName, $appName); diff --git a/module/action/model.php b/module/action/model.php index 3c4a27e2a2..875c304cf7 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1052,7 +1052,7 @@ class actionModel extends model foreach($actions as $action) { $timeStamp = strtotime(isset($action->originalDate) ? $action->originalDate : $action->date); - $date = $this->app->getClientLang() == 'en' ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp); + $date = common::checkEnLang() ? date('M d', $timeStamp) : date(DT_DATE4, $timeStamp); $action->time = date(DT_TIME2, $timeStamp); $dateGroup[$date][] = $action; } diff --git a/module/admin/lang/en.php b/module/admin/lang/en.php index da52a328d2..f14dd5fb21 100644 --- a/module/admin/lang/en.php +++ b/module/admin/lang/en.php @@ -78,5 +78,5 @@ $lang->admin->safe->reasonList['birthday'] = 'Same as DOB'; $lang->admin->safe->modifyPasswordList[1] = 'Yes'; $lang->admin->safe->modifyPasswordList[0] = 'No'; -$lang->admin->safe->noticeMode = 'Password will be checked when a user logs in, or a user is added and edited.'; +$lang->admin->safe->noticeMode = 'Password will be checked when a user logs in, or a user is added or edited.'; $lang->admin->safe->noticeStrong = ''; diff --git a/module/admin/view/safe.html.php b/module/admin/view/safe.html.php index 02f900bc0d..fc653021d2 100644 --- a/module/admin/view/safe.html.php +++ b/module/admin/view/safe.html.php @@ -22,7 +22,7 @@