1 # HG changeset patch |
1 # HG changeset patch |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
2 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # Parent ec1efb28a1fea666f22730689d811fc67720f2db |
3 # Parent 8b1b35442fee96324a141ab5d7710c3a88769df5 |
4 Add searchplugins to chrome packaging for proper localization |
4 Add searchplugins to chrome packaging for proper localization |
5 |
5 |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
6 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
7 --- a/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
8 +++ b/browser/app/profile/firefox.js |
9 @@ -327,16 +327,20 @@ pref("browser.download.manager.scanWhenD |
9 @@ -323,16 +323,20 @@ pref("browser.download.manager.scanWhenD |
10 pref("browser.download.manager.resumeOnWakeDelay", 10000); |
10 pref("browser.download.manager.resumeOnWakeDelay", 10000); |
11 |
11 |
12 // search engines URL |
12 // search engines URL |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search-engines/"); |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
14 |
14 |
15 // pointer to the default engine name |
15 // pointer to the default engine name |
16 pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); |
16 pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); |
17 |
17 |
18 +// Tell the search service to load search plugins from the locale JAR |
18 +// Tell the search service to load search plugins from the locale JAR |
28 pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
28 pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
29 |
29 |
30 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
30 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
31 --- a/browser/locales/Makefile.in |
31 --- a/browser/locales/Makefile.in |
32 +++ b/browser/locales/Makefile.in |
32 +++ b/browser/locales/Makefile.in |
33 @@ -167,31 +167,43 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
33 @@ -167,29 +167,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr |
34 install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
34 install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; |
35 |
35 |
36 install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
36 install:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
37 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
37 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile |
38 |
38 |
65 +GARBAGE += tmp-search.jar.mn |
65 +GARBAGE += tmp-search.jar.mn |
66 |
66 |
67 libs-%: |
67 libs-%: |
68 $(NSINSTALL) -D $(DIST)/install |
68 $(NSINSTALL) -D $(DIST)/install |
69 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
69 @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 |
70 ifdef MOZ_SERVICES_SYNC |
|
71 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
70 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
72 endif |
|
73 + @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* |
71 + @$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$* |
74 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
72 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
75 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 |
73 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
|
74 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) BOTH_MANIFESTS=1 |
76 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
75 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 |
77 |
76 |
78 |
77 |
79 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
78 repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe |
80 repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
79 repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD) |
81 @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." |
|
82 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
80 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
83 --- a/browser/locales/jar.mn |
81 --- a/browser/locales/jar.mn |
84 +++ b/browser/locales/jar.mn |
82 +++ b/browser/locales/jar.mn |
85 @@ -81,11 +81,12 @@ |
83 @@ -84,11 +84,12 @@ |
86 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
84 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
87 # the following files are browser-specific overrides |
85 # the following files are browser-specific overrides |
88 * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
86 * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
89 * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
87 * locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
90 * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
88 * locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |