[Rt-commit] r18031 - in rt/3.999/branches/merge_to_3.8.2: share/html/Widgets/Form

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Jan 29 08:34:48 2009
New Revision: 18031

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Widgets/Form/Select

Log:
 r19255 at sunnavys-mb:  sunnavy | 2009-01-29 20:20:14 +0800
 merged share/html/Widgets/Form/Select


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Widgets/Form/Select
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Widgets/Form/Select	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Widgets/Form/Select	Thu Jan 29 08:34:48 2009
@@ -71,7 +71,7 @@
 
 $default            => 1,
 @default_value       => (),
-$default_label       => _('Use system default (%1)', join ', ', (@default_value||'')),
+$default_label       => undef
 
 $alternative      => 0,
 $alternative_label => _('other...'),
@@ -89,7 +89,7 @@
 % foreach my $v( @values ) {
 % my $selected = '';
 % $selected = 'selected="selected"' if delete $current_value{ $v };
-<option value="<% $v %>" <% $selected |n %>><% $values_label{ $v } || $v %></option>
+<option value="<% $v %>" <% $selected |n %>><% _($values_label{ $v } || $v) %></option>
 % }
 
 % if ( $alternative ) {
@@ -116,6 +116,9 @@
         @values = keys %values_label;
     }
 }
+unless (defined $default_label ) {
+    $default_label = _('Use system default (%1)', join ', ', map{ _($values_label{$_} || $_) } @default_value);
+}
 </%INIT>
 </%METHOD>