diff --git a/mozilla/editor/ui/composer.js b/mozilla/editor/ui/composer.js index 99557ded934..cae448a4048 100644 --- a/mozilla/editor/ui/composer.js +++ b/mozilla/editor/ui/composer.js @@ -66,7 +66,6 @@ pref("editor.table.maintain_structure", true); pref("editor.prettyprint", true); pref("editor.throbber.url","chrome://editor-region/locale/region.properties"); -pref("editor.spellcheckers.url","chrome://editor-region/locale/region.properties"); pref("editor.toolbars.showbutton.new", true); pref("editor.toolbars.showbutton.open", true); diff --git a/mozilla/editor/ui/locales/en-US/chrome/region/region.properties b/mozilla/editor/ui/locales/en-US/chrome/region/region.properties index 97df60024d0..eec06148fb0 100644 --- a/mozilla/editor/ui/locales/en-US/chrome/region/region.properties +++ b/mozilla/editor/ui/locales/en-US/chrome/region/region.properties @@ -2,4 +2,3 @@ # editor.js # editor.properties editor.throbber.url=http://www.mozilla.org/projects/seamonkey/ -editor.spellcheckers.url=https://addons.mozilla.org/search.php?cat=68&app=seamonkey&type=E diff --git a/mozilla/mailnews/base/resources/content/start.xhtml b/mozilla/mailnews/base/resources/content/start.xhtml index 8580e90c46f..f69f8784cd9 100644 --- a/mozilla/mailnews/base/resources/content/start.xhtml +++ b/mozilla/mailnews/base/resources/content/start.xhtml @@ -76,5 +76,20 @@

&info_bugs.label;

+ + diff --git a/mozilla/mailnews/base/resources/locale/en-US/start.dtd b/mozilla/mailnews/base/resources/locale/en-US/start.dtd index b36f1797132..b4470a91529 100644 --- a/mozilla/mailnews/base/resources/locale/en-US/start.dtd +++ b/mozilla/mailnews/base/resources/locale/en-US/start.dtd @@ -52,12 +52,14 @@ client, supporting advanced junk mail detection and other useful features."> "Tight integration with the &brandShortName; application suite"> + dictionaries -section on Mozilla Add-ons.'> +'Many additional languages can be installed from the +dictionaries section on +Mozilla Add-ons.'> + We welcome bug reports and feature -requests, but please read the release notes and query +requests, but please read the release notes and query Bugzilla first.'> diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.js b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.js index e58943b39ad..61759733220 100644 --- a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.js +++ b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.js @@ -132,8 +132,9 @@ function SelectLanguage(aTarget) { if (aTarget.value != "more-cmd") gLastSelectedLang = aTarget; else { - window.open(parent.hPrefWindow.getPref("localizedstring", - "editor.spellcheckers.url")); + var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"] + .getService(Components.interfaces.nsIURLFormatter); + window.open(formatter.formatURLPref("spellchecker.dictionaries.download.url")); if (gLastSelectedLang) document.getElementById("languageMenuList").selectedItem = gLastSelectedLang; } diff --git a/mozilla/suite/browser/browser-prefs.js b/mozilla/suite/browser/browser-prefs.js index 53462903ddb..a4271f64bca 100644 --- a/mozilla/suite/browser/browser-prefs.js +++ b/mozilla/suite/browser/browser-prefs.js @@ -190,7 +190,7 @@ pref("mail.directory", ""); pref("news.directory", ""); pref("browser.editor.disabled", false); pref("spellchecker.dictionary", ""); -pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/"); +pref("spellchecker.dictionaries.download.url", "chrome://branding/locale/brand.properties"); // this will automatically enable inline spellchecking (if it is available) for // editable elements in HTML @@ -202,6 +202,8 @@ pref("layout.spellcheckDefault", 1); // special TypeAheadFind settings pref("accessibility.typeaheadfind.flashBar", 0); +pref("app.releaseNotesURL", "chrome://branding/locale/brand.properties"); + // App-specific update preferences // Whether or not app updates are enabled - false initally for SeaMonkey @@ -292,10 +294,10 @@ pref("extensions.update.interval", 86400); // Check for updates to Extensions a // Themes every day // Non-symmetric (not shared by extensions) extension-specific [update] preferences -pref("extensions.getMoreExtensionsURL", "chrome://mozapps/locale/extensions/extensions.properties"); -pref("extensions.getMoreThemesURL", "chrome://mozapps/locale/extensions/extensions.properties"); +pref("extensions.getMoreExtensionsURL", "chrome://branding/locale/brand.properties"); +pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties"); pref("extensions.getMoreLocalesURL", "chrome://branding/locale/brand.properties"); -pref("extensions.dss.enabled", false); // Dynamic Skin Switching +pref("extensions.dss.enabled", false); // Dynamic Skin Switching pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next // restart. diff --git a/mozilla/suite/common/nsContextMenu.js b/mozilla/suite/common/nsContextMenu.js index 1906ec9daeb..c787c53d4a9 100644 --- a/mozilla/suite/common/nsContextMenu.js +++ b/mozilla/suite/common/nsContextMenu.js @@ -946,8 +946,9 @@ nsContextMenu.prototype = { addDictionaries : function() { try { - var url = pref.getComplexValue("editor.spellcheckers.url", - Components.interfaces.nsIPrefLocalizedString).data; + var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"] + .getService(Components.interfaces.nsIURLFormatter); + var url = formatter.formatURLPref("spellchecker.dictionaries.download.url"); window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url); } catch (ex) {} diff --git a/mozilla/suite/locales/en-US/chrome/branding/brand.properties b/mozilla/suite/locales/en-US/chrome/branding/brand.properties index 9e8d0651895..dec67eef707 100644 --- a/mozilla/suite/locales/en-US/chrome/branding/brand.properties +++ b/mozilla/suite/locales/en-US/chrome/branding/brand.properties @@ -3,3 +3,7 @@ brandShortName=SeaMonkey vendorShortName=SeaMonkey sidebarName=Sidebar extensions.getMoreLocalesURL=http://www.mozilla.org/projects/seamonkey/releases/#l10n +extensions.getMoreExtensionsURL=http://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/extensions/ +extensions.getMoreThemesURL=http://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/themes/ +spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/ +app.releaseNotesURL=http://www.mozilla.org/projects/seamonkey/releases/seamonkey%VERSION%/ diff --git a/mozilla/xpfe/bootstrap/browser-prefs.js b/mozilla/xpfe/bootstrap/browser-prefs.js index 481eea6341f..a6fff40cae1 100644 --- a/mozilla/xpfe/bootstrap/browser-prefs.js +++ b/mozilla/xpfe/bootstrap/browser-prefs.js @@ -189,7 +189,7 @@ pref("mail.directory", ""); pref("news.directory", ""); pref("browser.editor.disabled", false); pref("spellchecker.dictionary", ""); -pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/"); +pref("spellchecker.dictionaries.download.url", "chrome://branding/locale/brand.properties"); // this will automatically enable inline spellchecking (if it is available) for // editable elements in HTML @@ -198,6 +198,8 @@ pref("spellchecker.dictionaries.download.url", "https://%LOCALE%.add-ons.mozilla // 2 = check multi/single line controls pref("layout.spellcheckDefault", 1); +pref("app.releaseNotesURL", "chrome://branding/locale/brand.properties"); + pref("extensions.getMoreLocalesURL", "chrome://branding/locale/brand.properties"); pref("xpinstall.dialog.confirm", "chrome://communicator/content/xpinstall/institems.xul");