From bc19204d3dffa448b364bfa4b5691a24f39f6765 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Fri, 4 Dec 2009 14:28:47 +0000 Subject: Bug 452919: Allow the "created an attachment" message in comments to be localized Patch by Max Kanat-Alexander r=LpSolit, a=LpSolit --- template/en/default/bug/format_comment.txt.tmpl | 13 ++++++++----- template/en/default/bug/show.xml.tmpl | 3 +++ template/en/default/global/code-error.html.tmpl | 17 +++++++++++++++++ template/en/default/global/user-error.html.tmpl | 4 +++- 4 files changed, 31 insertions(+), 6 deletions(-) (limited to 'template/en') diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl index 8e97d4d08..49ab95ad1 100644 --- a/template/en/default/bug/format_comment.txt.tmpl +++ b/template/en/default/bug/format_comment.txt.tmpl @@ -32,11 +32,6 @@ [% PROCESS 'global/variables.none.tmpl' %] [% SET comment_body = comment.body %] -[% IF is_bugmail %] - [% comment_body = comment_body.replace( '(Created an attachment \(id=([0-9]+)\))', - '$1' _ "\n" _ ' --> (' _ urlbase - _ 'attachment.cgi?id=$2)' ) %] -[% END %] [% IF comment.type == constants.CMT_DUPE_OF %] X[% comment_body %] @@ -54,6 +49,14 @@ If the move succeeded, [% comment.extra_data %] will receive a mail containing the number of the new [% terms.bug %] in the other database. If all went well, please paste in a link to the new [% terms.bug %]. Otherwise, reopen this [% terms.bug %]. +[% ELSIF comment.type == constants.CMT_ATTACHMENT_CREATED %] +Created attachment [% comment.extra_data %] +[% IF is_bugmail %] + --> [% urlbase _ "attachment.cgi?id=" _ comment.extra_data %] +[% END %] +[%+ comment.attachment.description %] + +[%+ comment.body %] [% ELSE %] X[% comment_body %] [% END %] diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl index 31e56d299..2349602dc 100644 --- a/template/en/default/bug/show.xml.tmpl +++ b/template/en/default/bug/show.xml.tmpl @@ -69,6 +69,9 @@ [% NEXT IF c.is_private && !user.is_insider %] [% c.id FILTER xml %] + [% IF c.is_about_attachment %] + [% c.extra_data FILTER xml %] + [% END %] [% c.author.email FILTER email FILTER xml %] [% c.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %] [% IF user.is_timetracker && (c.work_time - 0 != 0) %] diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 09a1c4cf6..e851a00d9 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -120,6 +120,23 @@ without specifying a default or something for $set_nulls_to, because there are NULL values currently in it. + [% ELSIF error == "comment_extra_data_not_allowed" %] + You tried to set the extra_data field to + '[% extra_data FILTER html %]' but comments of type [% type FILTER html %] + do not accept an extra_data argument. + + [% ELSIF error == "comment_extra_data_required" %] + Comments of type [% type FILTER html %] require an extra_data + argument to be set. + + [% ELSIF error == "comment_extra_data_not_numeric" %] + You tried to set the extra_data field to + '[% extra_data FILTER html %]' but comments of type [% type FILTER html %] + require a numeric extra_data argument. + + [% ELSIF error == "comment_type_invalid" %] + '[% type FILTER html %]' is not a valid comment type. + [% ELSIF error == "db_rename_conflict" %] Name conflict: Cannot rename [% old FILTER html %] to [% new FILTER html %] because [% new FILTER html %] already exists. diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 144e2e7ea..c3e84c0ab 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1721,7 +1721,9 @@ [% PROCESS global/footer.html.tmpl %] [% BLOCK object_name %] - [% IF class == "Bugzilla::User" %] + [% IF class == "Bugzilla::Attachment" %] + attachment + [% ELSIF class == "Bugzilla::User" %] user [% ELSIF class == "Bugzilla::Component" %] component -- cgit v1.2.3-24-g4f1b