commit 62c667c57e9e00fee0b0849e61e44e9999c14f39 Author: Alex Catarineu acat@torproject.org Date: Thu Oct 3 14:05:47 2019 +0200

fixup! Bug 28822: Convert onboarding to webextension --- browser/extensions/onboarding/content/Onboarding.jsm | 2 +- intl/strres/nsStringBundle.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 059701f78960..6d4dbfa35b40 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -13,7 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css"; const TORBUTTON_BUNDLE_URI = "chrome://torbutton/locale/browserOnboarding.properties"; const TORBROWSER_WELCOME_TOUR_NAME_KEY = "onboarding.tour-tor-welcome"; -const BUNDLE_URI = "chrome://onboarding/locale/onboarding.properties"; +const BUNDLE_URI = "chrome://torbutton/locale/onboarding.properties"; const UITOUR_JS_URI = "resource://onboarding/lib/UITour-lib.js"; const TOUR_AGENT_JS_URI = "resource://onboarding/onboarding-tour-agent.js"; const BRAND_SHORT_NAME = Services.strings diff --git a/intl/strres/nsStringBundle.cpp b/intl/strres/nsStringBundle.cpp index 5511b75c9879..49aa1e38f826 100644 --- a/intl/strres/nsStringBundle.cpp +++ b/intl/strres/nsStringBundle.cpp @@ -81,7 +81,7 @@ static const char kContentBundles[][52] = { "chrome://global/locale/xbl.properties", "chrome://global/locale/xul.properties", "chrome://necko/locale/necko.properties", - "chrome://onboarding/locale/onboarding.properties", + "chrome://torbutton/locale/onboarding.properties", };

static bool IsContentBundle(const nsCString& aUrl) {