Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1115892: Ensure that en-GB displays the proper language in crashreporter. r=gps

Browse Source
This commit is contained in:
Stephen Pohl 2015-01-26 12:33:03 -05:00
parent 0b8a91736f
commit f2ca5b3bd5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/locales/l10n.mk
View File

@ -113,9 +113,11 @@ ifdef MOZ_STUB_INSTALLER
endif endif
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \ $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
ifneq (en,$(AB))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
ifneq (en,$(AB))
mv $(STAGEDIST)/en.lproj $(STAGEDIST)/$(AB).lproj mv $(STAGEDIST)/en.lproj $(STAGEDIST)/$(AB).lproj
endif
ifdef MOZ_CRASHREPORTER ifdef MOZ_CRASHREPORTER
# On Mac OS X, the crashreporter.ini file needs to be moved from under the # On Mac OS X, the crashreporter.ini file needs to be moved from under the
# application bundle's Resources directory where all other l10n files are # application bundle's Resources directory where all other l10n files are
@ -125,7 +127,7 @@ ifdef MOZ_CRASHREPORTER
$(RM) -rf $(STAGEDIST)/crashreporter.app $(RM) -rf $(STAGEDIST)/crashreporter.app
endif endif
endif endif
endif
$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH) $(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
cd $(DIST)/l10n-stage; \ cd $(DIST)/l10n-stage; \
$(MAKE_PACKAGE) $(MAKE_PACKAGE)