Merge pull request #31680 from hfiguiere/bug1155099-fm-mhz-l10n

Bug 1155099 - Make 'MHz' localizable. r=justindarc

apps/fm/js/fm.js

@@ -158,6 +158,9 @@ var mozFMRadio = navigator.mozFM || navigator.mozFMRadio || {
   aGlobal.SpeakerManager = SpeakerManager;
 })(window);
 
+// the mhzString that will be localized.
+var mhzString = 'MHz-NOTLOCALIZED';
+
 var enabling = false;
 function updatePowerUI() {
   var enabled = mozFMRadio.enabled;
@@ -619,12 +622,16 @@ var favoritesList = {
     elem.id = this._getUIElemId(item);
     elem.className = 'fav-list-item';
     elem.setAttribute('role', 'option');
-    var html = '';
-    html += '<div class="fav-list-frequency">';
-    html += item.frequency.toFixed(1);
-    html += '</div>';
-    html += '<div class="fav-list-remove-button"></div>';
-    elem.innerHTML = html;
+
+    var subElem = document.createElement('div');
+    subElem.className = 'fav-list-frequency';
+    subElem.textContent = item.frequency.toFixed(1);
+    subElem.dataset.unit = mhzString;
+    elem.appendChild(subElem);
+
+    subElem = document.createElement('div');
+    subElem.className = 'fav-list-remove-button';
+    elem.appendChild(subElem);
 
     // keep list ascending sorted
     if (container.childNodes.length === 0) {
@@ -876,6 +883,20 @@ function init() {
   });
 }
 
+document.addEventListener('DOMLocalized', function() {
+  // localize MHz
+  document.l10n.format('mhz').then(str => {
+    mhzString = str.value;
+    $('frequency').dataset.unit = mhzString;
+
+    var nodes = document.querySelectorAll(
+      '#fav-list-container div.fav-list-frequency');
+    for(var i = 0; i < nodes.length; i++) {
+      nodes[i].dataset.unit = mhzString;
+    }
+  });
+});
+
 document.addEventListener('DOMLocalized', function onDOMLocalized(e) {
   // PERFORMANCE MARKER (1): navigationLoaded
   // Designates that the app's *core* chrome or navigation interface

apps/fm/locales/fm.en-US.properties

@@ -3,6 +3,8 @@ noAntennaMsg       = FM Radio requires a plugged in headset to receive radio sig
 airplaneModeHeader = Airplane mode is on
 airplaneModeMsg    = Turn off Airplane mode to use FM Radio.
 
+mhz = MHz
+
 # The following strings are spoken by screen readers and not shown on the
 # screen.
 speaker-switch.ariaLabel = Speaker

apps/fm/style/fm.css

@@ -105,7 +105,7 @@ a:active {
 }
 
 #frequency::after {
-  content: "MHz";
+  content: attr(data-unit);
   font-size: 1.5rem;
   padding-left: 0.3rem;
 }
@@ -313,7 +313,7 @@ div#fav-list-container div.fav-list-frequency {
 }
 
 div#fav-list-container div.fav-list-frequency::after {
-  content: "MHz";
+  content: attr(data-unit);
   font-size: 1.5rem;
   position: absolute;
   padding: .6rem .2rem 0 1rem;