Backed out 4 changesets (bug 1453480) for failing browser-chrome at b…

…rowser/components/preferences/in-content/tests/browser_search_subdialogs_within_preferences_site_data.js on a CLOSED TREE Backed out changeset 623b37fe0fe8 (bug 1453480) Backed out changeset a3c36fa7ac0c (bug 1453480) Backed out changeset 46a634d6853c (bug 1453480) Backed out changeset 658fedb903d0 (bug 1453480)
iaxat · Apr 13, 2018 · d717083 · d717083
1 parent d33ac6b
commit d717083
Show file tree

Hide file tree

Showing 20 changed files with 344 additions and 598 deletions.
diff --git a/browser/components/preferences/in-content/findInPage.js b/browser/components/preferences/in-content/findInPage.js
@@ -483,7 +483,7 @@ var gSearchResultsPane = {
           return null;
         }
         if (refAttr) {
-          let attr = msg.attributes && msg.attributes.find(a => a.name === refAttr);
+          let attr = msg.attrs.find(a => a.name === refAttr);
           if (!attr) {
             console.error(`Missing search l10n id "${refId}.${refAttr}"`);
             return null;

diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
@@ -458,7 +458,7 @@ var gMainPane = {
 
     document.l10n.setAttributes(
       document.getElementById("updateAppInfo"),
-      "update-application-version",
+      "update-application-info",
       { version }
     );
 

diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul
@@ -442,7 +442,7 @@
   <hbox align="center">
     <vbox flex="1">
       <description id="updateAppInfo">
-        <html:a id="releasenotes" data-l10n-name="learn-more" class="learnMore text-link" hidden="true"/>
+        <html:a id="releasenotes" class="learnMore text-link" hidden="true"/>
       </description>
       <description id="distribution" class="text-blurb" hidden="true"/>
       <description id="distributionId" class="text-blurb" hidden="true"/>
@@ -615,8 +615,8 @@
       </menulist>
     </hbox>
     <description id="contentProcessCountEnabledDescription" class="tip-caption" data-l10n-id="performance-limit-content-process-enabled-desc"/>
-    <description id="contentProcessCountDisabledDescription" class="tip-caption" data-l10n-id="performance-limit-content-process-blocked-desc">
-      <html:a class="text-link" data-l10n-name="learn-more" href="https://wiki.mozilla.org/Electrolysis"/>
+    <description id="contentProcessCountDisabledDescription" class="tip-caption" data-l10n-id="performance-limit-content-process-disabled-desc">
+      <html:a class="text-link" href="https://wiki.mozilla.org/Electrolysis"/>
     </description>
   </vbox>
 </groupbox>

diff --git a/browser/components/preferences/in-content/privacy.xul b/browser/components/preferences/in-content/privacy.xul
@@ -281,8 +281,8 @@
   <vbox>
     <hbox align="start">
       <vbox flex="1">
-        <description data-l10n-id="tracking-desc">
-          <a id="trackingProtectionLearnMore" data-l10n-name="learn-more" target="_blank" class="learnMore text-link"/>
+        <description data-l10n-id="tracking-description">
+          <a id="trackingProtectionLearnMore" target="_blank" class="learnMore text-link"/>
         </description>
       </vbox>
       <spacer flex="1"/>

diff --git a/browser/components/preferences/in-content/searchResults.xul b/browser/components/preferences/in-content/searchResults.xul
@@ -15,11 +15,11 @@
           data-category="paneSearchResults"
           hidden="true">
   <vbox class="no-results-container">
-    <label id="sorry-message" data-l10n-id="search-results-empty-message">
-      <html:span data-l10n-name="query" id="sorry-message-query"/>
+    <label id="sorry-message" data-l10n-id="search-results-sorry-message">
+      <html:span id="sorry-message-query"/>
     </label>
-    <label id="need-help" data-l10n-id="search-results-help-link">
-      <a class="text-link" data-l10n-name="url" target="_blank"></a>
+    <label id="need-help" data-l10n-id="search-results-need-help">
+      <a class="text-link" target="_blank"></a>
     </label>
   </vbox>
   <vbox class="no-results-container" align="center">

diff --git a/browser/components/preferences/in-content/tests/browser_fluent.js b/browser/components/preferences/in-content/tests/browser_fluent.js
@@ -39,7 +39,7 @@ add_task(async function() {
 
   Assert.deepEqual(msg, {
     value: null,
-    attributes: [
+    attrs: [
       {name: "label", value: elem.getAttribute("label")}
     ]
   });

diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -80,14 +80,14 @@ restart-later = Restart Later
 
 search-results-header = Search Results
 
-# `<span data-l10n-name="query"></span>` will be replaced by the search term.
-search-results-empty-message =
+# `<span></span>` will be replaced by the search term.
+search-results-sorry-message =
     { PLATFORM() ->
-        [windows] Sorry! There are no results in Options for “<span data-l10n-name="query"></span>”.
-       *[other] Sorry! There are no results in Preferences for “<span data-l10n-name="query"></span>”.
+        [windows] Sorry! There are no results in Options for “<span></span>”.
+       *[other] Sorry! There are no results in Preferences for “<span></span>”.
     }
 
-search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-short-name } Support</a>
+search-results-need-help = Need help? Visit <a>{ -brand-short-name } Support</a>
 
 ## General Section
 
@@ -267,7 +267,7 @@ update-application-title = { -brand-short-name } Updates
 
 update-application-description = Keep { -brand-short-name } up to date for the best performance, stability, and security.
 
-update-application-version = Version { $version } <a data-l10n-name="learn-more">What’s new</a>
+update-application-info = Version { $version } <a>What's new</a>
 
 update-history =
     .label = Show Update History…
@@ -315,7 +315,7 @@ performance-limit-content-process-option = Content process limit
     .accesskey = l
 
 performance-limit-content-process-enabled-desc = Additional content processes can improve performance when using multiple tabs, but will also use more memory.
-performance-limit-content-process-blocked-desc = Modifying the number of content processes is only possible with multiprocess { -brand-short-name }. <a data-l10n-name="learn-more">Learn how to check if multiprocess is enabled</a>
+performance-limit-content-process-disabled-desc = Modifying the number of content processes is only possible with multiprocess { -brand-short-name }. <a>Learn how to check if multiprocess is enabled</a>
 
 # Variables:
 #   $num - default value of the `dom.ipc.processCount` pref.
@@ -698,7 +698,7 @@ addressbar-suggestions-settings = Change preferences for search engine suggestio
 
 tracking-header = Tracking Protection
 
-tracking-desc = Tracking Protection blocks online trackers that collect your browsing data across multiple websites. <a data-l10n-name="learn-more">Learn more about Tracking Protection and your privacy</a>
+tracking-description = Tracking Protection blocks online trackers that collect your browsing data across multiple websites. <a>Learn more about Tracking Protection and your privacy</a>
 
 tracking-mode-label = Use Tracking Protection to block known trackers
 

diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp
@@ -2738,7 +2738,7 @@ class LocalizationHandler : public PromiseNativeHandler
       }
 
       Nullable<Sequence<AttributeNameValue>>& attributes =
-        l10nData[i].mAttributes;
+        l10nData[i].mAttrs;
       if (!attributes.IsNull()) {
         for (size_t j = 0; j < attributes.Value().Length(); ++j) {
           // Use SetAttribute here to validate the attribute name!

diff --git a/dom/base/test/chrome/test_node_localize.xul b/dom/base/test/chrome/test_node_localize.xul
@@ -25,25 +25,25 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1363862
   const translations = {
     "key1": {
       value: "Value 1",
-      attributes: null,
+      attrs: null,
     },
     "key2": {
       value: null,
-      attributes: [
+      attrs: [
         {name: "label", value: "Value 2"},
         {name: "accesskey", value: "K"},
       ]
     },
     "key3": {
       value: "Value 3",
-      attributes: [
+      attrs: [
         {name: "accesskey", value: "V"},
       ]
     },
     "key4": undefined,
     "key5": {
       value: null,
-      attributes: [
+      attrs: [
         {name: "value", value: "Submit Value"},
       ]
     }
@@ -118,8 +118,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1363862
         "element's textContent should be populated with the translation value");
       }
 
-      if (translation.attributes !== null) {
-        for (const {name, value} of translation.attributes) {
+      if (translation.attrs !== null) {
+        for (const {name, value} of translation.attrs) {
           ok(elem.getAttribute(name) === value,
             "attribute value should be populated from the translation");
         }

diff --git a/dom/webidl/L10nUtils.webidl b/dom/webidl/L10nUtils.webidl
@@ -31,7 +31,7 @@ dictionary AttributeNameValue {
 
 dictionary L10nValue {
   DOMString? value = null;
-  sequence<AttributeNameValue>? attributes = null;
+  sequence<AttributeNameValue>? attrs = null;
 };
 
 callback L10nCallback =

diff --git a/dom/webidl/Node.webidl b/dom/webidl/Node.webidl
@@ -192,9 +192,9 @@ interface Node : EventTarget {
    *       },
    *     ]
    * [2] trans == [
-   *       {value: "Key 1", attributes: {accesskey: "K"} },
+   *       {value: "Key 1", attrs: {accesskey: "K"} },
    *       undefined,
-   *       {value: null, attributes: {title: "Unread emails: 5"} },
+   *       {value: null, attrs: {title: "Unread emails: 5"} },
    *     ]
    * [3] untranslatedElements == [
    *       ,