From 4b088c6decc938b30475f6e521512ccfef17aa08 Mon Sep 17 00:00:00 2001
From: "loadrunner%betak.net" <loadrunner%betak.net>
Date: Thu, 16 Aug 2001 23:43:06 +0000
Subject: [PATCH] bug 84188, Need to migrate existing localizable string
 preferences to a new pref type, r=tao, sr=blake

---
 .../resources/content/pref-contentpacks.xul          |  2 +-
 extensions/wallet/resources/content/pref-wallet.xul  |  2 +-
 .../base/prefs/resources/content/pref-mailnews.xul   |  2 +-
 .../resources/content/pref-viewing_messages.xul      |  2 +-
 .../resources/content/pref-composing_messages.xul    |  4 ++--
 .../prefwindow/resources/content/nsPrefWindow.js     | 12 ------------
 .../prefwindow/resources/content/pref-languages.xul  |  6 +++---
 .../prefwindow/resources/content/pref-navigator.xul  |  2 +-
 8 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/extensions/content-packs/resources/content/pref-contentpacks.xul b/extensions/content-packs/resources/content/pref-contentpacks.xul
index e9b4e948418a..bda50ec1f7bd 100644
--- a/extensions/content-packs/resources/content/pref-contentpacks.xul
+++ b/extensions/content-packs/resources/content/pref-contentpacks.xul
@@ -61,7 +61,7 @@
 
     function SwitchContentPack()
     {
-      var oldContentPack = parent.hPrefWindow.getPref( "string", "general.useragent.contentlocale");
+      var oldContentPack = parent.hPrefWindow.getPref( "localizedstring", "general.useragent.contentlocale");
       var newContentPack;
 
       try {
diff --git a/extensions/wallet/resources/content/pref-wallet.xul b/extensions/wallet/resources/content/pref-wallet.xul
index cb066d5bb34b..4bcb2e2c539a 100644
--- a/extensions/wallet/resources/content/pref-wallet.xul
+++ b/extensions/wallet/resources/content/pref-wallet.xul
@@ -68,7 +68,7 @@
       <textbox id="walletServer"
                  flex="1"
                  pref="true"
-                 preftype="string"
+                 preftype="localizedstring"
                  prefstring="wallet.Server"
                  prefattribute="value"/>
     </hbox>
diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul
index a21bc4b88ce5..2e2e3191b075 100644
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -82,7 +82,7 @@ Contributor(s):
       <hbox autostretch="never">
         <text class="label" value="&location.label;" accesskey="&location.accesskey;" 
                    for="mailnews.start_page.url"/>
-        <textbox id="mailnewsStartPageUrl" flex="1" pref="true" preftype="string"
+        <textbox id="mailnewsStartPageUrl" flex="1" pref="true" preftype="localizedstring"
                  prefstring="mailnews.start_page.url" prefattribute="value"/>
       </hbox>
 
diff --git a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index 50607b41faf6..7a5cc1495427 100644
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -110,7 +110,7 @@
       <text class="label"  for="sendDefaultCharsetList"
             value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"/>
         <menulist class="small-margin" id="sendDefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
-                pref="true" preftype="string" prefstring="mailnews.view_default_charset"
+                pref="true" preftype="localizedstring" prefstring="mailnews.view_default_charset"
                 prefattribute="value">
         <template>
           <menupopup>
diff --git a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
index 09cf57b1a404..bed781ac606b 100644
--- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -110,7 +110,7 @@
    <hbox autostretch="never">
     <text class="label" value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" for="sendDefaultCharsetList"/>
     <menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
-              pref="true" preftype="string" prefstring="mailnews.send_default_charset"
+              pref="true" preftype="localizedstring" prefstring="mailnews.send_default_charset"
               prefattribute="value">
       <template>
         <menupopup>
@@ -128,7 +128,7 @@
    <hbox autostretch="never">
     <text class="label" value="&sendDefaultCharset.label;" for="sendDefaultCharsetList"/>
     <menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
-              pref="true" preftype="string" prefstring="mailnews.send_default_charset"
+              pref="true" preftype="localizedstring" prefstring="mailnews.send_default_charset"
               prefattribute="value">
       <template>
         <menupopup>
diff --git a/xpfe/components/prefwindow/resources/content/nsPrefWindow.js b/xpfe/components/prefwindow/resources/content/nsPrefWindow.js
index 83c45391bff9..dbc3b60411b3 100644
--- a/xpfe/components/prefwindow/resources/content/nsPrefWindow.js
+++ b/xpfe/components/prefwindow/resources/content/nsPrefWindow.js
@@ -145,19 +145,7 @@ nsPrefWindow.prototype =
                     case "color":
                     case "string":
                     default:
-                    // BEN: please remove this hacky coe once you add a new
-					// preftype for localizable pref.
-                      if((aPrefString == "browser.startup.homepage") ||
-                         (aPrefString == "wallet.Server") ||
-                         (aPrefString == "intl.accept_languages") ||
-                         (aPrefString == "intl.charset.default") ||
-                         (aPrefString == "mailnews.start_page.url") ||
-                         (aPrefString == "mailnews.view_default_charset") ||
-                         (aPrefString == "mailnews.send_default_charset")) {
-                            return  pref.getLocalizedUnicharPref( aPrefString );
-                      } else {
                          return !aDefaultFlag ? pref.CopyUnicharPref( aPrefString ) : pref.CopyDefaultUnicharPref( aPrefString );
-                      }
                   }
               }
             catch (e)
diff --git a/xpfe/components/prefwindow/resources/content/pref-languages.xul b/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 07cdbcc88144..dc842a450010 100644
--- a/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -40,7 +40,7 @@
 
   <broadcaster  id="intlAcceptLanguages" 
                 value="" 
-                preftype="string" 
+                preftype="localizedstring" 
                 prefstring="intl.accept_languages"/>
 
                 
@@ -57,7 +57,7 @@
     <html>&languages.customize.active.label;</html>
     <hbox flex="1">
       <tree class="inset" id="active_languages" flex="1" style="width: 0px; height: 0px;"
-            pref="true" preftype="string" prefstring="intl.accept_languages" prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
+            pref="true" preftype="localizedstring" prefstring="intl.accept_languages" prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
             datasources="rdf:null" multiple="true" onselect="SelectLanguage();">
         <treecolgroup>
           <treecol flex="1"/>
@@ -93,7 +93,7 @@
     <label value="&languages.customize.Charset.grouplabel;"/>
     <text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/>
     <menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
-        pref="true" preftype="string" prefstring="intl.charset.default"
+        pref="true" preftype="localizedstring" prefstring="intl.charset.default"
         prefattribute="value" wsm_attributes="value">
         <template>
           <menupopup>
diff --git a/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index bd598ef3eb4f..bf01a0373682 100644
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -70,7 +70,7 @@
         <text class="label" value="&location.label;" accesskey="&location.accesskey;" for="browserStartupHomepage"/>
         <textbox id="browserStartupHomepage" type="autocomplete" flex="1" wsm_persist="true" 
                    searchSessions="history" timeout="50" maxrows="6"
-                   pref="true" preftype="string" prefstring="browser.startup.homepage"
+                   pref="true" preftype="localizedstring" prefstring="browser.startup.homepage"
                    prefattribute="value"/>  <!-- we may wish to change this to data
                                                  when we support fancy formatted local filenames -->
       </hbox>