From c6648bf68ff5abd6901242d2a4f4c5e7fff8c7f9 Mon Sep 17 00:00:00 2001
From: WuSiYu <wu.siyu@hotmail.com>
Date: Sat, 23 Jan 2016 01:10:28 +0800
Subject: [PATCH] Adding more Chinese translation and let lables title attr can
 be translated

---
 index.html               | 68 ++++++++++++++++++++--------------------
 js/ctrls/nav.js          |  2 +-
 js/translate/en_US.js    | 15 ++++++++-
 js/translate/template.js | 15 ++++++++-
 js/translate/zh_CN.js    | 32 ++++++++++++++-----
 5 files changed, 87 insertions(+), 45 deletions(-)

diff --git a/index.html b/index.html
index a8f4757..ae7cf3d 100755
--- a/index.html
+++ b/index.html
@@ -473,31 +473,31 @@
         <ul class="stats pull-left" ng-switch-when="active">
           <!-- {{{ active download statistics -->
           <li class="label label-active hidden-phone hidden-tablet">
-            <span title="Download status"><span class="fa fa-fw fa-play">&nbsp;</span> {{download.status}}</span>
+            <span title="{{ 'Download status' | translate }}"><span class="fa fa-fw fa-play">&nbsp;</span> {{download.status}}</span>
           </li>
 
           <li class="label label-default" ng-class="{'label-active': download.downloadSpeed > 2048, 'label-warning': download.downloadSpeed <= 2048}">
-            <span title="Download Speed"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.downloadSpeed | bspeed}}</span>
+            <span title="{{ 'Download Speed' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.downloadSpeed | bspeed}}</span>
           </li>
 
           <li ng-show="download.bittorrent" class="label label-default hidden-phone" ng-class="{'label-info': download.uploadSpeed > 2048}">
-            <span title="Upload Speed"><span class="fa fa-fw fa-arrow-circle-o-up">&nbsp;</span> {{download.uploadSpeed | bspeed}}</span>
+            <span title="{{ 'Upload Speed' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-up">&nbsp;</span> {{download.uploadSpeed | bspeed}}</span>
           </li>
 
           <li class="label label-active">
-            <span title="Estimated time"><span class="fa fa-fw fa-clock-o">&nbsp;</span> {{getEta(download) | time}}</span>
+            <span title="{{ 'Estimated time' | translate }}"><span class="fa fa-fw fa-clock-o">&nbsp;</span> {{getEta(download) | time}}</span>
           </li>
 
           <li class="label label-active hidden-phone">
-            <span title="Download Size"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
           </li>
 
           <li class="label label-active hidden-phone">
-            <span title="Downloaded"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.fmtCompletedLength}}</span>
+            <span title="{{ 'Downloaded' | translate }}"><span class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</span> {{download.fmtCompletedLength}}</span>
           </li>
 
           <li class="label label-active hidden-phone hidden-tablet">
-            <span title="Progress"><span class="fa fa-fw fa-chevron-right">&nbsp;</span> {{getProgress(download)}}%</span>
+            <span title="{{ 'Progress' | translate }}"><span class="fa fa-fw fa-chevron-right">&nbsp;</span> {{getProgress(download)}}%</span>
           </li>
 
           <!-- }}} -->
@@ -506,19 +506,19 @@
         <ul class="stats pull-left" ng-switch-when="paused">
           <!-- {{{ paused download statistics -->
           <li class="label label-info">
-            <span title="Download Status"><span class="fa fa-fw fa-pause">&nbsp;</span> {{download.status}}</span>
+            <span title="{{ 'Download Status' | translate }}"><span class="fa fa-fw fa-pause">&nbsp;</span> {{download.status}}</span>
           </li>
 
           <li class="label label-info">
-            <span title="Download Size"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
           </li>
 
           <li class="label label-info hidden-phone">
-            <span title="Downloaded"><span class="fa fa-fw fa-download">&nbsp;</span> {{download.fmtCompletedLength}}</span>
+            <span title="{{ 'Downloaded' | translate }}"><span class="fa fa-fw fa-download">&nbsp;</span> {{download.fmtCompletedLength}}</span>
           </li>
 
           <li class="label label-info hidden-phone">
-            <span title="Download Path"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
+            <span title="{{ 'Download Path' | translate }}"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
           </li>
 
           <!--  }}} -->
@@ -527,19 +527,19 @@
         <ul class="stats pull-left" ng-switch-when="waiting">
           <!-- {{{ paused download statistics -->
           <li class="label label-default">
-            <span title="Download Status"><span class="fa fa-fw fa-caret-right">&nbsp;</span> {{download.status}}</span>
+            <span title="{{ 'Download status' | translate }}"><span class="fa fa-fw fa-caret-right">&nbsp;</span> {{download.status}}</span>
           </li>
 
           <li class="label label-default">
-            <span title="Download Size"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
           </li>
 
           <li class="label label-default hidden-phone">
-            <span title="Downloaded"><span class="fa fa-fw fa-download">&nbsp;</span> {{download.fmtCompletedLength}}</span>
+            <span title="{{ 'Downloaded' | translate }}"><span class="fa fa-fw fa-download">&nbsp;</span> {{download.fmtCompletedLength}}</span>
           </li>
 
           <li class="label label-default hidden-phone">
-            <span title="Download Path"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
+            <span title="{{ 'Download Path' | translate }}"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
           </li>
 
           <!--  }}} -->
@@ -549,15 +549,15 @@
           <!-- {{{ complete download statistics -->
 
           <li class="label label-success">
-            <span title="Download Status"><span class="fa fa-fw fa-check-square-o">&nbsp;</span> {{download.status}}</span>
+            <span title="{{ 'Download Status' | translate }}"><span class="fa fa-fw fa-check-square-o">&nbsp;</span> {{download.status}}</span>
           </li>
 
           <li class="label label-success">
-            <span title="Download Size"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
           </li>
 
           <li class="label label-success hidden-phone">
-            <span title="Download Path"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
+            <span title="{{ 'Download Path' | translate }}"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
           </li>
 
           <!-- }}} -->
@@ -566,15 +566,15 @@
         <ul class="stats pull-left" ng-switch-when="removed">
           <!-- {{{ removed download statistics -->
           <li class="label label-warning">
-            <span title="Download Status"><span class="fa fa-fw fa-times">&nbsp;</span> {{download.status}}</span>
+            <span title="{{ 'Download Status' | translate }}"><span class="fa fa-fw fa-times">&nbsp;</span> {{download.status}}</span>
           </li>
 
           <li class="label label-warning">
-            <span title="Download Size"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
           </li>
 
           <li class="label label-warning hidden-phone">
-            <span title="Download Path"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
+            <span title="{{ 'Download Path' | translate }}"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
           </li>
 
           <!-- }}} -->
@@ -584,15 +584,15 @@
 
           <!-- {{{ error download statistics -->
           <li class="label label-danger">
-            <span title="Error "><span class="fa fa-fw fa-times-circle">&nbsp;</span> {{getErrorStatus(download.errorCode)}}</span>
+            <span title="{{ 'Error ' | translate }}"><span class="fa fa-fw fa-times-circle">&nbsp;</span> {{getErrorStatus(download.errorCode)}}</span>
           </li>
 
           <li class="label label-default">
-            <span title="Download Size"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
+            <span title="{{ 'Download Size' | translate }}"><span class="fa fa-fw fa-cloud-download">&nbsp;</span> {{download.fmtTotalLength}}</span>
           </li>
 
           <li class="label label-default hidden-phone">
-            <span title="Download Path"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
+            <span title="{{ 'Download Path' | translate }}"><span class="fa fa-fw fa-folder-open">&nbsp;</span> {{download.dir}}</span>
           </li>
 
           <!-- }}} -->
@@ -611,20 +611,20 @@
             <canvas bitfield="download.bitfield" draw="!download.collapsed" pieces="download.numPieces" class="progress chunk-canvas" width="1400" chunkbar></canvas>
           </div>
           <ul class="stats download-item">
-            <li class="label label-default" title="Estimated Time"><i class="fa fa-fw fa-clock-o">&nbsp;</i> <span class="download-eta">{{getEta(download) | time}}</span></li>
-            <li class="label label-default" title="Download Size"><i class="fa fa-fw fa-cloud-download">&nbsp;</i> <span class="download-totalLength">{{download.fmtTotalLength}}</span></li>
-            <li class="label label-default" title="Downloaded"><i class="fa fa-fw fa-download">&nbsp;</i> <span class="download-completedLength">{{download.fmtCompletedLength}}</span></li>
-            <li class="label label-default" title="Download Speed"><i class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</i> <span class="download-downloadSpeed">{{download.fmtDownloadSpeed}}</span></li>
+            <li class="label label-default" title="{{ 'Estimated Time' | translate }}"><i class="fa fa-fw fa-clock-o">&nbsp;</i> <span class="download-eta">{{getEta(download) | time}}</span></li>
+            <li class="label label-default" title="{{ 'Download Size' | translate }}"><i class="fa fa-fw fa-cloud-download">&nbsp;</i> <span class="download-totalLength">{{download.fmtTotalLength}}</span></li>
+            <li class="label label-default" title="{{ 'Downloaded' | translate }}"><i class="fa fa-fw fa-download">&nbsp;</i> <span class="download-completedLength">{{download.fmtCompletedLength}}</span></li>
+            <li class="label label-default" title="{{ 'Download Speed' | translate }}"><i class="fa fa-fw fa-arrow-circle-o-down">&nbsp;</i> <span class="download-downloadSpeed">{{download.fmtDownloadSpeed}}</span></li>
 
-            <li class="label label-default" title="Upload Speed" ng-show="download.bittorrent"><i class="fa fa-fw fa-arrow-circle-o-up">&nbsp;</i> <span class="download-uploadSpeed">{{download.fmtUploadSpeed}}</span></li>
-            <li class="label label-default" title="Uploaded" ng-show="download.bittorrent"><i class="fa fa-fw fa-upload">&nbsp;</i> <span class="download-uploadLength">{{download.fmtUploadLength}}</span></li>
+            <li class="label label-default" title="{{ 'Upload Speed' | translate }}" ng-show="download.bittorrent"><i class="fa fa-fw fa-arrow-circle-o-up">&nbsp;</i> <span class="download-uploadSpeed">{{download.fmtUploadSpeed}}</span></li>
+            <li class="label label-default" title="{{ 'Uploaded' | translate }}" ng-show="download.bittorrent"><i class="fa fa-fw fa-upload">&nbsp;</i> <span class="download-uploadLength">{{download.fmtUploadLength}}</span></li>
 
             <li class="label label-default" title={{download.connectionsTitle}}><i class="fa fa-fw fa-link">&nbsp;</i> <span class="download-connections">{{download.connections}}{{download.numSeeders}}</span></li>
 
-            <li class="label label-default" title="Download GID"><i class="fa fa-fw fa-bars">&nbsp;</i> <span class="download-gid">{{download.gid}}</span></li>
-            <li class="label label-default" title="Number of Pieces">{{ '# of' | translate }} <i class="fa fa-fw fa-puzzle-piece">&nbsp;</i> <span class="download-numPieces">{{download.numPieces}}</span></li>
-            <li class="label label-default" title="Piece Length"><i class="fa fa-fw fa-puzzle-piece"></i> {{ 'Length' | translate }}&nbsp; <span class="download-pieceLength">{{download.fmtPieceLength}}</span></li>
-            <li class="label label-default" title="Download Path"><i class="fa fa-fw fa-folder-open">&nbsp;</i> <span class="download-dir">{{download.dir}}</span></li>
+            <li class="label label-default" title="{{ 'Download GID' | translate }}"><i class="fa fa-fw fa-bars">&nbsp;</i> <span class="download-gid">{{download.gid}}</span></li>
+            <li class="label label-default" title="{{ 'Number of Pieces' | translate }}">{{ '# of' | translate }} <i class="fa fa-fw fa-puzzle-piece">&nbsp;</i> <span class="download-numPieces">{{download.numPieces}}</span></li>
+            <li class="label label-default" title="{{ 'Piece Length' | translate }}"><i class="fa fa-fw fa-puzzle-piece"></i> {{ 'Length' | translate }}&nbsp; <span class="download-pieceLength">{{download.fmtPieceLength}}</span></li>
+            <li class="label label-default" title="{{ 'Download Path' | translate }}"><i class="fa fa-fw fa-folder-open">&nbsp;</i> <span class="download-dir">{{download.dir}}</span></li>
           </ul>
           <ul class="download-files hidden-phone download-item">
             <li class="label label-default" ng-repeat="file in download.files" ng-class="{'label-success': file.selected}">
diff --git a/js/ctrls/nav.js b/js/ctrls/nav.js
index dd9565b..12a3a35 100644
--- a/js/ctrls/nav.js
+++ b/js/ctrls/nav.js
@@ -98,7 +98,7 @@ angular
 
 			modals.invoke(
 				'settings', _.cloneDeep(settings),
-				'Global Settings', 'Save', function(chsettings) {
+				'Global Settings', '{{ \'Save\' | translate }}', function(chsettings) {
 
 				var sets = {};
 				var starred = [];
diff --git a/js/translate/en_US.js b/js/translate/en_US.js
index 40324d2..3b2c4e3 100644
--- a/js/translate/en_US.js
+++ b/js/translate/en_US.js
@@ -119,5 +119,18 @@ translations.en_US = {
     'To download the latest version of the project, add issues or to contribute back, head on to':
         'To download the latest version of the project, add issues or to contribute back, head on to',
     'Or you can open the latest version in the browser through': 'Or you can open the latest version in the browser through',
-    'Close': 'Close'
+    'Close': 'Close',
+// lables
+    'Download status':'Download status',
+    'Download Speed':'Download Speed',
+    'Upload Speed':'Upload Speed',
+    'Estimated time':'Estimated time',
+    'Download Size':'Download Size',
+    'Downloaded':'Downloaded',
+    'Progress':'Progress',
+    'Download Path':'Download Path',
+    'Uploaded':'Uploaded',
+    'Download GID':'Download GID',
+    'Number of Pieces':'Number of Pieces',
+    'Piece Length':'Piece Length'
 };
diff --git a/js/translate/template.js b/js/translate/template.js
index 1d1a20a..273f8ad 100644
--- a/js/translate/template.js
+++ b/js/translate/template.js
@@ -133,5 +133,18 @@ translations.en_US = {  // replace en_US to ll_CC, examples: zh_CN, de_AT.
     'To download the latest version of the project, add issues or to contribute back, head on to':
         '',
     'Or you can open the latest version in the browser through': '',
-    'Close': ''
+    'Close': '',
+// lables
+    'Download status':'',
+    'Download Speed':'',
+    'Upload Speed':'',
+    'Estimated time':'',
+    'Download Size':'',
+    'Downloaded':'',
+    'Progress':'',
+    'Download Path':'',
+    'Uploaded':'',
+    'Download GID':'',
+    'Number of Pieces':'',
+    'Piece Length':''
 };
diff --git a/js/translate/zh_CN.js b/js/translate/zh_CN.js
index 46c0124..79dfab1 100644
--- a/js/translate/zh_CN.js
+++ b/js/translate/zh_CN.js
@@ -4,7 +4,7 @@ if (typeof translations == 'undefined') {
 
 translations.zh_CN = {
 // header
-    'Search': '查找',
+    'Search': '搜索',
     // Nav menu
     'Add': '添加',
     'By URIs': '使用链接',
@@ -30,16 +30,19 @@ translations.zh_CN = {
     'downloads': '下载',
     'Language': '语言',
 // download filters
-    'Download Filters': '下载过滤器',
+    'Download Filters': '过滤器',
     'Running': '下载中',
-    'Active': '激活',
-    'Waiting': '等待',
+    'Active': '活动的',
+    'Waiting': '等待中',
     'Complete': '已完成',
-    'Error': '错误',
-    'Paused': '暂停',
+    'Error': '出错的',
+    'Paused': '已暂停',
     'Removed': '已删除',
     'Hide linked meta-data': '隐藏链接的元数据',
-    'Toggle': '确定',
+    'Displaying': '当前显示了',
+    'of': '/',
+    'downloads': '下载',
+    'Toggle': '反向选择',
     'Reset filters': '重置过滤器',
 // starred properties
     'Quick Access Settings': '快速访问设置',
@@ -116,6 +119,19 @@ translations.zh_CN = {
     'To download the latest version of the project, add issues or to contribute back, head on to':
             '下载最新版本，反馈问题，请到',
     'Or you can open the latest version in browser through': '在线使用请开打',
-    'Close': '关闭'
+    'Close': '关闭',
+// lables
+    'Download status':'下载状态',
+    'Download Speed':'下载速度',
+    'Upload Speed':'上传速度',
+    'Estimated time':'剩余时间',
+    'Download Size':'下载总大小',
+    'Downloaded':'已下载',
+    'Progress':'进度',
+    'Download Path':'下载路径',
+    'Uploaded':'已上传',
+    'Download GID':'下载GID',
+    'Number of Pieces':'块数量',
+    'Piece Length':'每块大小'
 };