Commit 657ea464 authored by Max Kanat-Alexander's avatar Max Kanat-Alexander

Bug 581448: Localize the status and resolution values in the list of

possible duplicates on enter_bug.cgi r=LpSolit, a=LpSolit
parent a128f843
......@@ -76,11 +76,13 @@ YAHOO.bugzilla.dupTable = {
},
formatStatus: function(el, oRecord, oColumn, oData) {
var resolution = oRecord.getData('resolution');
var bug_status = display_value('bug_status', oData);
if (resolution) {
el.innerHTML = oData + ' ' + resolution;
el.innerHTML = bug_status + ' '
+ display_value('resolution', resolution);
}
else {
el.innerHTML = oData;
el.innerHTML = bug_status;
}
},
formatCcButton: function(el, oRecord, oColumn, oData) {
......
......@@ -119,3 +119,11 @@ function set_language( value ) {
});
window.location.reload()
}
// This basically duplicates Bugzilla::Util::display_value for code that
// can't go through the template and has to be in JS.
function display_value(field, value) {
var translated = BUGZILLA.value_descs[field][value];
if (translated) return translated;
return value;
}
......@@ -64,6 +64,13 @@
datatable => ['json', 'connection', 'datasource', 'element'],
} %]
[%# When using certain YUI modules, we need to process certain
# extra JS templates.
#%]
[% SET yui_templates = {
datatable => ['global/value-descs.js.tmpl'],
} %]
[%# These are JS URLs that are *always* on the page and come before
# every other JS URL.
#%]
......@@ -198,6 +205,12 @@
'You must select a Version for this [% terms.bug %].'
}
};
[% FOREACH yui_name = yui %]
[% FOREACH yui_template = yui_templates.$yui_name %]
[% PROCESS $yui_template %]
[% END %]
[% END %]
[% IF javascript %]
[% javascript %]
[% END %]
......
[%# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is the Bugzilla Bug Tracking System.
#
# The Initial Developer of the Original Code is Everything Solved, Inc.
# Portions created by the Initial Developer are Copyright (C) 2010
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Max Kanat-Alexander <mkanat@bugzilla.org>
#%]
[% PROCESS "global/field-descs.none.tmpl" %]
BUGZILLA.value_descs = {
[% FOREACH vd_field = value_descs.keys %]
[% vd_field FILTER js %]: {
[% FOREACH vd_value = value_descs.${vd_field}.keys %]
'[% vd_value FILTER js %]':
'[% value_descs.${vd_field}.${vd_value} FILTER js %]'
[%~ ',' UNLESS loop.last %]
[% END %]
}[% ',' UNLESS loop.last %]
[% END %]
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment