[dw-free] Cumulative layout credits

[fu]

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

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

Reword current theme desc to give credit for theme

Patch by ninetydegrees.

Files modified:

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

--------------------------------------------------------------------------------
diff -r c0ded4f99a65 -r 0d2275ad794b bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Tue Jul 12 21:07:37 2011 +0800
+++ b/bin/upgrading/en.dat	Tue Jul 12 21:16:02 2011 +0800
@@ -4319,7 +4319,9 @@
 
 widget.createaccountupgrade.title=Upgrade Your Account
 
-widget.currenttheme.desc=[[layout]] by [[designer]]
+widget.currenttheme.desc2=for [[style]]
+
+widget.currenttheme.designer=by [[designer]]
 
 widget.currenttheme.options=More options:
 
@@ -4335,7 +4337,7 @@
 
 widget.currenttheme.options.newtheme=Select a different theme
 
-widget.currenttheme.specialdesc=<a [[aopts]]><em>Special</em></a> by [[designer]]
+widget.currenttheme.specialdesc2=<a [[aopts]]><em>Special</em></a>
 
 widget.currenttheme.title=[[user]]'s Current Theme
 
diff -r c0ded4f99a65 -r 0d2275ad794b cgi-bin/LJ/Widget/CurrentTheme.pm
--- a/cgi-bin/LJ/Widget/CurrentTheme.pm	Tue Jul 12 21:07:37 2011 +0800
+++ b/cgi-bin/LJ/Widget/CurrentTheme.pm	Tue Jul 12 21:16:02 2011 +0800
@@ -54,13 +54,14 @@
     $ret .= "<p class='theme-current-desc'>";
     if ($designer) {
         my $designer_link = "<a href='$LJ::SITEROOT/customize/$getextra${getsep}designer=" . LJ::eurl($designer) . "$showarg' class='theme-current-designer'>$designer</a>";
+        $ret .= $class->ml('widget.currenttheme.designer', {'designer' => $designer_link});
         if (LJ::Hooks::run_hook("layer_is_special", $theme->uniq)) {
-            $ret .= $class->ml('widget.currenttheme.specialdesc', {'aopts' => $special_link_opts, 'designer' => $designer_link});
+            $ret .= " " . $class->ml('widget.currenttheme.specialdesc2', {'aopts' => $special_link_opts});
         } else {
-            $ret .= $class->ml('widget.currenttheme.desc', {'layout' => $layout_link, 'designer' => $designer_link});
+            $ret .= " " . $class->ml('widget.currenttheme.desc2', {'style' => $layout_link});
         }
     } elsif ($layout_name) {
-        $ret .= $layout_link;
+        $ret .= $class->ml('widget.currenttheme.desc2', {'style' => $layout_link});
     }
     $ret .= "</p>";
 
--------------------------------------------------------------------------------