Verified Commit b0e39948 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 40926: Implemented the New Identity feature 

Bug 40781 (build): Move l10n files to browser/locales
parent 2fdc0261

browser/components/newidentity/content/newidentity.js

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { 
  let bundle = null;

  try {

    bundle = Services.strings.createBundle(

      "chrome://newidentity/locale/newIdentity.properties"

      "chrome://browser/locale/newIdentity.properties"

    );

  } catch (e) {

    console.warn("Could not load the New Identity strings");

browser/components/newidentity/jar.mn

+0 −11
Original line number Diff line number Diff line 
browser.jar:

    content/browser/newidentity.js       (content/newidentity.js)
 


newidentity.jar:

# We need to list at least one locale here, to make Firefox load the localized

# copy of properties at chrome://newidentity/locale/newIdentity.properties.

# Ideally, we should use @AB_CD@.jar to automatically copy all the locales

# Firefox is built with. But we only provide English here, and injecting the

# translated files directly to the omni.ja works better for us, for the time

# being. In addition to inject the properties files, we also add the

# corresponding locale line to chrome/chrome.manifest.

% locale newidentity en-US %locale/en-US/

    locale/en-US/newIdentity.properties  (locale/en-US/newIdentity.properties)

browser/installer/package-manifest.in

+0 −2
Original line number Diff line number Diff line
@@ -245,8 +245,6 @@ 
#endif



; Base Browser

@RESPATH@/browser/chrome/newidentity.manifest

@RESPATH@/browser/chrome/newidentity/

@RESPATH@/components/SecurityLevel.manifest



; [DevTools Startup Files]

browser/locales/jar.mn

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
    locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)

    locale/browser/syncSetup.properties         (%chrome/browser/syncSetup.properties)

    locale/browser/securityLevel.properties        (%chrome/browser/securityLevel.properties)

    locale/browser/newIdentity.properties          (%chrome/browser/newIdentity.properties)

% locale browser-region @AB_CD@ %locale/browser-region/

# the following files are browser-specific overrides

    locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)