rt 4.2.14 (#13852)

[freeside.git] / rt / share / html / Widgets / Form / Select

diff --git a/rt/share/html/Widgets/Form/Select b/rt/share/html/Widgets/Form/Select
index d08cea9..e3be527 100644 (file)
--- a/rt/share/html/Widgets/Form/Select
+++ b/rt/share/html/Widgets/Form/Select
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -91,7 +91,7 @@ $Multiple         => 0,
 % foreach my $v( @Values ) {
 % my $selected = '';
 % $selected = 'selected="selected"' if delete $CurrentValue{ $v };
-<option value="<% $v %>" <% $selected |n %>><% loc($ValuesLabel{ $v } || $v) %></option>
+<option value="<% $v %>" <% $selected |n %>><% loc(ref($ValuesLabel{ $v }) ? @{ $ValuesLabel{ $v } } : $ValuesLabel{ $v } || $v) %></option>
 % }
 
 % if ( $Alternative ) {
@@ -120,7 +120,7 @@ if ( $ValuesCallback ) {
 }
 unless (defined $DefaultLabel ) {
     $DefaultLabel = loc('Use system default ([_1])',
-        join ', ', map loc($ValuesLabel{$_} || $_), grep defined,
+        join ', ', map loc(ref($ValuesLabel{$_}) ? @{ $ValuesLabel{$_ }} : $ValuesLabel{$_} || $_), grep defined,
             @DefaultValue
     );
 }