From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 5 Jul 2010 22:15:12 +0000 (+0200)
Subject: Bug 564433: Localized values are not displayed in the "Field only appears when" field... 
X-Git-Tag: bugzilla-3.7.2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97fc35368cde9f7d5bd98c91ef4fa9d29786bc34;p=thirdparty%2Fbugzilla.git

Bug 564433: Localized values are not displayed in the "Field only appears when" field when editing custom fields
r/a=mkanat
---

diff --git a/template/en/default/admin/custom_fields/cf-js.js.tmpl b/template/en/default/admin/custom_fields/cf-js.js.tmpl
index 4c95a16908..528b88b2d1 100644
--- a/template/en/default/admin/custom_fields/cf-js.js.tmpl
+++ b/template/en/default/admin/custom_fields/cf-js.js.tmpl
@@ -31,9 +31,10 @@ var select_values = new Array();
     [%# Prefix components with the name of their product so that admins
         know which component we're talking about. #%]
     [% IF sel_field.name == 'component' %]
-      [% SET value_name = legal_value.product.name _ ': ' _ legal_value.name %]
+      [% SET value_name = display_value('product', legal_value.product.name) _ ': '
+                          _ display_value(sel_field.name, legal_value.name) %]
     [% ELSE %]
-      [% SET value_name = legal_value.name %]
+      [% SET value_name = display_value(sel_field.name, legal_value.name) %]
     [% END %]
     [[% legal_value.id FILTER js %], '[% value_name FILTER js %]'][% ',' UNLESS loop.last %]
   [% END %]
diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl
index 4c1bbbeb0a..755c3642c5 100644
--- a/template/en/default/admin/custom_fields/edit.html.tmpl
+++ b/template/en/default/admin/custom_fields/edit.html.tmpl
@@ -125,9 +125,9 @@
              [% ' selected="selected"' 
                 IF field.visibility_value.id == value.id %]>
               [% IF field.visibility_field.name == 'component' %]
-                [% value.product.name FILTER html %]:
+                [% display_value('product', value.product.name) FILTER html %]:
               [% END %]
-              [%+ value.name FILTER html %]
+              [%+ display_value(field.visibility_field.name, value.name) FILTER html %]
             </option>
           [% END %]   
         </select>