Bug 1639923 - Move new WebRTC UI strings from preview into the locales folder. r=Gijs,fluent-reviewers
authorMike Conley <mconley@mozilla.com>
Thu, 21 May 2020 21:22:23 +0000
changeset 531520 00acf6329f85b69453113a1edbf0d904806c6e0d
parent 531519 8405ac2a305a16d869b0c0da87dc426df2633739
child 531521 6f615c38b59464498ca3a89284685cad07551a01
push id37440
push userabutkovits@mozilla.com
push dateFri, 22 May 2020 09:43:16 +0000
treeherdermozilla-central@fbf71e4d2e21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, fluent-reviewers
bugs1639923
milestone78.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 1639923 - Move new WebRTC UI strings from preview into the locales folder. r=Gijs,fluent-reviewers Differential Revision: https://phabricator.services.mozilla.com/D76397
browser/actors/WebRTCParent.jsm
browser/base/content/browser.xhtml
browser/base/content/popup-notifications.ftl
browser/base/content/webrtcIndicator.ftl
browser/base/content/webrtcIndicator.xhtml
browser/locales/en-US/browser/browser.ftl
browser/locales/en-US/browser/webrtcIndicator.ftl
browser/locales/jar.mn
--- a/browser/actors/WebRTCParent.jsm
+++ b/browser/actors/WebRTCParent.jsm
@@ -477,17 +477,17 @@ function prompt(aActor, aBrowser, aReque
   // are expired permission states.
   aBrowser.dispatchEvent(
     new aBrowser.ownerGlobal.CustomEvent("PermissionStateChange")
   );
 
   let chromeDoc = aBrowser.ownerDocument;
   let stringBundle = chromeDoc.defaultView.gNavigatorBundle;
   let localization = new Localization(
-    ["branding/brand.ftl", "preview/popup-notifications.ftl"],
+    ["branding/brand.ftl", "browser/browser.ftl"],
     true
   );
 
   // Mind the order, because for simplicity we're iterating over the list using
   // "includes()". This allows the rotation of string identifiers. We list the
   // full identifiers here so they can be cross-referenced more easily.
   let joinedRequestTypes = requestTypes.join("And");
   let requestMessages;
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -78,17 +78,16 @@
   <link rel="localization" href="browser/browserSets.ftl"/>
   <link rel="localization" href="browser/menubar.ftl"/>
   <link rel="localization" href="browser/protectionsPanel.ftl"/>
   <link rel="localization" href="browser/appmenu.ftl"/>
   <link rel="localization" href="preview/interventions.ftl"/>
   <link rel="localization" href="browser/sidebarMenu.ftl"/>
   <link rel="localization" href="browser/allTabsMenu.ftl"/>
   <link rel="localization" href="browser/places.ftl"/>
-  <link rel="localization" href="preview/popup-notifications.ftl"/>
 
   <title>&mainWindow.title;</title>
 
 # All JS files which are needed by browser.xhtml and other top level windows to
 # support MacOS specific features *must* go into the global-scripts.inc file so
 # that they can be shared with macWindow.inc.xhtml.
 #include global-scripts.inc
 
deleted file mode 100644
--- a/browser/base/content/popup-notifications.ftl
+++ /dev/null
@@ -1,28 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Note: This is currently placed under browser/base/content so that we can
-# get the strings to appear without having our localization community need
-# to go through and translate everything. Once these strings are ready for
-# translation, we'll move it to the locales folder.
-
-popup-screen-sharing-not-now =
-  .label = Not Now
-  .accesskey = w
-
-popup-screen-sharing-never =
-  .label = Never Allow
-  .accesskey = N
-
-popup-silence-notifications-checkbox = Disable notifications from { -brand-short-name } while sharing
-popup-silence-notifications-checkbox-warning = { -brand-short-name } will not display notifications while you are sharing.
-
-## WebRTC window or screen share tab switch warning
-
-sharing-warning-window = You are sharing { -brand-short-name }. Other people can see when you switch to a new tab.
-sharing-warning-screen = You are sharing your entire screen. Other people can see when you switch to a new tab.
-sharing-warning-proceed-to-tab =
-  .label = Proceed to Tab
-sharing-warning-disable-for-session =
-  .label = Disable sharing protection for this session
--- a/browser/base/content/webrtcIndicator.xhtml
+++ b/browser/base/content/webrtcIndicator.xhtml
@@ -16,17 +16,17 @@
       windowtype="Browser:WebRTCGlobalIndicator"
 #ifdef XP_MACOSX
       inwindowmenu="false"
 #endif
       chromemargin="0,0,0,0">
 
   <head>
     <link rel="localization" href="branding/brand.ftl"/>
-    <link rel="localization" href="preview/webrtcIndicator.ftl"/>
+    <link rel="localization" href="browser/webrtcIndicator.ftl"/>
 #ifndef XP_MACOSX
     <title data-l10n-id="webrtc-indicator-title"></title>
 #endif
     <script src="chrome://browser/content/webrtcIndicator.js"></script>
   </head>
 
   <body>
     <div id="display-share" class="row-item">
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -224,16 +224,36 @@ browser-window-close-button =
 popup-select-camera =
     .value = Camera to share:
     .accesskey = C
 popup-select-microphone =
     .value = Microphone to share:
     .accesskey = M
 popup-all-windows-shared = All visible windows on your screen will be shared.
 
+popup-screen-sharing-not-now =
+  .label = Not Now
+  .accesskey = w
+
+popup-screen-sharing-never =
+  .label = Never Allow
+  .accesskey = N
+
+popup-silence-notifications-checkbox = Disable notifications from { -brand-short-name } while sharing
+popup-silence-notifications-checkbox-warning = { -brand-short-name } will not display notifications while you are sharing.
+
+## WebRTC window or screen share tab switch warning
+
+sharing-warning-window = You are sharing { -brand-short-name }. Other people can see when you switch to a new tab.
+sharing-warning-screen = You are sharing your entire screen. Other people can see when you switch to a new tab.
+sharing-warning-proceed-to-tab =
+  .label = Proceed to Tab
+sharing-warning-disable-for-session =
+  .label = Disable sharing protection for this session
+
 ## DevTools F12 popup
 
 enable-devtools-popup-description = To use the F12 shortcut, first open DevTools via the Web Developer menu.
 
 
 ## URL Bar
 
 urlbar-default-placeholder =
rename from browser/base/content/webrtcIndicator.ftl
rename to browser/locales/en-US/browser/webrtcIndicator.ftl
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -5,18 +5,16 @@
 
 # Note: This file should only contain locale entries. All
 # override and resource entries should go to browser/base/jar.mn to avoid
 # having to create the same entry for each locale.
 
 [localization] @AB_CD@.jar:
   preview/protections.ftl                          (../components/protections/content/protections.ftl)
   preview/interventions.ftl                        (../components/urlbar/content/interventions.ftl)
-  preview/popup-notifications.ftl                  (../base/content/popup-notifications.ftl)
-  preview/webrtcIndicator.ftl                      (../base/content/webrtcIndicator.ftl)
   browser                                          (%browser/**/*.ftl)
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/browser/
 # bookmarks.html is produced by LOCALIZED_GENERATED_FILES.
     locale/browser/bookmarks.html                  (bookmarks.html)
 
     locale/browser/accounts.properties             (%chrome/browser/accounts.properties)