1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 596aaeb7e5417f1f97eab2116503013bc68c0c3a |
2 # Parent f144d934d339d048bf9b650fc776397029150dd6 |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
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 @@ -351,16 +351,20 @@ pref("browser.helperApps.deleteTempFileO |
9 @@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO |
10 #endif |
10 #endif |
11 |
11 |
12 // search engines URL |
12 // search engines URL |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
13 pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
14 |
14 |
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 @@ -63,20 +63,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST |
33 @@ -66,21 +66,23 @@ STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST |
34 |
|
35 STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ |
|
36 $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
|
37 cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
34 cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
38 chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
35 chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ |
39 $(NULL) |
36 $(NULL) |
40 endif |
37 endif |
41 |
38 |
|
39 ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
|
40 SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
|
41 else |
42 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
42 -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) |
43 +SEARCHPLUGINS_NAMES = $(shell cat \ |
43 +SEARCHPLUGINS_NAMES = $(shell cat \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
44 + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
45 + @srcdir@/en-US/searchplugins/list.txt ) ) |
|
46 endif |
46 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
47 SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
47 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
48 SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
48 -PP_TARGETS += SEARCHPLUGINS |
49 -PP_TARGETS += SEARCHPLUGINS |
49 +#PP_TARGETS += SEARCHPLUGINS |
50 +#PP_TARGETS += SEARCHPLUGINS |
50 |
51 |
53 ifdef MOZ_METRO |
54 ifdef MOZ_METRO |
54 # metro build, include both app folders |
55 # metro build, include both app folders |
55 DIST_SUBDIRS = browser metro |
56 DIST_SUBDIRS = browser metro |
56 else |
57 else |
57 DIST_SUBDIRS = $(DIST_SUBDIR) |
58 DIST_SUBDIRS = $(DIST_SUBDIR) |
58 @@ -123,20 +125,44 @@ install:: $(addprefix generic/profile/,$ |
59 @@ -127,20 +129,44 @@ install:: $(addprefix generic/profile/,$ |
59 |
60 |
60 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
61 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
61 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
62 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
62 |
63 |
63 # metro build calls back here for search engine plugins |
64 # metro build calls back here for search engine plugins |
75 + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ |
76 + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ |
76 + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
77 + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
77 + done |
78 + done |
78 + |
79 + |
79 +searchplugins-jar:: tmp-search.jar.mn |
80 +searchplugins-jar:: tmp-search.jar.mn |
80 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
81 + $(call py_action,jar_maker,\ |
81 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
82 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
82 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
83 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
83 + -s $(LOCALE_SRCDIR)/searchplugins \ |
84 + -s $(LOCALE_SRCDIR)/searchplugins \ |
84 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
85 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn) |
85 + |
86 + |
86 +libs:: searchplugins-jar |
87 +libs:: searchplugins-jar |
87 + |
88 + |
88 +GARBAGE += tmp-search.jar.mn |
89 +GARBAGE += tmp-search.jar.mn |
89 + |
90 + |
101 ifdef MOZ_METRO |
102 ifdef MOZ_METRO |
102 @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* |
103 @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* |
103 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml |
104 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml |
104 --- a/browser/locales/en-US/searchplugins/google.xml |
105 --- a/browser/locales/en-US/searchplugins/google.xml |
105 +++ b/browser/locales/en-US/searchplugins/google.xml |
106 +++ b/browser/locales/en-US/searchplugins/google.xml |
106 @@ -9,24 +9,16 @@ |
107 @@ -9,25 +9,17 @@ |
107 <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image> |
108 <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image> |
108 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> |
109 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> |
109 <Url type="text/html" method="GET" template="https://www.google.com/search"> |
110 <Url type="text/html" method="GET" template="https://www.google.com/search"> |
110 <Param name="q" value="{searchTerms}"/> |
111 <Param name="q" value="{searchTerms}"/> |
111 <Param name="ie" value="utf-8"/> |
112 <Param name="ie" value="utf-8"/> |
121 -#else |
122 -#else |
122 <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/> |
123 <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/> |
123 -#endif |
124 -#endif |
124 <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/> |
125 <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/> |
125 <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/> |
126 <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/> |
|
127 <MozParam name="channel" condition="purpose" purpose="searchbar" value="sb"/> |
126 <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/> |
128 <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/> |
127 <MozParam name="source" condition="purpose" purpose="homepage" value="hp"/> |
129 <MozParam name="source" condition="purpose" purpose="homepage" value="hp"/> |
128 </Url> |
130 </Url> |
129 <SearchForm>https://www.google.com/</SearchForm> |
131 <SearchForm>https://www.google.com/</SearchForm> |
130 </SearchPlugin> |
132 </SearchPlugin> |
131 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
133 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
132 --- a/browser/locales/jar.mn |
134 --- a/browser/locales/jar.mn |
133 +++ b/browser/locales/jar.mn |
135 +++ b/browser/locales/jar.mn |
134 @@ -122,14 +122,15 @@ |
136 @@ -124,14 +124,15 @@ |
135 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
137 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
136 #endif |
138 #endif |
137 % locale browser-region @AB_CD@ %locale/browser-region/ |
139 % locale browser-region @AB_CD@ %locale/browser-region/ |
138 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
140 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
139 # the following files are browser-specific overrides |
141 # the following files are browser-specific overrides |