Merge pull request #9360 from michalbe/bug859555

Bug 859555 - Localization of the information in the network operator list
mozilla-b2g · Apr 28, 2013 · 8bcd3d9 · 8bcd3d9
2 parents 447cdaa + 0c336a8
commit 8bcd3d9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/apps/settings/js/carrier.js b/apps/settings/js/carrier.js
@@ -359,8 +359,8 @@ var Carrier = (function newCarrier(window, document, undefined) {
 
     // state
     var state = document.createElement('small');
-    // XXX do we need l10n here?
-    state.textContent = network.state;
+    state.textContent =
+      network.state ? _('state-' + network.state) : _('state-unknown');
 
     // create list item
     var li = document.createElement('li');

diff --git a/apps/settings/locales/settings.en-US.properties b/apps/settings/locales/settings.en-US.properties
@@ -155,6 +155,11 @@ dataConnection-warning-head=Turn ON data connection?
 dataConnection-warning-message=Applications will automatically fetch data via data connection when required. Additional data charges may apply.
 dataRoaming-warning-head=Turn ON data roaming?
 dataRoaming-warning-message=Depending on your service agreement, extra charges may apply for data when you are in a roaming area.
+state-unknown = Unknown state
+state-available = Available
+state-connected = Connected
+state-current = Connected
+state-forbidden = Forbidden
 
 # Connectivity :: Bluetooth
 bluetooth = Bluetooth

diff --git a/apps/settings/locales/settings.fr.properties b/apps/settings/locales/settings.fr.properties
@@ -152,6 +152,11 @@ dataConnection-warning-head=Activer connexion de données ?
 dataConnection-warning-message=Les applications récupèreront automatiquement des données par la connexion de données quand nécessaire. Des frais supplémentaires liés aux données pourraient s’appliquer.
 dataRoaming-warning-head=Activer l’itinérance des données ?
 dataRoaming-warning-message=Selon votre contrat avec votre opérateur, vous devrez payer un supplément pour vos données si vous êtes en mode itinérance.
+state-unknown = état inconnu
+state-available = Disponible
+state-connected = Actuel
+state-current = Actuel
+state-forbidden = Interdit
 
 # Connectivity :: Bluetooth
 bluetooth=Bluetooth