Bug 564433: Localized values are not displayed in the "Field only appears when" field...

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 4c95a169087bf72788dd258904b116b153662439..528b88b2d10d32a167ad69dc02b09419e2287fc4 100644 (file)
--- 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 4c1bbbeb0a878ef7b031d96bdb241df0f52367b8..755c3642c568877c0c007357d8f43dd5e8ecb00a 100644 (file)
--- 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>