Bug 1549906 - Use brandings.ftl to allow OnboardingMessageProvider.jsm to use new strings r=flod
authorEd Lee <edilee@mozilla.com>
Wed, 08 May 2019 05:28:15 +0000
changeset 473007 d851ba3d3b29675ec384dba6a25de24dd8b26e28
parent 473006 9518f9e5ecf9e34e618e728dc8725534bd7a0b70
child 473008 cd1ccb74af7c84aaa8ea43851c6ac74fd00ec276
push id113060
push userdvarga@mozilla.com
push dateWed, 08 May 2019 11:21:39 +0000
treeherdermozilla-inbound@eb44ee7510d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1549906
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 1549906 - Use brandings.ftl to allow OnboardingMessageProvider.jsm to use new strings r=flod Differential Revision: https://phabricator.services.mozilla.com/D30311
browser/base/content/test/static/browser_all_files_referenced.js
browser/components/newtab/lib/OnboardingMessageProvider.jsm
browser/locales/en-US/browser/newtab/onboarding.ftl
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -170,18 +170,16 @@ var whitelist = [
   {file: "chrome://devtools/skin/images/aboutdebugging-firefox-release.svg",
    isFromDevTools: true},
   {file: "chrome://devtools/skin/images/next.svg", isFromDevTools: true},
   // Bug 1526672
   {file: "resource://app/localization/en-US/browser/touchbar/touchbar.ftl",
    platforms: ["linux", "win"]},
   // Referenced by the webcompat system addon for localization
   {file: "resource://gre/localization/en-US/toolkit/about/aboutCompat.ftl"},
-  // Bug 1547016 activity-stream conditionally/dynamically references
-  {file: "resource://app/localization/en-US/browser/branding/brandings.ftl"},
 ];
 
 if (!AppConstants.MOZ_NEW_NOTIFICATION_STORE) {
   // kvstore.jsm wraps the API in nsIKeyValue.idl in a more ergonomic API
   // It landed in bug 1490496, and we expect to start using it shortly.
   whitelist.push({file: "resource://gre/modules/kvstore.jsm"});
 }
 
--- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm
+++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm
@@ -37,16 +37,17 @@ async function getAddonInfo() {
   } catch (e) {
     Cu.reportError("Failed to get the latest add-on version for Return to AMO");
     return null;
   }
 }
 
 const L10N = new Localization([
   "branding/brand.ftl",
+  "browser/branding/brandings.ftl",
   "browser/branding/sync-brand.ftl",
   "browser/newtab/onboarding.ftl",
 ]);
 
 const ONBOARDING_MESSAGES = async () => ([
   {
     id: "ONBOARDING_1",
     template: "onboarding",
--- a/browser/locales/en-US/browser/newtab/onboarding.ftl
+++ b/browser/locales/en-US/browser/newtab/onboarding.ftl
@@ -27,20 +27,20 @@ onboarding-start-browsing-button-label =
 
 onboarding-benefit-products-title = Useful Products
 onboarding-benefit-products-text = Get things done with a family of tools that respects your privacy across your devices.
 
 onboarding-benefit-knowledge-title = Practical Knowledge
 onboarding-benefit-knowledge-text = Learn everything you need to know to stay smarter and safer online.
 
 onboarding-benefit-privacy-title = True Privacy
-# "Personal Data Promise" should be treated as a brand and should be kept in
-# English. It refers to a concept shown elsewhere to the user: "The Firefox
-# Personal Data Promise is the way we honor your data in everything we make and
-# do. We take less data. We keep it safe. And we make sure that we are
+# "Personal Data Promise" is a concept that should be translated consistently
+# across the product. It refers to a concept shown elsewhere to the user: "The
+# Firefox Personal Data Promise is the way we honor your data in everything we
+# make and do. We take less data. We keep it safe. And we make sure that we are
 # transparent about how we use it."
 onboarding-benefit-privacy-text = Everything we do honors our Personal Data Promise: Take less. Keep it safe. No secrets.
 
 
 ## These strings belong to the individual onboarding messages.
 
 ## Each message has a title and a description of what the browser feature is.
 ## Each message also has an associated button for the user to try the feature.