OSDN Git Service

Add SIM status string for localizing voice/data strings
authord34d <clark@cyngn.com>
Wed, 27 Jul 2016 17:43:24 +0000 (10:43 -0700)
committerGerrit Code Review <gerrit@cyanogenmod.org>
Wed, 27 Jul 2016 23:08:29 +0000 (16:08 -0700)
SIM status hard codes "voice" and "data" and therefore cannot be
translated.  This patch adds a format string that can now be
properly translated.

Change-Id: I3797b795d00aae875c0d33a1ee152f4c1e09021b
TICKET: CYNGNOS-3227

res/values/cm_strings.xml
src/com/android/settings/deviceinfo/SimStatus.java

index cf5ad54..3f5113d 100644 (file)
     <string name="security_settings_fingerprint_sensor_location_front">front</string>
     <string name="security_settings_fingerprint_sensor_location_left">left side</string>
     <string name="security_settings_fingerprint_sensor_location_right">right side</string>
+
+    <!-- SIM status format string -->
+    <string name="sim_status_format_string">Voice: <xliff:g id="voice_status">%1$s</xliff:g> / Data: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
index 7410cd3..b40a255 100644 (file)
@@ -297,7 +297,8 @@ public class SimStatus extends InstrumentedPreferenceActivity {
 
         String dataDisplay = Utils.getServiceStateString(dataState, mRes);
 
-        setSummaryText(KEY_SERVICE_STATE, "Voice: " + voiceDisplay + " / Data: " + dataDisplay);
+        setSummaryText(KEY_SERVICE_STATE, getString(R.string.sim_status_format_string,
+                voiceDisplay, dataDisplay));
 
         if (serviceState.getRoaming()) {
             setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_in));