diff --git a/src/langs/zh_Hans.txt b/src/langs/zh_Hans.txt index 59592df..328e5a9 100644 --- a/src/langs/zh_Hans.txt +++ b/src/langs/zh_Hans.txt @@ -1,6 +1,6 @@ [global] Operation Succeeded=操作成功 -Connection Succeeded=连接成功 +{{name}} is connected={{name}} 已连接 Error=错误 OK=确定 Confirm=确认 diff --git a/src/langs/zh_Hant.txt b/src/langs/zh_Hant.txt index 2b10a1e..121dfa3 100644 --- a/src/langs/zh_Hant.txt +++ b/src/langs/zh_Hant.txt @@ -1,6 +1,6 @@ [global] Operation Succeeded=操作成功 -Connection Succeeded=連線成功 +{{name}} is connected={{name}} 已連線 Error=錯誤 OK=確定 Confirm=確認 diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js index b05d783..809f09b 100644 --- a/src/scripts/config/defaultLanguage.js +++ b/src/scripts/config/defaultLanguage.js @@ -4,7 +4,7 @@ angular.module('ariaNg').config(['$translateProvider', 'ariaNgConstants', function ($translateProvider, ariaNgConstants) { var defaultLanguageResource = { 'Operation Succeeded': 'Operation Succeeded', - 'Connection Succeeded': 'Connection Succeeded', + '{{name}} is connected': '{{name}} is connected', 'Error': 'Error', 'OK': 'OK', 'Confirm': 'Confirm', diff --git a/src/scripts/core/root.js b/src/scripts/core/root.js index 1f0f05d..9acebef 100644 --- a/src/scripts/core/root.js +++ b/src/scripts/core/root.js @@ -164,9 +164,12 @@ }); }); - aria2TaskService.onFirstSuccess(function () { - ariaNgNotificationService.notifyInPage('', 'Connection Succeeded', { - type: 'success' + aria2TaskService.onFirstSuccess(function (event) { + ariaNgNotificationService.notifyInPage('', '{{name}} is connected', { + type: 'success', + contentParams: { + name: event.rpcName + } }); }); diff --git a/src/scripts/services/aria2RpcService.js b/src/scripts/services/aria2RpcService.js index ca06f5a..9a0d9de 100644 --- a/src/scripts/services/aria2RpcService.js +++ b/src/scripts/services/aria2RpcService.js @@ -67,14 +67,14 @@ }); }; - var fireCustomEvent = function (callbacks) { + var fireCustomEvent = function (callbacks, context) { if (!angular.isArray(callbacks) || callbacks.length < 1) { return; } for (var i = 0; i < callbacks.length; i++) { var callback = callbacks[i]; - callback(); + callback(context); } }; @@ -153,7 +153,10 @@ if (!isConnected) { isConnected = true; - fireCustomEvent(onFirstSuccessCallbacks); + var firstSuccessContext = { + rpcName: ariaNgSettingService.getCurrentRpcDisplayName() + }; + fireCustomEvent(onFirstSuccessCallbacks, firstSuccessContext); } }; diff --git a/src/scripts/services/ariaNgNotificationService.js b/src/scripts/services/ariaNgNotificationService.js index 455e6a3..e8d4b29 100644 --- a/src/scripts/services/ariaNgNotificationService.js +++ b/src/scripts/services/ariaNgNotificationService.js @@ -50,11 +50,11 @@ } if (title) { - title = $translate.instant(title); + title = $translate.instant(title, options.titleParams); } if (content) { - content = $translate.instant(content); + content = $translate.instant(content, options.contentParams); } if (!content) { diff --git a/src/scripts/services/ariaNgSettingService.js b/src/scripts/services/ariaNgSettingService.js index 1368412..bc7cf87 100644 --- a/src/scripts/services/ariaNgSettingService.js +++ b/src/scripts/services/ariaNgSettingService.js @@ -277,6 +277,15 @@ setBrowserNotification: function (value) { setOption('browserNotification', value); }, + getCurrentRpcDisplayName: function () { + var options = getOptions(); + + if (options.rpcAlias) { + return options.rpcAlias; + } + + return options.rpcHost + ':' + options.rpcPort; + }, getCurrentRpcUrl: function () { var options = getOptions(); var protocol = options.protocol;