Merge pull request #18955 from svic/Bug_1006032

Bug 1006032 - Choose better identifiers for l10n resources
mozilla-b2g · May 6, 2014 · db98100 · db98100
2 parents 8983311 + d304de5
commit db98100
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/apps/system/js/system_nfc_connect_dialog.js b/apps/system/js/system_nfc_connect_dialog.js
@@ -20,19 +20,19 @@
     var msg = null;
     var _ = navigator.mozL10n.get;
     var enabled = window.navigator.mozBluetooth.enabled;
-    var l10nArgs = { n: name };
+    var l10nArgs = { deviceName: name };
 
     if (enabled && !name) {
-      msg = _('confirmNFCConnectMsg1');
+      msg = _('confirmNFCConnectBTenabledNameUnknown');
     }
     if (!enabled && !name) {
-      msg = _('confirmNFCConnectMsg2');
+      msg = _('confirmNFCConnectBTdisabledNameUnknown');
     }
     if (enabled && name) {
-      msg = _('confirmNFCConnectMsg3', l10nArgs);
+      msg = _('confirmNFCConnectBTenabledNameKnown', l10nArgs);
     }
     if (!enabled && name) {
-      msg = _('confirmNFCConnectMsg4', l10nArgs);
+      msg = _('confirmNFCConnectBTdisabledNameKnown', l10nArgs);
     }
 
     this.confirmNFCConnectMsg.textContent = msg;

diff --git a/apps/system/locales/system.en-US.properties b/apps/system/locales/system.en-US.properties
@@ -47,10 +47,10 @@ dialNumber = Dial {{number}}
 voicemailNotificationMultiSim = (SIM {{n}}) {{title}}
 
 # NFC Bluetooth Connect
-confirmNFCConnectMsg1 = Are you sure you want to connect to the device?
-confirmNFCConnectMsg2 = Turn on Bluetooth and connect to the device?
-confirmNFCConnectMsg3 = Are you sure you want to connect to {{n}}?
-confirmNFCConnectMsg4 = Turn on Bluetooth and connect to {{n}}?
+confirmNFCConnectBTenabledNameUnknown = Are you sure you want to connect to the device?
+confirmNFCConnectBTdisabledNameUnknown = Turn on Bluetooth and connect to the device?
+confirmNFCConnectBTenabledNameKnown = Are you sure you want to connect to {{deviceName}}?
+confirmNFCConnectBTdisabledNameKnown = Turn on Bluetooth and connect to {{deviceName}}?
 
 # sleep menu
 deviceMenu=Phone