[dw-free] refactor icon browser and related code

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/715c854b23de]

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

English-stripping: make icon-browser text translatable.

Patch by kareila.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/LJ/Widget/UserpicSelector.pm

--------------------------------------------------------------------------------
diff -r d95c01c7c3a2 -r 715c854b23de bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Tue Jul 27 18:37:25 2010 -0700
+++ b/bin/upgrading/en.dat	Tue Jul 27 18:49:48 2010 -0700
@@ -1157,7 +1157,11 @@ entryform.userpic=Userpic:
 
 entryform.userpic.choose=Choose userpic
 
+entryform.userpic.default=Choose default userpic
+
 entryform.userpic.random=Choose random icon
+
+entryform.userpic.upload=Upload a userpic
 
 entryform.userpics=User Picture Icon:
 
diff -r d95c01c7c3a2 -r 715c854b23de cgi-bin/LJ/Widget/UserpicSelector.pm
--- a/cgi-bin/LJ/Widget/UserpicSelector.pm	Tue Jul 27 18:37:25 2010 -0700
+++ b/cgi-bin/LJ/Widget/UserpicSelector.pm	Tue Jul 27 18:49:48 2010 -0700
@@ -45,6 +45,9 @@ sub render_body {
            } ) unless $opts->{no_auth};
 
     my $has_icons = $res && ref $res->{pickws} eq 'ARRAY' && scalar @{ $res->{pickws} } > 0;
+
+    my $userpic_msg_default = LJ::Lang::ml( 'entryform.userpic.default' );
+    my $userpic_msg_upload  = LJ::Lang::ml( 'entryform.userpic.upload' );
     my $defpic = LJ::Lang::ml( 'entryform.opt.defpic' );
     my $onload = $opts->{onload};
 
@@ -83,8 +86,8 @@ sub render_body {
                             \$('userpic').style.display = 'block';
                         }
                         var userpic_msg;
-                        if (userpics[0] == "") { userpic_msg = 'Choose default userpic' }
-                        if (userpics.length == 0) { userpic_msg = 'Upload a userpic' }
+                        if (userpics[0] == "") { userpic_msg = '$userpic_msg_default' }
+                        if (userpics.length == 0) { userpic_msg = '$userpic_msg_upload' }
 
                         if (userpic_select && userpics[userpic_select.selectedIndex] != "") {
                             \$('userpic_preview').className = '';
@@ -195,7 +198,7 @@ sub render_body {
     } elsif ( !$u || $opts->{altlogin} )  {
         $$pic .= "<div id='userpic'><p id='userpic_preview'><img src='/img/nouserpic.png' alt='selected userpic' id='userpic_preview_image' class='userpic_loggedout'  /></p></div>";
     } else {
-        $$pic .= "<div id='userpic'><p id='userpic_preview' class='userpic_preview_border'><a href='$LJ::SITEROOT/editicons'>Upload a userpic</a></p></div>";
+        $$pic .= "<div id='userpic'><p id='userpic_preview' class='userpic_preview_border'><a href='$LJ::SITEROOT/editicons'>$userpic_msg_upload</a></p></div>";
     }
 
     if ( $has_icons ) {
--------------------------------------------------------------------------------