[dw-free] Images with undefined sizes setting causes a placeholder even when placeholder setting is

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/670a563d0295]

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

The behavior actually makes sense, so update wording to better describe it.

Patch by rb.

Files modified:

• bin/upgrading/en.dat
• cgi-bin/LJ/Setting/ImagePlaceholders.pm

--------------------------------------------------------------------------------
diff -r 6ee1629925ee -r 670a563d0295 bin/upgrading/en.dat
--- a/bin/upgrading/en.dat	Thu Sep 22 12:43:32 2011 +0800
+++ b/bin/upgrading/en.dat	Thu Sep 22 12:46:51 2011 +0800
@@ -2743,7 +2743,7 @@
 
 setting.imageplaceholders.label=Image Placeholders
 
-setting.imageplaceholders.option=Replace images on your Reading Page with a placeholder for
+setting.imageplaceholders.option2=Replace images of known size on your Reading Page with a placeholder for
 
 setting.imageplaceholders.option.select.all=all images
 
@@ -2755,11 +2755,11 @@
 
 setting.imageplaceholders.option.select.none=nothing (display all images)
 
-setting.imageplaceholders.option.undef=Treat images with undefined size as
-
-setting.imageplaceholders.option.undef.large=large images (use placeholder)
-
-setting.imageplaceholders.option.undef.small=small images (display image)
+setting.imageplaceholders.option.undef2=Replace images of unknown size with a placeholder
+
+setting.imageplaceholders.option.undef.always=always
+
+setting.imageplaceholders.option.undef.never=never
 
 setting.interests.desc|notes=There shouldn't be a description unless the page specifies one
 setting.interests.desc=_none
diff -r 6ee1629925ee -r 670a563d0295 cgi-bin/LJ/Setting/ImagePlaceholders.pm
--- a/cgi-bin/LJ/Setting/ImagePlaceholders.pm	Thu Sep 22 12:43:32 2011 +0800
+++ b/cgi-bin/LJ/Setting/ImagePlaceholders.pm	Thu Sep 22 12:46:51 2011 +0800
@@ -63,7 +63,7 @@
         $extra ? ("$maxwidth|$maxheight" => $extra) : ()
     );
 
-    my $ret = "<label for='${key}imgplaceholders'>" . $class->ml('setting.imageplaceholders.option') . "</label> ";
+    my $ret = "<label for='${key}imgplaceholders'>" . $class->ml('setting.imageplaceholders.option2') . "</label> ";
     $ret .= LJ::html_select({
         name => "${key}imgplaceholders",
         id => "${key}imgplaceholders",
@@ -73,11 +73,11 @@
     # Option for undefined-size images. Might want to be magicked into only displaying when placeholders are set for other than all/none
 
     my @optionundef = (
-        0 => $class->ml( 'setting.imageplaceholders.option.undef.small' ),
-        1 => $class->ml( 'setting.imageplaceholders.option.undef.large' )
+        0 => $class->ml( 'setting.imageplaceholders.option.undef.always' ),
+        1 => $class->ml( 'setting.imageplaceholders.option.undef.never' )
     );
 
-    $ret .= "<br /><label for='${key}imgplaceundef'>" . $class->ml( 'setting.imageplaceholders.option.undef' ) . "</label> ";
+    $ret .= "<br /><label for='${key}imgplaceundef'>" . $class->ml( 'setting.imageplaceholders.option.undef2' ) . "</label> ";
     $ret .= LJ::html_select({
         name => "${key}imgplaceundef",
         id => "${key}imgplaceundef",
--------------------------------------------------------------------------------