From 9fa57dfe4bf56ef70535d1cdbbfe08a4e1ec42ed Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Tue, 24 Nov 2015 19:28:31 +0800
Subject: [PATCH] Refine service_running string

---
 src/main/res/values-zh/strings.xml                              | 2 +-
 src/main/res/values/strings.xml                                 | 2 +-
 .../scala/com/github/shadowsocks/ShadowsocksNotification.scala  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 9db0cf6c..bb8dbe89 100755
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -35,7 +35,7 @@
   <string name="traffic_stat">流量统计</string>
   <string name="traffic_stat_summary">在通知栏上显示当前上下行速率</string>
   <string name="forward_success">后台服务已开始运行。</string>
-  <string name="service_running">已连接到「%s」</string>
+  <string name="service_running">影梭 → %s</string>
   <string name="service_failed">无法连接远程服务器</string>
   <string name="stop">停止服务</string>
   <string name="stopping">正在关闭……</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 444b5ddf..564fb4eb 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
 
   <!-- notification category -->
   <string name="forward_success">Shadowsocks started.</string>
-  <string name="service_running">Connected to "%s"</string>
+  <string name="service_running">Shadowsocks → %s</string>
   <string name="service_failed">Failed to connect the remote server</string>
   <string name="stop">Stop the service</string>
   <string name="stopping">Shutting down…</string>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
index 8a8b06bd..a2d6b7b7 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
@@ -31,7 +31,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
     .setWhen(0)
     .setColor(ContextCompat.getColor(service, R.color.material_accent_500))
     .setTicker(service.getString(R.string.forward_success))
-    .setContentTitle(service.getString(R.string.app_name) + ": " + profileName)
+    .setContentTitle(service.getString(R.string.service_running).formatLocal(Locale.ENGLISH, profileName))
     .setContentIntent(PendingIntent.getActivity(service, 0, new Intent(service, classOf[Shadowsocks])
       .setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT), 0))
     .setSmallIcon(R.drawable.ic_stat_shadowsocks)