Browse Source

merge AriaNg commit (https://github.com/mayswind/AriaNg/commit/157ab469fac54b327d8a9fa07436e0bc21a3b4f1)

MaysWind 4 years ago
parent
commit
59e221af57

+ 2 - 2
app/langs/zh_Hans.txt

@@ -128,7 +128,7 @@ Failed to change some tasks state.=修改一些任务状态时失败.
 Confirm Retry=确认重试
 Are you sure you want to retry the selected task? AriaNg will create same task after clicking OK.=您是否要重试选中的任务? 点击 "确定" 后, AriaNg 将会创建相同的任务.
 Failed to retry this task.=该任务重试失败.
-{{successCount}} tasks have been retried and {{failedCount}} tasks are failed.={{successCount}} 个任务重试成功以及 {{failedCount}} 个任务失败.
+{successCount} tasks have been retried and {failedCount} tasks are failed.={{successCount}} 个任务重试成功以及 {{failedCount}} 个任务失败.
 Confirm Remove=确认删除
 Are you sure you want to remove the selected task?=您是否要删除选中的任务?
 Failed to remove some task(s).=删除一些任务时失败.
@@ -176,7 +176,7 @@ Clear Settings History=清除设置历史
 Are you sure you want to clear all settings history?=您是否要清除所有设置的历史记录?
 Delete RPC Setting=删除 RPC 设置
 Add New RPC Setting=添加新 RPC 设置
-Are you sure you want to remove rpc setting "{{rpcName}}"?=您是否要删除 RPC 设置 "{{rpcName}}"?
+Are you sure you want to remove rpc setting "{rpcName}"?=您是否要删除 RPC 设置 "{{rpcName}}"?
 Updating Global Stat Interval=全局状态更新间隔
 Updating Task Information Interval=任务信息更新间隔
 Swipe Gesture=滑动手势

+ 2 - 2
app/langs/zh_Hant.txt

@@ -128,7 +128,7 @@ Failed to change some tasks state.=修改一些工作狀態時失敗.
 Confirm Retry=確認重試
 Are you sure you want to retry the selected task? AriaNg will create same task after clicking OK.=您是否要重試選中的工作? 點選 "確定" 後, AriaNg 將會建立相同的工作.
 Failed to retry this task.=該工作重試失敗.
-{{successCount}} tasks have been retried and {{failedCount}} tasks are failed.={{successCount}} 个工作重試成功以及 {{failedCount}} 个工作失敗.
+{successCount} tasks have been retried and {failedCount} tasks are failed.={{successCount}} 个工作重試成功以及 {{failedCount}} 个工作失敗.
 Confirm Remove=確認刪除
 Are you sure you want to remove the selected task?=您是否要刪除選中的工作?
 Failed to remove some task(s).=刪除一些工作時失敗.
@@ -176,7 +176,7 @@ Clear Settings History=清除設定歷史
 Are you sure you want to clear all settings history?=您是否要清除所有設定的歷史紀錄?
 Delete RPC Setting=刪除 RPC 設定
 Add New RPC Setting=加入新 RPC 設定
-Are you sure you want to remove rpc setting "{{rpcName}}"?=您是否要刪除 RPC 設定 "{{rpcName}}"?
+Are you sure you want to remove rpc setting "{rpcName}"?=您是否要刪除 RPC 設定 "{{rpcName}}"?
 Updating Global Stat Interval=全域狀態更新間隔
 Updating Task Information Interval=工作資訊更新間隔
 Swipe Gesture=滑動手勢

+ 2 - 2
app/scripts/config/defaultLanguage.js

@@ -132,7 +132,7 @@
             'Confirm Retry': 'Confirm Retry',
             'Are you sure you want to retry the selected task? AriaNg will create same task after clicking OK.': 'Are you sure you want to retry the selected task? AriaNg will create same task after clicking OK.',
             'Failed to retry this task.': 'Failed to retry this task.',
-            '{{successCount}} tasks have been retried and {{failedCount}} tasks are failed.': '{{successCount}} tasks have been retried and {{failedCount}} tasks are failed.',
+            '{successCount} tasks have been retried and {failedCount} tasks are failed.': '{{successCount}} tasks have been retried and {{failedCount}} tasks are failed.',
             'Confirm Remove': 'Confirm Remove',
             'Are you sure you want to remove the selected task?': 'Are you sure you want to remove the selected task?',
             'Failed to remove some task(s).': 'Failed to remove some task(s).',
@@ -180,7 +180,7 @@
             'Are you sure you want to clear all settings history?': 'Are you sure you want to clear all settings history?',
             'Delete RPC Setting': 'Delete RPC Setting',
             'Add New RPC Setting': 'Add New RPC Setting',
-            'Are you sure you want to remove rpc setting "{{rpcName}}"?': 'Are you sure you want to remove rpc setting "{{rpcName}}"?',
+            'Are you sure you want to remove rpc setting "{rpcName}"?': 'Are you sure you want to remove rpc setting "{{rpcName}}"?',
             'Updating Global Stat Interval': 'Updating Global Stat Interval',
             'Updating Task Information Interval': 'Updating Task Information Interval',
             'Swipe Gesture': 'Swipe Gesture',

+ 1 - 1
app/scripts/controllers/main.js

@@ -262,7 +262,7 @@
                 $rootScope.loadPromise = aria2TaskService.retryTasks(retryableTasks, function (response) {
                     refreshGlobalStat(true);
 
-                    ariaNgLocalizationService.showInfo('Operation Result', '{{successCount}} tasks have been retried and {{failedCount}} tasks are failed.', function () {
+                    ariaNgLocalizationService.showInfo('Operation Result', '{successCount} tasks have been retried and {failedCount} tasks are failed.', function () {
                         var actionAfterRetryingTask = ariaNgSettingService.getAfterRetryingTask();
 
                         if (response.hasSuccess) {

+ 1 - 1
app/scripts/controllers/settings-ariang.js

@@ -348,7 +348,7 @@
         $scope.removeRpcSetting = function (setting) {
             var rpcName = (setting.rpcAlias ? setting.rpcAlias : setting.rpcHost + ':' + setting.rpcPort);
 
-            ariaNgLocalizationService.confirm('Confirm Remove', 'Are you sure you want to remove rpc setting "{{rpcName}}"?', 'warning', function () {
+            ariaNgLocalizationService.confirm('Confirm Remove', 'Are you sure you want to remove rpc setting "{rpcName}"?', 'warning', function () {
                 setNeedRefreshPage();
 
                 var currentIndex = $scope.getCurrentRpcTabIndex();