From 75d168933a261c388673cd1d3e893178c59c03b0 Mon Sep 17 00:00:00 2001 From: gasolin Date: Fri, 2 Jun 2017 17:44:56 +0800 Subject: [PATCH] Bug 1369291 - add l10n support for onboarding overlay;r=mossop,rexboy MozReview-Commit-ID: AzLol5jeAm3 --HG-- extra : rebase_source : 0e548cf1a81786fb44fbc9745fb639fcc8ae6204 --- browser/extensions/onboarding/content/onboarding.js | 4 +++- .../onboarding/locale/en-US/onboarding.properties | 5 +++++ browser/extensions/onboarding/locale/jar.mn | 8 ++++++++ browser/extensions/onboarding/locale/moz.build | 7 +++++++ browser/extensions/onboarding/moz.build | 2 ++ browser/locales/Makefile.in | 1 + 6 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 browser/extensions/onboarding/locale/en-US/onboarding.properties create mode 100644 browser/extensions/onboarding/locale/jar.mn create mode 100644 browser/extensions/onboarding/locale/moz.build diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index e05166deece3..c5ea04427328 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -12,6 +12,7 @@ Cu.import("resource://gre/modules/Services.jsm"); const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css"; const ABOUT_HOME_URL = "about:home"; const ABOUT_NEWTAB_URL = "about:newtab"; +const BUNDLE_URI = "chrome://onboarding/locale/onboarding.properties"; /** * The script won't be initialized if we turned off onboarding by @@ -20,6 +21,7 @@ const ABOUT_NEWTAB_URL = "about:newtab"; class Onboarding { constructor(contentWindow) { this.init(contentWindow); + this.bundle = Services.strings.createBundle(BUNDLE_URI); } async init(contentWindow) { @@ -70,7 +72,7 @@ class Onboarding { div.innerHTML = `
-
Getting started?
+
${this.bundle.GetStringFromName("gettingStarted")}
diff --git a/browser/extensions/onboarding/locale/en-US/onboarding.properties b/browser/extensions/onboarding/locale/en-US/onboarding.properties new file mode 100644 index 000000000000..d0e790d4aac4 --- /dev/null +++ b/browser/extensions/onboarding/locale/en-US/onboarding.properties @@ -0,0 +1,5 @@ +# 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/. + +gettingStarted=Getting started? diff --git a/browser/extensions/onboarding/locale/jar.mn b/browser/extensions/onboarding/locale/jar.mn new file mode 100644 index 000000000000..f0590674e8f9 --- /dev/null +++ b/browser/extensions/onboarding/locale/jar.mn @@ -0,0 +1,8 @@ +#filter substitution +# 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/. + +@AB_CD@.jar: +% locale onboarding @AB_CD@ %locale/@AB_CD@/ + locale/@AB_CD@/ (en-US/*) diff --git a/browser/extensions/onboarding/locale/moz.build b/browser/extensions/onboarding/locale/moz.build new file mode 100644 index 000000000000..aac3a838c4c2 --- /dev/null +++ b/browser/extensions/onboarding/locale/moz.build @@ -0,0 +1,7 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# 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/. + +JAR_MANIFESTS += ['jar.mn'] diff --git a/browser/extensions/onboarding/moz.build b/browser/extensions/onboarding/moz.build index 8c008f852ca2..89972835fc8c 100644 --- a/browser/extensions/onboarding/moz.build +++ b/browser/extensions/onboarding/moz.build @@ -7,6 +7,8 @@ DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION'] +DIRS += ['locale'] + FINAL_TARGET_PP_FILES.features['onboarding@mozilla.org'] += [ 'install.rdf.in' ] diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 4bb0ece39f6c..25c6b6d8315b 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -105,6 +105,7 @@ endif ifndef RELEASE_OR_BETA @$(MAKE) -C ../extensions/presentation/locale AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../extensions/webcompat-reporter/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C ../extensions/onboarding/locale AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'