diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-08-25 15:06:19 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-08-25 15:06:19 -0700 |
| commit | cbfeb5f6b7490f78361318ce6290bfb442dbfcbe (patch) | |
| tree | e6409692bc2376649eeda94344f0a7f578a75428 /rt/share/html/Widgets/Form | |
| parent | 8ffd7de981603a189cd0ea62ca948eaf3f66ca49 (diff) | |
| parent | 5b5eb87bf66f1fac003a13dc2db48e8970c5c986 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/share/html/Widgets/Form')
| -rw-r--r-- | rt/share/html/Widgets/Form/Boolean | 2 | ||||
| -rw-r--r-- | rt/share/html/Widgets/Form/Integer | 2 | ||||
| -rw-r--r-- | rt/share/html/Widgets/Form/Select | 6 | ||||
| -rw-r--r-- | rt/share/html/Widgets/Form/String | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/rt/share/html/Widgets/Form/Boolean b/rt/share/html/Widgets/Form/Boolean index aade98e88..f9bca095e 100644 --- a/rt/share/html/Widgets/Form/Boolean +++ b/rt/share/html/Widgets/Form/Boolean @@ -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) diff --git a/rt/share/html/Widgets/Form/Integer b/rt/share/html/Widgets/Form/Integer index 7fc75e06f..cd7d50de9 100644 --- a/rt/share/html/Widgets/Form/Integer +++ b/rt/share/html/Widgets/Form/Integer @@ -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) diff --git a/rt/share/html/Widgets/Form/Select b/rt/share/html/Widgets/Form/Select index d08cea9ea..e3be527f6 100644 --- 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 ); } diff --git a/rt/share/html/Widgets/Form/String b/rt/share/html/Widgets/Form/String index ce60231f2..4f9409718 100644 --- a/rt/share/html/Widgets/Form/String +++ b/rt/share/html/Widgets/Form/String @@ -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) |