bug 359174 - move a number of SeaMonkey URLs to branding, r+sr=Neil

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);

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

mailnews/base/resources/content/start.xhtml

@@ -76,5 +76,20 @@
 <p>&info_bugs.label;</p>
 </div>
 
+<script type="application/x-javascript">
+  // get dictionaries and release notes URLs from prefs
+  var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+                            .getService(Components.interfaces.nsIURLFormatter);
+  var dictURL = formatter.formatURLPref("spellchecker.dictionaries.download.url");
+  var dictionaries = document.getElementById("dictURL");
+  if (dictionaries)
+    dictionaries.setAttribute("href", dictURL);
+
+  var releaseNotesURL = formatter.formatURLPref("app.releaseNotesURL");
+  var relnotes = document.getElementById("releaseNotesURL");
+  if (relnotes)
+    relnotes.setAttribute("href", releaseNotesURL);
+</script>
+
 </body>
 </html>

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">
 <!ENTITY dict.title "Dictionaries">
 <!ENTITY dict_intro.label "Dictionaries are used to check the spelling of your messages.">
+<!--# LOCALIZATION NOTE (dict_info.label): the URL for <a id="dictURL"> is fetched from brand.properties -->
 <!ENTITY dict_info.label
-'Many additional languages can be installed from the 
-<a href="https://addons.mozilla.org/search.php?cat=68&amp;app=seamonkey&amp;type=E/">dictionaries</a> 
-section on <a href="http://addons.mozilla.org/">Mozilla Add-ons</a>.'>
+'Many additional languages can be installed from the
+<a id="dictURL" href="">dictionaries</a> section on
+<a href="https://addons.mozilla.org/seamonkey/">Mozilla Add-ons</a>.'>
 <!ENTITY info.title "More Information">
+<!--# LOCALIZATION NOTE (info_bugs.label): the URL for <a id="releaseNotesURL"> is fetched from brand.properties -->
 <!ENTITY info_bugs.label
 '<a href="http://www.mozilla.org/mailnews/">We</a> welcome bug reports and feature
-requests, but please read the <a href="&releaseURL;">release notes</a> and query
+requests, but please read the <a id="releaseNotesURL" href="">release notes</a> and query
 <a href="https://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>

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;
     }

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.
 

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) {}

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%/

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");