author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sun, 10 May 2015 09:05:36 +0200 | |
changeset 850 | a2bdff616a0e |
parent 837 | a1f740acf68e |
child 868 | 284da266ec46 |
permissions | -rw-r--r-- |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
817 | 2 |
# Parent 16846914f968944f991c8b12fdc38ce8fc099d73 |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
837 | 4 |
# Parent c0a406c7a6cc5edc8fb34549428866ff39ad878f |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
Add searchplugins to chrome packaging for proper localization |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
--- a/browser/app/profile/firefox.js |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
+++ b/browser/app/profile/firefox.js |
837 | 10 |
@@ -378,16 +378,20 @@ pref("browser.helperApps.deleteTempFileO |
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
653
diff
changeset
|
11 |
#endif |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
// search engines URL |
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
14 |
pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
// pointer to the default engine name |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
+// Tell the search service to load search plugins from the locale JAR |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
+pref("browser.search.loadFromJars", true); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
+pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
+ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
// Ordering of Search Engines in the Engine list. |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
|
837 | 28 |
// Market-specific search defaults (US market only) |
29 |
pref("browser.search.geoSpecificDefaults", true); |
|
30 |
pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=Yahoo"); |
|
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
--- a/browser/locales/Makefile.in |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
+++ b/browser/locales/Makefile.in |
837 | 34 |
@@ -66,27 +66,30 @@ STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST |
703 | 35 |
cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ |
36 |
chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \ |
|
642 | 37 |
$(NULL) |
38 |
endif |
|
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
40 |
ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
41 |
SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/metrolist.txt)) |
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
42 |
else |
805 | 43 |
-SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg |
642 | 44 |
+SEARCHPLUGINS_NAMES = $(shell cat \ |
837 | 45 |
+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ |
46 |
+ @srcdir@/en-US/searchplugins/list.txt ) ) ddg |
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
47 |
endif |
642 | 48 |
SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
805
diff
changeset
|
49 |
# metro build call a searchplugins target for search engine plugins |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
805
diff
changeset
|
50 |
.PHONY: searchplugins |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
805
diff
changeset
|
51 |
SEARCHPLUGINS_TARGET := libs searchplugins |
837 | 52 |
-SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) |
53 |
+#SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_NAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin)))) |
|
54 |
+SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) |
|
55 |
# Some locale-specific search plugins may have preprocessor directives, but the |
|
56 |
# default en-US ones do not. |
|
57 |
SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings |
|
642 | 58 |
-PP_TARGETS += SEARCHPLUGINS |
59 |
+#PP_TARGETS += SEARCHPLUGINS |
|
60 |
||
61 |
# Required for l10n.mk - defines a list of app sub dirs that should |
|
62 |
# be included in langpack xpis. |
|
63 |
ifdef MOZ_METRO |
|
64 |
# metro build, include both app folders |
|
65 |
DIST_SUBDIRS = browser metro |
|
66 |
else |
|
67 |
DIST_SUBDIRS = $(DIST_SUBDIR) |
|
837 | 68 |
@@ -120,16 +123,39 @@ NO_JA_JP_MAC_AB_CD := $(if $(filter ja-J |
807
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
805
diff
changeset
|
69 |
libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ; |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
805
diff
changeset
|
70 |
|
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
805
diff
changeset
|
71 |
libs:: $(addprefix generic/profile/,$(PROFILE_FILES)) |
f54c68340963
Aurora 35.0 (20141115) uplift
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
805
diff
changeset
|
72 |
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
|
703 | 74 |
libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) |
75 |
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome |
|
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
|
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
+tmp-search.jar.mn:: |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
+ printf "$(AB_CD).jar:" > $@ |
642 | 79 |
+ printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ |
80 |
+ @echo >> $@ |
|
409 | 81 |
+ |
642 | 82 |
+searchplugins-jar:: $(SEARCHPLUGINS) |
83 |
+ for SEARCHPLUGIN in $^; do \ |
|
709
7ce157f366c9
fix patch to use new preprocessor
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
84 |
+ $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \ |
7ce157f366c9
fix patch to use new preprocessor
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
85 |
+ $$SEARCHPLUGIN > $$SEARCHPLUGIN-new) ; \ |
703 | 86 |
+ mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ |
642 | 87 |
+ done |
88 |
+ |
|
89 |
+searchplugins-jar:: tmp-search.jar.mn |
|
691
18c2dc922e51
update to Firefox 27.0b2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
686
diff
changeset
|
90 |
+ $(call py_action,jar_maker,\ |
703 | 91 |
+ $(QUIET) -j $(FINAL_TARGET)/chrome \ |
92 |
+ -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ |
|
93 |
+ -s $(LOCALE_SRCDIR)/searchplugins \ |
|
94 |
+ $(MAKE_JARS_FLAGS) tmp-search.jar.mn) |
|
642 | 95 |
+ |
96 |
+libs:: searchplugins-jar |
|
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
+ |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
+GARBAGE += tmp-search.jar.mn |
642 | 99 |
+ |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
libs-%: |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
101 |
$(NSINSTALL) -D $(DIST)/install |
606
9d39369e1b4c
FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
102 |
@$(MAKE) -C ../../toolkit/locales libs-$* |
9d39369e1b4c
FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
103 |
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* |
653 | 104 |
ifdef MOZ_WEBAPP_RUNTIME |
105 |
@$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* |
|
106 |
endif |
|
606
9d39369e1b4c
FF19beta cycle preparation (does not build yet)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
107 |
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
--- a/browser/locales/jar.mn |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
+++ b/browser/locales/jar.mn |
837 | 111 |
@@ -146,14 +146,15 @@ |
642 | 112 |
locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) |
113 |
#endif |
|
114 |
% locale browser-region @AB_CD@ %locale/browser-region/ |
|
220
2538fd6a51be
update to 2.0b10/4.0b10
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
198
diff
changeset
|
115 |
locale/browser-region/region.properties (%chrome/browser-region/region.properties) |
2538fd6a51be
update to 2.0b10/4.0b10
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
198
diff
changeset
|
116 |
# the following files are browser-specific overrides |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
117 |
locale/browser/netError.dtd (%chrome/overrides/netError.dtd) |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
118 |
locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
515
diff
changeset
|
119 |
locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) |
642 | 120 |
+ locale/browser/searchplugins/list.txt (%searchplugins/list.txt) |
198
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
121 |
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
122 |
% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties |
447791e42c9b
Package searchplugins into langpack chrome and load from there
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
123 |
% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
124 |
% locale pdf.js @AB_CD@ %locale/pdfviewer/ |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
462
diff
changeset
|
125 |
locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) |
653 | 126 |
locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) |