From cbc3bcdb04806f253b34203c7193c428b189a61c Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Tue, 20 Aug 2019 22:06:28 +0800
Subject: [PATCH] modify tip of connected to aria2 in case tip would show
 before language resource loaded

---
 src/langs/zh_Hans.txt                             | 2 +-
 src/langs/zh_Hant.txt                             | 2 +-
 src/scripts/config/defaultLanguage.js             | 2 +-
 src/scripts/core/root.js                          | 6 ++----
 src/scripts/services/ariaNgLocalizationService.js | 4 ++++
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/langs/zh_Hans.txt b/src/langs/zh_Hans.txt
index 4167112..c9068a6 100644
--- a/src/langs/zh_Hans.txt
+++ b/src/langs/zh_Hans.txt
@@ -2,7 +2,7 @@
 AriaNg Version=AriaNg 版本
 Operation Result=操作结果
 Operation Succeeded=操作成功
-{{name}} is connected={{name}} 已连接
+is connected=已连接
 Error=错误
 OK=确定
 Confirm=确认
diff --git a/src/langs/zh_Hant.txt b/src/langs/zh_Hant.txt
index ae21daf..2311ff8 100644
--- a/src/langs/zh_Hant.txt
+++ b/src/langs/zh_Hant.txt
@@ -2,7 +2,7 @@
 AriaNg Version=AriaNg 版本
 Operation Result=操作結果
 Operation Succeeded=操作成功
-{{name}} is connected={{name}} 已連線
+is connected=已連線
 Error=錯誤
 OK=確定
 Confirm=確認
diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js
index 879c656..cda44e1 100644
--- a/src/scripts/config/defaultLanguage.js
+++ b/src/scripts/config/defaultLanguage.js
@@ -6,7 +6,7 @@
             'AriaNg Version': 'AriaNg Version',
             'Operation Result': 'Operation Result',
             'Operation Succeeded': 'Operation Succeeded',
-            '{{name}} is connected': '{{name}} is connected',
+            'is connected': 'is connected',
             'Error': 'Error',
             'OK': 'OK',
             'Confirm': 'Confirm',
diff --git a/src/scripts/core/root.js b/src/scripts/core/root.js
index bdd5e21..0f69031 100644
--- a/src/scripts/core/root.js
+++ b/src/scripts/core/root.js
@@ -346,11 +346,9 @@
         });
 
         aria2TaskService.onFirstSuccess(function (event) {
-            ariaNgLocalizationService.notifyInPage('', '{{name}} is connected', {
+            ariaNgLocalizationService.notifyInPage('', 'is connected', {
                 type: 'success',
-                contentParams: {
-                    name: event.rpcName
-                }
+                contentPrefix: event.rpcName + ' '
             });
         });
 
diff --git a/src/scripts/services/ariaNgLocalizationService.js b/src/scripts/services/ariaNgLocalizationService.js
index f5120fb..2ef1a47 100644
--- a/src/scripts/services/ariaNgLocalizationService.js
+++ b/src/scripts/services/ariaNgLocalizationService.js
@@ -81,6 +81,10 @@
 
                 if (content) {
                     content = this.getLocalizedText(content, options.contentParams);
+
+                    if (options.contentPrefix) {
+                        content = options.contentPrefix + content;
+                    }
                 }
 
                 return ariaNgNotificationService.notifyInPage(title, content, options);