summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@wolfbeast.com>2019-02-15 13:58:42 +0100
committerGitHub <noreply@github.com>2019-02-15 13:58:42 +0100
commitca662e97800119ea5a258400d2296d33bdadde01 (patch)
treedd9e3876629cfb76cc2dcabfaeb9aac098ffb645
parent77e1b07f3015ca5d5b3de99e9474efa4fb711b0c (diff)
parent8b0531b4a13d03b4b182265a82a44dec049a9370 (diff)
downloadUXP-ca662e97800119ea5a258400d2296d33bdadde01.tar
UXP-ca662e97800119ea5a258400d2296d33bdadde01.tar.gz
UXP-ca662e97800119ea5a258400d2296d33bdadde01.tar.lz
UXP-ca662e97800119ea5a258400d2296d33bdadde01.tar.xz
UXP-ca662e97800119ea5a258400d2296d33bdadde01.zip
Merge pull request #975 from JustOff/PR_dictionaries_url
[PALEMOON] Link dictionaries to addons.palemoon.org
-rw-r--r--application/palemoon/app/profile/palemoon.js5
-rw-r--r--application/palemoon/branding/shared/pref/preferences.inc5
2 files changed, 6 insertions, 4 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index a6b359819..3c550ab8b 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -38,7 +38,8 @@ pref("extensions.strictCompatibility", false);
pref("extensions.minCompatibleAppVersion", "1.5");
// Preferences for APO integration
-#define APO_AM_URL addons.palemoon.org/integration/addon-manager
+#define APO_URL addons.palemoon.org
+#define APO_AM_URL @APO_URL@/integration/addon-manager
#define APO_AUS_ARGS reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%
pref("extensions.getAddons.cache.enabled", false);
@@ -70,7 +71,7 @@ pref("extensions.update.autoUpdateDefault", true);
pref("extensions.autoDisableScopes", 15);
// Dictionary download preference
-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
+pref("browser.dictionaries.download.url", "https://@APO_URL@/dictionaries/");
// Get More Tools link URL
pref("browser.getdevtools.url","https://@APO_AM_URL@/external/devtools");
diff --git a/application/palemoon/branding/shared/pref/preferences.inc b/application/palemoon/branding/shared/pref/preferences.inc
index 721c2c90e..8a0454626 100644
--- a/application/palemoon/branding/shared/pref/preferences.inc
+++ b/application/palemoon/branding/shared/pref/preferences.inc
@@ -1,4 +1,5 @@
-#define APO_AM_URL addons.palemoon.org/integration/addon-manager
+#define APO_URL addons.palemoon.org
+#define APO_AM_URL @APO_URL@/integration/addon-manager
#define APO_AUS_ARGS reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%&currentAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%
// ===| General |==============================================================
@@ -36,7 +37,7 @@ pref("extensions.blocklist.url","http://blocklist.palemoon.org/%VERSION%/blockli
pref("extensions.blocklist.itemURL", "http://blocklist.palemoon.org/info/?id=%blockID%");
// Dictionary URL
-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
+pref("browser.dictionaries.download.url", "https://@APO_URL@/dictionaries/");
pref("extensions.update.autoUpdateDefault", true); // Automatically update extensions by default
pref("extensions.getAddons.maxResults", 10);