1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent cd1ec2efff2b6c41550ce2b5b9b8ba8182eb9836 |
2 # Parent 020e09bf3fc6f17b3041ecf70f1376da37db8645 |
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 @@ -342,16 +342,20 @@ pref("browser.download.panel.shown", fal |
9 @@ -340,16 +340,20 @@ pref("browser.download.panel.shown", fal |
10 pref("browser.download.panel.firstSessionCompleted", false); |
10 pref("browser.download.panel.firstSessionCompleted", false); |
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 |
53 ifdef MOZ_METRO |
53 ifdef MOZ_METRO |
54 # metro build, include both app folders |
54 # metro build, include both app folders |
55 DIST_SUBDIRS = browser metro |
55 DIST_SUBDIRS = browser metro |
56 else |
56 else |
57 DIST_SUBDIRS = $(DIST_SUBDIR) |
57 DIST_SUBDIRS = $(DIST_SUBDIR) |
58 @@ -142,20 +144,44 @@ install:: $(addprefix generic/profile/,$ |
58 @@ -131,20 +133,44 @@ install:: $(addprefix generic/profile/,$ |
59 |
59 |
60 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
60 install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
61 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
61 $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome |
62 |
62 |
63 # metro build calls back here for search engine plugins |
63 # metro build calls back here for search engine plugins |
69 + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ |
69 + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ |
70 + @echo >> $@ |
70 + @echo >> $@ |
71 + |
71 + |
72 +searchplugins-jar:: $(SEARCHPLUGINS) |
72 +searchplugins-jar:: $(SEARCHPLUGINS) |
73 + for SEARCHPLUGIN in $^; do \ |
73 + for SEARCHPLUGIN in $^; do \ |
74 + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
74 + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ |
75 + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ |
75 + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ |
76 + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
76 + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
77 + done |
77 + done |
78 + |
78 + |
79 +searchplugins-jar:: tmp-search.jar.mn |
79 +searchplugins-jar:: tmp-search.jar.mn |
80 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
80 + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ |
81 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
81 + $(QUIET) -j $(FINAL_TARGET)/chrome \ |
82 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
82 + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
83 + -s $(LOCALE_SRCDIR)/searchplugins \ |
83 + -s $(LOCALE_SRCDIR)/searchplugins \ |
84 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
84 + $(MAKE_JARS_FLAGS) tmp-search.jar.mn |
85 + |
85 + |
86 +libs:: searchplugins-jar |
86 +libs:: searchplugins-jar |
87 + |
87 + |
88 +GARBAGE += tmp-search.jar.mn |
88 +GARBAGE += tmp-search.jar.mn |
89 + |
89 + |
90 libs-%: |
90 libs-%: |
91 $(NSINSTALL) -D $(DIST)/install |
91 $(NSINSTALL) -D $(DIST)/install |
92 @$(MAKE) -C ../../toolkit/locales libs-$* |
92 @$(MAKE) -C ../../toolkit/locales libs-$* |
93 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
93 @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
94 + @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* |
94 + @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* |
|
95 ifdef MOZ_WEBAPP_RUNTIME |
|
96 @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* |
|
97 endif |
95 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
98 @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
96 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* |
99 @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* |
97 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) |
100 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) |
98 ifdef MOZ_METRO |
101 ifdef MOZ_METRO |
99 @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* |
102 @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* |
100 endif |
|
101 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* |
|
102 |
|
103 diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml |
103 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 |
104 --- a/browser/locales/en-US/searchplugins/google.xml |
105 +++ b/browser/locales/en-US/searchplugins/google.xml |
105 +++ b/browser/locales/en-US/searchplugins/google.xml |
106 @@ -9,24 +9,16 @@ |
106 @@ -9,24 +9,16 @@ |
107 <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACuUlEQVRYw8VX60sUURSffybWv6MloxeV0Jug+hJB0YMoCCII1E3LnlYKlVkkUZKaRFEGFlgfMntYhlopVpaP1HXuPPbOzOmcOw/XZbed3ZndvXBYlr17zu+8fudcaWmlLKEsQWlFmUOBAsucY4tsSmQ8gjJTBMOpQjYjkoMGSiStUpHCnknmpXz+uLdJgY5eDsN/TJA1C9KdkUkTjraoWXXlBGDNaQZd/VwoP3xHhbVnGOxvVuHLL1MY5QZArEODbfUMllX70+kbACl8N2qAxgE2XmCLfltZI8O3CRtEXLVg00Xm2ynfAOoeacLA2+9G2t8P3lK98Lf3JsIH8OmH7eEzTEGmO6NT9p3JuBU+ADUB/40ASdsb+5KiFxAAw6pfHkt/p/G5Lu6MTZvhAyDP3VPdrqW90/zSRnmjWw8fwLG7C0VGOV5/dnGll2OXfEVeoFpZcUoOHwBJ0wvdA0FtdwS5YF0dg93XFHg1ZMDrYQNW17KcSC1nJtx3U4XH77nwdui3CaZDhAM/TSiP5c6qUhAu33qJeRFp6UnkpSMQgC1JAKZlC3Y1KsUFQEJ5dw/1/8kHWuEARKtk2HNdgctPdTENewYN0fPJxypUG1Zh74/PWsDQS2K8E/c12NmgQMU5BhXYksT/yaehSw8PgEuxn7HSUydhKkjuZIQ+N5xnwQEcv2cTkIGR3uxjzNY81LwoVLZpwQF0D3ChjCad33RRqujQchIYgDuG/2KbRX0CcDckP22ZFUBnH/dCWtuZ3SMqygTmv3/MCKcIt19RvFHMTbu6M1Eu7Yh9IwbMMEt0SGhdcOi2ClPzC9vvLBp48oELMLSq1SMv0HfakD+i5zuuKuHzwCqccmSMph6NY1pOqdWoNgbHTcEDB3AvjOZBxSV/mJT8aVZWwsdpmeQ8zyNOJOJFMBx3bJFN6R++on7RvMlpZAAAAABJRU5ErkJggg==</Image> |
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 <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> |
108 <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"> |
109 <Url type="text/html" method="GET" template="https://www.google.com/search"> |
110 <Param name="q" value="{searchTerms}"/> |
110 <Param name="q" value="{searchTerms}"/> |
111 <Param name="ie" value="utf-8"/> |
111 <Param name="ie" value="utf-8"/> |
112 <Param name="oe" value="utf-8"/> |
112 <Param name="oe" value="utf-8"/> |
129 <SearchForm>https://www.google.com/</SearchForm> |
129 <SearchForm>https://www.google.com/</SearchForm> |
130 </SearchPlugin> |
130 </SearchPlugin> |
131 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
131 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
132 --- a/browser/locales/jar.mn |
132 --- a/browser/locales/jar.mn |
133 +++ b/browser/locales/jar.mn |
133 +++ b/browser/locales/jar.mn |
134 @@ -116,16 +116,17 @@ |
134 @@ -119,14 +119,15 @@ |
135 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
135 locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
136 #endif |
136 #endif |
137 % locale browser-region @AB_CD@ %locale/browser-region/ |
137 % locale browser-region @AB_CD@ %locale/browser-region/ |
138 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
138 locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
139 # the following files are browser-specific overrides |
139 # the following files are browser-specific overrides |
142 locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
142 locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
143 + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
143 + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
144 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
144 % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
145 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
145 % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
146 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
146 % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
147 % locale testpilot @AB_CD@ %locale/feedback/ |
|
148 locale/feedback/main.dtd (%feedback/main.dtd) |
|
149 locale/feedback/main.properties (%feedback/main.properties) |
|
150 % locale pdf.js @AB_CD@ %locale/pdfviewer/ |
147 % locale pdf.js @AB_CD@ %locale/pdfviewer/ |
151 locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) |
148 locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) |
|
149 locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) |