summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorMax Kanat-Alexander <mkanat@bugzilla.org>2011-03-02 09:41:16 +0100
committerMax Kanat-Alexander <mkanat@bugzilla.org>2011-03-02 09:41:16 +0100
commite81b9d51399792035e10c2cd6d1b32f75879c3ec (patch)
treef96af118014c417b5d0c026df5b689957e29bbf1 /template/en/default
parent7d90eaa8770c0b29567b78b89d81334211fa2482 (diff)
downloadbugzilla-e81b9d51399792035e10c2cd6d1b32f75879c3ec.tar.gz
bugzilla-e81b9d51399792035e10c2cd6d1b32f75879c3ec.tar.xz
Bug 624414: BUGZILLA.value_descs was always empty in the JS, and display_value
wasn't translating values. r=glob, a=mkanat
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/global/field-descs.none.tmpl22
-rw-r--r--template/en/default/global/header.html.tmpl2
-rw-r--r--template/en/default/global/value-descs.js.tmpl2
-rw-r--r--template/en/default/global/value-descs.none.tmpl36
4 files changed, 41 insertions, 21 deletions
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index e85ebbee1..479944ff9 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -62,25 +62,9 @@
} %]
[% IF in_template_var %]
-
- [%# You can use this hash to localize (translate) the values displayed
- # for drop-down and multiple-select fields. Lines starting with "#"
- # are comments.
- #%]
- [% value_descs = {
- "bug_status" => {
- # "UNCONFIRMED" => "UNCO",
- # "CONFIRMED" => "ITSABUG",
- },
-
- "resolution" => {
- "" => "---",
- # "FIXED" => "NO LONGER AN ISSUE",
- # "WORKSFORME" => "NOTMYPROBLEM!",
- },
- } %]
-
- [% vars.terms = terms %]
+ [% PROCESS "global/value-descs.none.tmpl" %]
+ [% SET vars.value_descs = value_descs %]
+ [% SET vars.terms = terms %]
[%# field_descs is loaded as a global template variable and cached
# across all templates--see VARIABLES in Bugzilla/Template.pm.
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index df5786abf..2da2d642d 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -212,7 +212,7 @@
[% FOREACH yui_name = yui %]
[% FOREACH yui_template = yui_templates.$yui_name %]
- [% PROCESS $yui_template %]
+ [% INCLUDE $yui_template %]
[% END %]
[% END %]
[% IF javascript %]
diff --git a/template/en/default/global/value-descs.js.tmpl b/template/en/default/global/value-descs.js.tmpl
index d432cf135..20d023b42 100644
--- a/template/en/default/global/value-descs.js.tmpl
+++ b/template/en/default/global/value-descs.js.tmpl
@@ -18,7 +18,7 @@
# Max Kanat-Alexander <mkanat@bugzilla.org>
#%]
-[% PROCESS "global/field-descs.none.tmpl" %]
+[% PROCESS "global/value-descs.none.tmpl" %]
BUGZILLA.value_descs = {
[% FOREACH vd_field = value_descs.keys %]
diff --git a/template/en/default/global/value-descs.none.tmpl b/template/en/default/global/value-descs.none.tmpl
new file mode 100644
index 000000000..56c90ac35
--- /dev/null
+++ b/template/en/default/global/value-descs.none.tmpl
@@ -0,0 +1,36 @@
+[%# 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 BugzillaSource, Inc.
+ # Portions created by the Initial Developer are Copyright (C) 2011
+ # the Initial Developer. All Rights Reserved.
+ #
+ # Contributor(s):
+ # Max Kanat-Alexander <mkanat@bugzilla.org>
+ #%]
+
+[%# You can use this hash to localize (translate) the values displayed
+ # for drop-down and multiple-select fields. Lines starting with "#"
+ # are comments.
+ #%]
+[% value_descs = {
+ "bug_status" => {
+ # "UNCONFIRMED" => "UNCO",
+ # "CONFIRMED" => "ITSABUG",
+ },
+
+ "resolution" => {
+ "" => "---",
+ # "FIXED" => "NO LONGER AN ISSUE",
+ # "WORKSFORME" => "NOTMYPROBLEM!",
+ },
+} %]