diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2015-03-15 13:50:28 +0100 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2015-03-15 13:50:28 +0100 |
| commit | 2ccf81dec1fbe4e215ea47700a4e006420318621 (patch) | |
| tree | 128e4d699b1018d629caf000b164a3b7f843af46 /template | |
| parent | 1d96fa1689470945545ac8e0f239357185e832a7 (diff) | |
| download | bugzilla-2ccf81dec1fbe4e215ea47700a4e006420318621.tar.gz bugzilla-2ccf81dec1fbe4e215ea47700a4e006420318621.tar.xz | |
Bug 902395: Enforce utf8 = true for all installations and remove the utf8 parameter
r=dkl a=sgreen
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/admin/params/general.html.tmpl | 11 | ||||
| -rw-r--r-- | template/en/default/bug/show.xml.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/config.rdf.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 5 | ||||
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/list/list.atom.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/list/list.rdf.tmpl | 2 |
7 files changed, 5 insertions, 22 deletions
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index 6ebef8ea2..016a5d1bd 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -16,17 +16,6 @@ "The email address of the person who maintains this installation " _ " of Bugzilla.", - utf8 => - "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New" - _ " installations should set this to true to avoid character encoding" - _ " problems. <strong>Existing databases should set this to true" - _ " only after the data has been converted from existing legacy" - _ " character encodings to UTF-8, using the <kbd>contrib/recode.pl</kbd>" - _ " script</strong>." - _ " <p>Note that if you turn this parameter from "off" to" - _ " "on", you must re-run <kbd>checksetup.pl</kbd> immediately" - _ " afterward.</p>", - shutdownhtml => "If this field is non-empty, then Bugzilla will be completely" _ " disabled and this text will be displayed instead of all the" diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl index 1d376f874..10ec0a3c1 100644 --- a/template/en/default/bug/show.xml.tmpl +++ b/template/en/default/bug/show.xml.tmpl @@ -8,7 +8,7 @@ [% PROCESS bug/time.html.tmpl %] [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] -<?xml version="1.0" [% IF Param('utf8') %]encoding="UTF-8" [% END %]standalone="yes" ?> +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <!DOCTYPE bugzilla [% IF cgi.param('dtd') %][[% PROCESS pages/bugzilla.dtd.tmpl %]][% ELSE %]SYSTEM "[% urlbase FILTER xml %]page.cgi?id=bugzilla.dtd"[% END %]> <bugzilla version="[% constants.BUGZILLA_VERSION %]" diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl index 0d183cf56..c1b5b0575 100644 --- a/template/en/default/config.rdf.tmpl +++ b/template/en/default/config.rdf.tmpl @@ -10,7 +10,7 @@ # So we cache it here for better performance. %] [% escaped_urlbase = BLOCK %][% urlbase FILTER xml %][% END %] -<?xml version="1.0"[% IF Param('utf8') %] encoding="UTF-8"[% END %]?> +<?xml version="1.0" encoding="UTF-8"?> <!-- Note: this interface is experimental and under development. - We may and probably will make breaking changes to it in the future. --> diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 5b3cd03f3..f63b175ec 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -103,10 +103,7 @@ <head> [% Hook.process("start") %] <title>[% title %]</title> - - [% IF Param('utf8') %] - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - [% END %] + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> [% IF NOT no_yui %] [% SET yui = yui_resolve_deps(yui, yui_deps) %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 3a8aa1ada..a7b7e19ba 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -543,9 +543,6 @@ [% IF param_changed.size > 0 %] [% FOREACH param = param_changed %] Changed <em>[% param FILTER html %]</em><br> - [% IF param == 'utf8' && Param('utf8') %] - <strong>You must now re-run <kbd>checksetup.pl</kbd>.</strong><br> - [% END %] [% END %] [% ELSE %] No changes made. diff --git a/template/en/default/list/list.atom.tmpl b/template/en/default/list/list.atom.tmpl index fddbbd7a3..921977e8c 100644 --- a/template/en/default/list/list.atom.tmpl +++ b/template/en/default/list/list.atom.tmpl @@ -8,7 +8,7 @@ [% DEFAULT title = "$terms.Bugzilla $terms.Bugs" %] -<?xml version="1.0"[% IF Param('utf8') %] encoding="UTF-8"[% END %]?> +<?xml version="1.0" encoding="UTF-8"?> <feed xmlns="http://www.w3.org/2005/Atom"> <title>[% title FILTER xml %]</title> <link rel="alternate" type="text/html" diff --git a/template/en/default/list/list.rdf.tmpl b/template/en/default/list/list.rdf.tmpl index 1ee216a1e..a64b0bd46 100644 --- a/template/en/default/list/list.rdf.tmpl +++ b/template/en/default/list/list.rdf.tmpl @@ -6,7 +6,7 @@ # defined by the Mozilla Public License, v. 2.0. #%] -<?xml version="1.0"[% IF Param('utf8') %] encoding="UTF-8"[% END %]?> +<?xml version="1.0" encoding="UTF-8"?> <!-- [% template_version %] --> <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |