Bug 1483036 - Fix fluent errors caught by the new test failures. r=Gijs
authorZibi Braniecki <zbraniecki@mozilla.com>
Tue, 26 Mar 2019 15:05:14 +0000
changeset 466183 498699c9be80bd118c48335abc8fa689d66179f5
parent 466182 5100b0065b01ac6ac19ae9246483fa0003a8c6a3
child 466184 ba00aeb3eb206deb6881bcbe16ac4da6f8351578
push id35762
push usercsabou@mozilla.com
push dateWed, 27 Mar 2019 04:44:00 +0000
treeherdermozilla-central@bc572aee49b6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1483036
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1483036 - Fix fluent errors caught by the new test failures. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D24315
browser/base/content/pageinfo/pageInfo.xul
browser/base/content/pageinfo/security.js
browser/components/aboutconfig/test/browser/browser_accessibility.js
browser/components/aboutconfig/test/browser/browser_basic.js
browser/components/aboutconfig/test/browser/browser_clipboard.js
browser/components/aboutconfig/test/browser/browser_edit.js
browser/components/aboutconfig/test/browser/browser_locked.js
browser/components/aboutconfig/test/browser/browser_observe.js
browser/components/aboutconfig/test/browser/browser_search.js
browser/components/aboutconfig/test/browser/browser_warning.js
browser/components/preferences/connection.xul
browser/components/preferences/in-content/main.xul
--- a/browser/base/content/pageinfo/pageInfo.xul
+++ b/browser/base/content/pageinfo/pageInfo.xul
@@ -227,17 +227,17 @@
               <separator/>
               <textbox readonly="true" id="imagelongdesctext"/>
             </row>
           </rows>
         </grid>
         <hbox id="imageSaveBox" align="end">
           <vbox id="blockImageBox">
             <checkbox id="blockImage" hidden="true" oncommand="onBlockImage()"
-                      data-l10n-id="media-block-image"/>
+                      data-l10n-id="media-block-image" data-l10n-args='{"website":""}'/>
             <label control="thepreviewimage" data-l10n-id="media-preview" class="header"/>
           </vbox>
           <spacer id="imageSaveBoxSpacer" flex="1"/>
           <button data-l10n-id="menu-select-all"
                   id="selectallbutton"
                   oncommand="doSelectAllMedia();"/>
           <button data-l10n-id="media-save-as"
                   icon="save" id="imagesaveasbutton"
--- a/browser/base/content/pageinfo/security.js
+++ b/browser/base/content/pageinfo/security.js
@@ -339,17 +339,17 @@ function realmHasPasswords(uri) {
 
 /**
  * Return the number of previous visits recorded for host before today.
  *
  * @param host - the domain name to look for in history
  */
 function previousVisitCount(host, endTimeReference) {
   if (!host)
-    return false;
+    return 0;
 
   var historyService = Cc["@mozilla.org/browser/nav-history-service;1"]
                          .getService(Ci.nsINavHistoryService);
 
   var options = historyService.getNewQueryOptions();
   options.resultType = options.RESULTS_AS_VISIT;
 
   // Search for visits to this host before today
--- a/browser/components/aboutconfig/test/browser/browser_accessibility.js
+++ b/browser/components/aboutconfig/test/browser/browser_accessibility.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["test.aboutconfig.added", true],
     ],
   });
 });
 
--- a/browser/components/aboutconfig/test/browser/browser_basic.js
+++ b/browser/components/aboutconfig/test/browser/browser_basic.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["test.aboutconfig.userValueLikeLocalized",
        "chrome://test/locale/testing.properties"],
     ],
   });
 });
--- a/browser/components/aboutconfig/test/browser/browser_clipboard.js
+++ b/browser/components/aboutconfig/test/browser/browser_clipboard.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["test.aboutconfig.copy.false", false],
       ["test.aboutconfig.copy.number", 10],
       ["test.aboutconfig.copy.spaces.1", " "],
       ["test.aboutconfig.copy.spaces.2", "  "],
       ["test.aboutconfig.copy.spaces.3", "   "],
--- a/browser/components/aboutconfig/test/browser/browser_edit.js
+++ b/browser/components/aboutconfig/test/browser/browser_edit.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["test.aboutconfig.modify.boolean", true],
       ["test.aboutconfig.modify.number", 1337],
       ["test.aboutconfig.modify.string", "the answer to the life the universe and everything"],
     ],
   });
--- a/browser/components/aboutconfig/test/browser/browser_locked.js
+++ b/browser/components/aboutconfig/test/browser/browser_locked.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 const PREF_STRING_NO_DEFAULT = "test.aboutconfig.a";
 
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       [PREF_STRING_NO_DEFAULT, "some value"],
     ],
   });
--- a/browser/components/aboutconfig/test/browser/browser_observe.js
+++ b/browser/components/aboutconfig/test/browser/browser_observe.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["test.aboutconfig.modify.boolean", true],
       ["test.aboutconfig.modify.number", 1337],
       ["test.aboutconfig.modify.string", "the answer to the life the universe and everything"],
     ],
   });
--- a/browser/components/aboutconfig/test/browser/browser_search.js
+++ b/browser/components/aboutconfig/test/browser/browser_search.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["test.aboutconfig.a", "test value 1"],
       ["test.aboutconfig.ab", "test value 2"],
       ["test.aboutconfig.b", "test value 3"],
     ],
   });
--- a/browser/components/aboutconfig/test/browser/browser_warning.js
+++ b/browser/components/aboutconfig/test/browser/browser_warning.js
@@ -1,11 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+/**
+ * This is a temporary workaround to
+ * be resolved in bug 1539000.
+ */
+ChromeUtils.import("resource://testing-common/PromiseTestUtils.jsm", this);
+PromiseTestUtils.whitelistRejectionsGlobally(/Too many characters in placeable/);
+
 add_task(async function setup() {
   await SpecialPowers.pushPrefEnv({
     set: [
       ["browser.aboutConfig.showWarning", true],
     ],
   });
 });
 
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -153,16 +153,17 @@
             preference="network.trr.mode"
             onsyncfrompreference="return gConnectionsDialog.readDnsOverHttpsMode();"
             onsynctopreference="return gConnectionsDialog.writeDnsOverHttpsMode();"
             oncommand="gConnectionsDialog.updateDnsOverHttpsUI();"/>
   <vbox class="indent" flex="1">
     <radiogroup id="DnsOverHttpsUrlRadioGroup" orient="vertical">
       <radio id="defaultDnsOverHttpsUrlRadio"
              data-l10n-id="connection-dns-over-https-url-default"
+             data-l10n-args='{"url":""}'
              preference="network.trr.uri"
              oncommand="gConnectionsDialog.updateDnsOverHttpsUI();"/>
       <hbox>
         <radio id="customDnsOverHttpsUrlRadio"
                data-l10n-id="connection-dns-over-https-url-custom"
                oncommand="gConnectionsDialog.updateDnsOverHttpsUI();"/>
         <textbox id="customDnsOverHttpsInput" flex="1" preference="network.trr.custom_uri"/>
       </hbox>
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -694,16 +694,15 @@
                 connection-proxy-socks5,
                 connection-proxy-noproxy,
                 connection-proxy-noproxy-desc,
                 connection-proxy-http-share.label,
                 connection-proxy-autotype.label,
                 connection-proxy-reload.label,
                 connection-proxy-autologin.label,
                 connection-proxy-socks-remote-dns.label,
-                connection-dns-over-https,
-                connection-dns-over-https-url-custom,
-                connection-dns-over-https-url-default,
+                connection-dns-over-https.label,
+                connection-dns-over-https-url-custom.label,
             " />
     </hbox>
   </hbox>
 </groupbox>
 ]]></box>