From 92f4c7375d44d47dd23092aa616394fc1c3a7064 Mon Sep 17 00:00:00 2001 From: tengfei Date: Mon, 2 Apr 2018 13:10:58 +0800 Subject: [PATCH 01/15] * fix English translation --- module/user/lang/en.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 060fbaadea..6be646a744 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -99,13 +99,13 @@ $lang->user->weakPassword = "Your password does meet the setting requirements."; $lang->user->roleList[''] = ''; $lang->user->roleList['dev'] = 'Developer'; -$lang->user->roleList['qa'] = 'Tester'; +$lang->user->roleList['qa'] = 'QA'; $lang->user->roleList['pm'] = 'Project Manager'; $lang->user->roleList['po'] = 'Product Owner'; -$lang->user->roleList['td'] = 'Technical Director'; +$lang->user->roleList['td'] = 'Test Director'; $lang->user->roleList['pd'] = 'Product Director'; $lang->user->roleList['qd'] = 'QA Director'; -$lang->user->roleList['top'] = 'Senior Manager'; +$lang->user->roleList['top'] = 'Top Manager'; $lang->user->roleList['others'] = 'Other'; $lang->user->genderList['m'] = 'M'; From 196693330636bc1bc67e9f94846825a76e3ae823 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 11 May 2018 11:08:06 +0800 Subject: [PATCH 02/15] * finish task #3998. --- module/api/view/debug.html.php | 84 ++++++++++++++++------------------ 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/module/api/view/debug.html.php b/module/api/view/debug.html.php index 3e0a3bdf54..d3fedf200a 100644 --- a/module/api/view/debug.html.php +++ b/module/api/view/debug.html.php @@ -3,50 +3,46 @@
 post ? 'GET/POST ' . $filePath : 'GET ' . $filePath?>
-
-
-
-
api->position;?>
-
api->startLine, $method->fileName, $method->startLine);?>
-
-
-
api->desc;?>
- 
", $method->comment);?>
-
-
-
api->debug;?>
-
-
- parameters):?> - - parameters as $param):?> - - - - - - - - -
name?>name", $param->isOptional() ? $param->getDefaultValue() : '', "class='form-control' autocomplete='off'")?>
- api->submit)?> -
- - api->noParam . html::submitButton($lang->api->submit);?> - - post) echo "

{$lang->api->post}

"?> -
-
-
- +
+
api->position;?>
+
api->startLine, $method->fileName, $method->startLine);?>
+
+
+
api->desc;?>
+ 
", $method->comment);?>
+
+
+
api->debug;?>
+
+
+ parameters):?> + + parameters as $param):?> + + + + + + + + +
name?>name", $param->isOptional() ? $param->getDefaultValue() : '', "class='form-control' autocomplete='off'")?>
+ api->submit)?> +
+ + api->noParam . html::submitButton($lang->api->submit);?> + + post) echo "

{$lang->api->post}

"?> +
+
+
+ From 96b9e26cb51dcda89649f89e143f0ba5cd39b00c Mon Sep 17 00:00:00 2001 From: tengfei Date: Fri, 11 May 2018 11:26:56 +0800 Subject: [PATCH 03/15] * minor translation update --- module/backup/lang/en.php | 4 ++-- module/common/lang/en.php | 2 +- module/product/lang/en.php | 22 +++++++++++----------- module/user/lang/en.php | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/module/backup/lang/en.php b/module/backup/lang/en.php index d3df0e55ca..57b8ff7299 100644 --- a/module/backup/lang/en.php +++ b/module/backup/lang/en.php @@ -5,10 +5,10 @@ $lang->backup->history = 'History'; $lang->backup->delete = 'Delete'; $lang->backup->backup = 'Backup'; $lang->backup->restore = 'Restore'; -$lang->backup->change = 'Modify days'; +$lang->backup->change = 'Modify expiration'; $lang->backup->changeAB = 'Modify'; -$lang->backup->time = 'Backup Time'; +$lang->backup->time = 'Date'; $lang->backup->files = 'Files'; $lang->backup->size = 'Size'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 48fc29ccf0..d84c07c4cd 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -464,7 +464,7 @@ $lang->noResultsMatch = "No results match!"; $lang->searchMore = "More results："; $lang->chooseUsersToMail = "Choose users that will be notified."; $lang->browserNotice = 'Your current browser might not show the best effect. Please use Chrome, Firefox, IE9+, Opera or Safari.'; -$lang->noticePasteImg = "Support pasting images."; +$lang->noticePasteImg = "Paste images here."; /* 时间格式设置。*/ if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s'); diff --git a/module/product/lang/en.php b/module/product/lang/en.php index 7a005dc468..75e44d5c73 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -52,7 +52,7 @@ $lang->product->unResolvedBugs = 'Unresolved Bug'; $lang->product->assignToNullBugs = 'Unassigned Bug'; $lang->product->confirmDelete = " Do you want to delete {$lang->productCommon}?"; -$lang->product->errorNoProduct = "{$lang->productCommon} is not created yet!"; +$lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!"; $lang->product->accessDenied = "You have no access to {$lang->productCommon}."; $lang->product->id = 'ID'; @@ -72,20 +72,20 @@ $lang->product->whitelist = 'Whitelist'; $lang->product->branch = '%s'; $lang->product->qa = 'QA'; $lang->product->release = 'Release'; -$lang->product->latestDynamic = 'Latest Dynamic'; +$lang->product->latestDynamic = 'Dynamic'; $lang->product->iteration = 'Iteration'; -$lang->product->iterationInfo = 'Iterate %s times'; -$lang->product->iterationView = 'Iteration View'; +$lang->product->iterationInfo = '%s Iterations'; +$lang->product->iterationView = 'Details'; $lang->product->searchStory = 'Search'; -$lang->product->assignedToMe = 'Assigned To Me'; -$lang->product->openedByMe = 'Created By Me'; -$lang->product->reviewedByMe = 'Reviewed By Me'; +$lang->product->assignedToMe = 'AssignedToMe'; +$lang->product->openedByMe = 'CreatedByMe'; +$lang->product->reviewedByMe = 'ReviewedByMe'; $lang->product->closedByMe = 'ClosedByMe'; $lang->product->draftStory = 'Draft'; $lang->product->activeStory = 'Activated'; $lang->product->changedStory = 'Changed'; -$lang->product->willClose = 'ToBeClose'; +$lang->product->willClose = 'ToBeClosed'; $lang->product->closedStory = 'Closed'; $lang->product->unclosed = 'Open'; $lang->product->unplan = 'Wait'; @@ -100,8 +100,8 @@ $lang->product->typeList['branch'] = 'Multi Branch'; $lang->product->typeList['platform'] = 'Multi Platform'; $lang->product->typeTips = array(); -$lang->product->typeTips['branch'] = '(Divide the custom content.)'; -$lang->product->typeTips['platform'] = '(Divide IOS, Android, PC, etc.)'; +$lang->product->typeTips['branch'] = '(for the custom content)'; +$lang->product->typeTips['platform'] = '(for IOS, Android, PC, etc.)'; $lang->product->branchName['normal'] = ''; $lang->product->branchName['branch'] = 'Branch'; @@ -111,7 +111,7 @@ $lang->product->statusList[''] = ''; $lang->product->statusList['normal'] = 'Normal'; $lang->product->statusList['closed'] = 'Closed'; -$lang->product->aclList['open'] = "Default (User with {$lang->productCommon} View privilege have access to it)"; +$lang->product->aclList['open'] = "Default (User with privilege to {$lang->productCommon} can access to it.)"; $lang->product->aclList['private'] = "Private {$lang->productCommon} ({$lang->projectCommon} team members only)"; $lang->product->aclList['custom'] = 'Custom (Team members and Whitelist members have access to it.)'; diff --git a/module/user/lang/en.php b/module/user/lang/en.php index 0ef0e78182..b51e16afa5 100644 --- a/module/user/lang/en.php +++ b/module/user/lang/en.php @@ -38,7 +38,7 @@ $lang->user->phone = 'Phone'; $lang->user->address = 'Address'; $lang->user->zipcode = 'Zip Code'; $lang->user->join = 'Join Date'; -$lang->user->visits = 'Visit Count'; +$lang->user->visits = 'Visits'; $lang->user->ip = 'Last IP'; $lang->user->last = 'Last Login'; $lang->user->ranzhi = 'Zdoo Account'; From cc0bfeed1d8490bb874e7efb8b4bee7d2ebc178a Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 11 May 2018 11:30:20 +0800 Subject: [PATCH 04/15] * finish task #3999. --- module/backup/view/index.html.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/module/backup/view/index.html.php b/module/backup/view/index.html.php index f84f68543e..983350a631 100644 --- a/module/backup/view/index.html.php +++ b/module/backup/view/index.html.php @@ -30,6 +30,10 @@ backup->history?> backup->restoreTip;?> +
+ backup->holdDays, $config->backup->holdDays)?> + backup->changeAB, '', "class='iframe btn btn-sm btn-info' data-width='300'");?> +
@@ -64,14 +68,6 @@ - - - - -
- backup->holdDays, $config->backup->holdDays)?> - backup->changeAB, '', "class='iframe btn btn-sm btn-info' data-width='300'");?> -
-
- checkVersion):?> - app->getClientLang() == 'en' ? 'http://api.zentao.pm' : 'http://api.zentao.net';?> - - - -
- + From 6aa2295ea6c8178e3e31f592d07e543c97bcfb9a Mon Sep 17 00:00:00 2001 From: Catouse Date: Fri, 11 May 2018 14:58:57 +0800 Subject: [PATCH 08/15] * improve UI of datatable custom model. --- module/datatable/lang/en.php | 2 +- module/datatable/lang/zh-cn.php | 2 +- module/datatable/lang/zh-tw.php | 2 +- module/datatable/view/ajaxcustom.html.php | 44 +++++++++++++--------- www/theme/zui/css/min.css | 4 +- www/theme/zui/fonts/ZentaoIcon.eot | Bin 22868 -> 23228 bytes www/theme/zui/fonts/ZentaoIcon.svg | 1 + www/theme/zui/fonts/ZentaoIcon.ttf | Bin 22692 -> 23052 bytes www/theme/zui/fonts/ZentaoIcon.woff | Bin 22768 -> 23128 bytes 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/module/datatable/lang/en.php b/module/datatable/lang/en.php index d577238ec5..968ff1e871 100644 --- a/module/datatable/lang/en.php +++ b/module/datatable/lang/en.php @@ -7,7 +7,7 @@ $lang->datatable->hide = 'Hide'; $lang->datatable->reset = 'Reset'; $lang->datatable->custom = 'Custom Columns'; -$lang->datatable->customTip = 'Check Columns to Display'; +$lang->datatable->customTip = 'Check Columns to Display，Drag Column name to Sort'; $lang->datatable->table = 'Switch to Common Table'; $lang->datatable->datatable = 'Switch to Advanced Table'; $lang->datatable->required = 'Required'; diff --git a/module/datatable/lang/zh-cn.php b/module/datatable/lang/zh-cn.php index 9ec0df9869..76752c33b4 100644 --- a/module/datatable/lang/zh-cn.php +++ b/module/datatable/lang/zh-cn.php @@ -7,7 +7,7 @@ $lang->datatable->hide = '隐藏'; $lang->datatable->reset = '恢复默认'; $lang->datatable->custom = '自定义列'; -$lang->datatable->customTip = '勾选需要显示的列'; +$lang->datatable->customTip = '勾选需要显示的列，拖动列名进行排序。'; $lang->datatable->table = '简单表格'; $lang->datatable->datatable = '高级表格'; $lang->datatable->required = '必选'; diff --git a/module/datatable/lang/zh-tw.php b/module/datatable/lang/zh-tw.php index e879e1c042..d76cbd0dce 100644 --- a/module/datatable/lang/zh-tw.php +++ b/module/datatable/lang/zh-tw.php @@ -7,7 +7,7 @@ $lang->datatable->hide = '隱藏'; $lang->datatable->reset = '恢復預設'; $lang->datatable->custom = '自定義列'; -$lang->datatable->customTip = '勾選需要顯示的列'; +$lang->datatable->customTip = '勾選需要顯示的列，拖動列名進行排序。'; $lang->datatable->table = '簡單表格'; $lang->datatable->datatable = '高級表格'; $lang->datatable->required = '必選'; diff --git a/module/datatable/view/ajaxcustom.html.php b/module/datatable/view/ajaxcustom.html.php index c27d2484c9..eff3e30d9d 100644 --- a/module/datatable/view/ajaxcustom.html.php +++ b/module/datatable/view/ajaxcustom.html.php @@ -12,10 +12,12 @@ ?>