This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch upstream/28.5.0 in repository pale-moon. commit 8b0531b4a13d03b4b182265a82a44dec049a9370 Author: JustOff <Off.Just.Off@gmail.com> Date: Fri Feb 15 00:15:06 2019 +0200 [PALEMOON] Link dictionaries to addons.palemoon.org --- application/palemoon/app/profile/palemoon.js | 5 +++-- application/palemoon/branding/shared/pref/preferences.inc | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js index 9a6a9fd..f2b9030 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%¤tAppVersion=%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 721c2c9..8a04546 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%¤tAppVersion=%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); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git