[dw-free] English-strip /manage/profile

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/0f4b9258ed8b]

http://bugs.dwscoalition.org/show_bug.cgi?id=380

Remove 'LiveJournal' from user messaging.

Patch by denise.

Files modified:

• htdocs/manage/profile/index.bml
• htdocs/manage/profile/index.bml.text

--------------------------------------------------------------------------------
diff -r 3429653dc27e -r 0f4b9258ed8b htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml	Sat Mar 07 07:19:03 2009 +0000
+++ b/htdocs/manage/profile/index.bml	Sat Mar 07 07:20:45 2009 +0000
@@ -342,8 +342,8 @@ body<=
         my $cur = $u->opt_whatemailshow;
         my @vals = ( ($LJ::USER_EMAIL && LJ::get_cap($u, "useremail"))
                      ? ("A" => BML::ml(".email.opt.prime"),
-                        "L" => BML::ml(".email.opt.lj"),
-                        "B" => BML::ml(".email.opt.both"),
+                        "L" => BML::ml(".email.opt.site", { sitenameshort => $LJ::SITENAMESHORT } ),
+                        "B" => BML::ml(".email.opt.both", { sitenameshort => $LJ::SITENAMESHORT } ),
                         "N" => BML::ml(".email.opt.dont"))
                      : ("A" => BML::ml(".email.opt.show"),
                         "N" => BML::ml(".email.opt.no_show")));
@@ -364,7 +364,7 @@ body<=
 
         # opt_usermsg
         unless ($LJ::DISABLED{'user_messaging'}) {
-            $ret .= "<tr><td class='field_name'>LJ User Messaging</td><td>";
+            $ret .= "<tr><td class='field_name'>" . BML::ml('.section.usermessaging', { siteabbrev => $LJ::SITENAMEABBREV } ) ."</td><td>";
             $ret .= LJ::Setting::UserMessaging->as_html($u);
             $ret .= "</td></tr>\n";
         }
diff -r 3429653dc27e -r 0f4b9258ed8b htdocs/manage/profile/index.bml.text
--- a/htdocs/manage/profile/index.bml.text	Sat Mar 07 07:19:03 2009 +0000
+++ b/htdocs/manage/profile/index.bml.text	Sat Mar 07 07:20:45 2009 +0000
@@ -27,11 +27,11 @@
 
 .email.change=Change email
 
-.email.opt.both=Both (primary email + LiveJournal email)
+.email.opt.both=Both (primary email + [[sitenameshort]] email)
 
 .email.opt.dont=Don't display my email address
 
-.email.opt.lj=LiveJournal email only
+.email.opt.site=[[sitenameshort]] email only
 
 .email.opt.no_show=Don't show email address
 
@@ -195,6 +195,8 @@
 
 .section.location=Location
 
+.section.usermessaging=[[siteabbrev]] User Messaging
+
 .section.textmsg=Text Messaging
 
 .section.theme=Community Theme
--------------------------------------------------------------------------------