Merge pull request #28882 from EragonJ/bug-1142924

Bug 1142924 - Use bdi to wrap smsc to fix RTL problems
mozilla-b2g · Mar 17, 2015 · eef9d5d · eef9d5d
2 parents 6d49c3e + 6af27e9
commit eef9d5d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/apps/settings/elements/templates/messaging.html b/apps/settings/elements/templates/messaging.html
@@ -2,32 +2,32 @@
   <template>
 
     <header>
-      <h2 data-l10n-id="cellBroadcastMessages">Cell Broadcast Messages</h2>
+      <h2 data-l10n-id="cellBroadcastMessages"></h2>
     </header>
 
     <ul>
       <li id="menuItem-cellBroadcast" aria-disabled="true">
         <label class="pack-switch checkbox-label">
           <input type="checkbox" data-ignore disabled />
-          <span data-l10n-id="cellBroadcast">Cell Broadcast</span>
+          <span data-l10n-id="cellBroadcast"></span>
         </label>
       </li>
       <li id="menuItem-emergencyAlert" aria-disabled="true">
         <label class="pack-switch checkbox-label">
           <input type="checkbox" data-ignore disabled />
-          <span data-l10n-id="emergencyAlert">Emergency Alert</span>
+          <span data-l10n-id="emergencyAlert"></span>
         </label>
       </li>
     </ul>
 
     <header>
-      <h2 data-l10n-id="messagingInformation">Information</h2>
+      <h2 data-l10n-id="messagingInformation"></h2>
     </header>
 
     <ul>
       <li class="hint smsc">
-        <span data-l10n-id="messaging-SMSC">Service Center</span>
-        <p class="explanation" data-l10n-id="unknown-SMSC">Info not available</p>
+        <span data-l10n-id="messaging-SMSC"></span>
+        <p class="explanation"></p>
       </li>
     </ul>
 

diff --git a/apps/settings/js/panels/messaging/panel.js b/apps/settings/js/panels/messaging/panel.js
@@ -110,9 +110,14 @@ define(function(require) {
         elements.simcardsContainer.hidden = false;
       },
       _updateSmsc: function(cardIndex) {
+        // cleanup first
+        elements.smsc.innerHTML = '';
+
         SIMSlotManager.get(cardIndex).getSmsc(function(result) {
           if (result) {
-            elements.smsc.textContent = result;
+            var bdi = document.createElement('bdi');
+            bdi.textContent = result;
+            elements.smsc.appendChild(bdi);
           } else {
             elements.smsc.setAttribute('data-l10n-id', 'unknown-SMSC');
           }

diff --git a/apps/settings/js/panels/messaging_details/panel.js b/apps/settings/js/panels/messaging_details/panel.js
@@ -49,9 +49,14 @@ define(function(require) {
         });
       },
       _updateSmsc: function(cardIndex) {
+        // cleanup first
+        elements.smsc.innerHTML = '';
+
         SIMSlotManager.get(cardIndex).getSmsc(function(result) {
           if (result) {
-            elements.smsc.textContent = result;
+            var bdi = document.createElement('bdi');
+            bdi.textContent = result;
+            elements.smsc.appendChild(bdi);
           } else {
             elements.smsc.setAttribute('data-l10n-id', 'unknown-SMSC');
           }