Fix bug 120870. - Read reply header string from .property file in case the user doesn't specify in pref.r=nhotta, sr=sspitzer, a=asa

mailnews/compose/src/nsMsgCompose.cpp

@@ -144,7 +144,7 @@ static nsresult GetReplyHeaderInfo(PRInt32* reply_header_type,
     if (NS_FAILED(rv) || !*reply_header_locale)
       *reply_header_locale = nsCRT::strdup(NS_LITERAL_STRING("").get());
 
-    rv = prefs->CopyUnicharPref("mailnews.reply_header_authorwrote", reply_header_authorwrote);
+    rv = prefs->GetLocalizedUnicharPref("mailnews.reply_header_authorwrote", reply_header_authorwrote);
     if (NS_FAILED(rv) || !*reply_header_authorwrote)
       *reply_header_authorwrote = nsCRT::strdup(NS_LITERAL_STRING("%s wrote").get());
 
@@ -160,7 +160,7 @@ static nsresult GetReplyHeaderInfo(PRInt32* reply_header_type,
     if (NS_FAILED(rv) || !*reply_header_colon)
       *reply_header_colon = nsCRT::strdup(NS_LITERAL_STRING(":").get());
 
-    rv = prefs->CopyUnicharPref("mailnews.reply_header_originalmessage", reply_header_originalmessage);
+    rv = prefs->GetLocalizedUnicharPref("mailnews.reply_header_originalmessage", reply_header_originalmessage);
     if (NS_FAILED(rv) || !*reply_header_originalmessage)
       *reply_header_originalmessage = nsCRT::strdup(NS_LITERAL_STRING("--- Original Message ---").get());
   }

mailnews/mailnews.js

@@ -156,12 +156,12 @@ pref("mailnews.reply_on_top",               0); // 0=bottom 1=top 2=select+botto
 pref("mailnews.reply_header_type",          1);
 // locale which affects date format, set empty string to use application default locale
 pref("mailnews.reply_header_locale",        "en-US");
-pref("mailnews.reply_header_authorwrote",   "%s wrote");
+pref("mailnews.reply_header_authorwrote",   "chrome://messenger/locale/messengercompose/composeMsgs.properties");
 pref("mailnews.reply_header_ondate",        "On %s");
 // separator to separate between date and author
 pref("mailnews.reply_header_separator",     ", ");
 pref("mailnews.reply_header_colon",         ":");
-pref("mailnews.reply_header_originalmessage",   "--- Original Message ---");
+pref("mailnews.reply_header_originalmessage",   "chrome://messenger/locale/messengercompose/composeMsgs.properties");
 
 pref("mail.purge_threshhold",                100);
 pref("mail.prompt_purge_threshhold",             false);   

modules/libpref/src/init/mailnews.js

@@ -156,12 +156,12 @@ pref("mailnews.reply_on_top",               0); // 0=bottom 1=top 2=select+botto
 pref("mailnews.reply_header_type",          1);
 // locale which affects date format, set empty string to use application default locale
 pref("mailnews.reply_header_locale",        "en-US");
-pref("mailnews.reply_header_authorwrote",   "%s wrote");
+pref("mailnews.reply_header_authorwrote",   "chrome://messenger/locale/messengercompose/composeMsgs.properties");
 pref("mailnews.reply_header_ondate",        "On %s");
 // separator to separate between date and author
 pref("mailnews.reply_header_separator",     ", ");
 pref("mailnews.reply_header_colon",         ":");
-pref("mailnews.reply_header_originalmessage",   "--- Original Message ---");
+pref("mailnews.reply_header_originalmessage",   "chrome://messenger/locale/messengercompose/composeMsgs.properties");
 
 pref("mail.purge_threshhold",                100);
 pref("mail.prompt_purge_threshhold",             false);