From 2f52dd3d089e985468b2dd3c8d6b9dce3c235f86 Mon Sep 17 00:00:00 2001 From: Gervase Markham Date: Tue, 1 Nov 2011 17:25:28 +0000 Subject: Fix missing-space bugs in error messages. a=LpSolit. https://bugzilla.mozilla.org/show_bug.cgi?id=698737 --- template/en/default/global/code-error.html.tmpl | 8 ++++---- template/en/default/global/messages.html.tmpl | 2 +- template/en/default/global/user-error.html.tmpl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 03b58e435..ed3bcce02 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -126,7 +126,7 @@ [% ELSIF error == "db_rename_conflict" %] Name conflict: Cannot rename [% old FILTER html %] to - [% new FILTER html %] because [% new FILTER html %] already exists. + [%+ new FILTER html %] because [% new FILTER html %] already exists. [% ELSIF error == "cookies_need_value" %] Every cookie must have a value. @@ -206,7 +206,7 @@ [% ELSIF error == "invalid_attach_id_to_obsolete" %] The attachment number of one of the attachments you wanted to obsolete, - [% attach_id FILTER html %], is invalid. + [%+ attach_id FILTER html %], is invalid. [% ELSIF error == "invalid_customfield_type" %] [% title = "Invalid Field Type" %] @@ -248,7 +248,7 @@ Attachment [% attach_id FILTER html %] ([% description FILTER html %]) is attached to [% terms.bug %] [%+ attach_bug_id FILTER html %], but you tried to flag it as obsolete while creating a new attachment to - [% terms.bug %] [%+ my_bug_id FILTER html %]. + [%+ terms.bug %] [%+ my_bug_id FILTER html %]. [% ELSIF error == "feature_disabled" %] The [% install_string("feature_$feature") FILTER html %] feature is not @@ -335,7 +335,7 @@ [% ELSIF error == "mail_send_error" %] There was an error sending mail from '[% mail.header('From') FILTER html %]' to '[% mail.header('To') FILTER html %]': - [% msg FILTER html %] + [%+ msg FILTER html %] [% ELSIF error == "missing_bug_id" %] No [% terms.bug %] ID was given. diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index f75bc4eb9..a550273db 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -710,7 +710,7 @@ [% ELSIF message_tag == "install_fk_invalid" %] ERROR: There are invalid values for the [% column FILTER html %] column in the [% table FILTER html %] table. (These values do not exist in the [% foreign_table FILTER html %] table, in the - [% foreign_column FILTER html %] column.) + [%+ foreign_column FILTER html %] column.) Before continuing with checksetup, you will need to fix these values, either by deleting these rows from the database, or changing the values diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 6918ea39e..fc290eb53 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -591,7 +591,7 @@ [% ELSIF error == "fieldvalue_still_has_bugs" %] [% title = "You Cannot Delete This Field Value" %] You cannot delete the value '[% value.name FILTER html %]' from the - [% field.description FILTER html %] field, because there are still + [%+ field.description FILTER html %] field, because there are still [%+ value.bug_count FILTER html %] [%+ terms.bugs %] using it. [% ELSIF error == "fieldvalue_undefined" %] -- cgit v1.2.3-24-g4f1b