diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 5e8d02177b0..e7253e816a6 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -9332 \ No newline at end of file +9333 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index f3eecf1f9b4..657ae8b785c 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -e7526caf7802734ca54ee907e8a2cecf61013b25 \ No newline at end of file +17d05cc7addbf4288c537f8e56c60e7dee24c6d8 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm index 3f3d5f39937..1b6b48205bf 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Template.pm @@ -806,14 +806,6 @@ sub create { return $var; }, - # Prevents line break on hyphens and whitespaces. - no_break => sub { - my ($var) = @_; - $var =~ s/ /\ /g; - $var =~ s/-/\‑/g; - return $var; - }, - xml => \&Bugzilla::Util::xml_quote , # This filter is similar to url_quote but used a \ instead of a % diff --git a/mozilla/webtools/bugzilla/t/004template.t b/mozilla/webtools/bugzilla/t/004template.t index 6e366c0444f..ce45cfec1b3 100644 --- a/mozilla/webtools/bugzilla/t/004template.t +++ b/mozilla/webtools/bugzilla/t/004template.t @@ -71,7 +71,6 @@ foreach my $include_path (@include_paths) { FILTERS => { html_linebreak => sub { return $_; }, - no_break => sub { return $_; } , js => sub { return $_ } , base64 => sub { return $_ } , url_quote => sub { return $_ } , diff --git a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl index f4836ca7d17..b91b4919960 100644 --- a/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/admin/flag-type/list.html.tmpl @@ -109,7 +109,9 @@ [% FOREACH type = types %] - [% type.name FILTER html FILTER no_break %] + + [% type.name FILTER html %] + [% type.description FILTER html %] [% type.sortkey FILTER html %] diff --git a/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl index 2e160eda7c6..97fd2dc9519 100644 --- a/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/attachment/list.html.tmpl @@ -122,7 +122,7 @@ function toggle_display(link) { [% ELSE %] [% flag.setter.nick FILTER html %]: [% END %] - [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + [%+ flag.type.name FILTER html %][% flag.status %] [%+ IF flag.status == "?" && flag.requestee %] [% IF user.id %] ([% flag.requestee.nick FILTER html %]) diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl index 99dd53215b1..8babdf04ac5 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl @@ -263,7 +263,7 @@ [% ELSE %] [% FOREACH flag = attachment.flags %] [% flag.setter.nick FILTER html %]: - [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + [%+ flag.type.name FILTER html %][% flag.status %] [% IF flag.status == "?" && flag.requestee %] ([% flag.requestee.nick FILTER html %]) [% END %][% ", " IF not loop.last() %] @@ -352,7 +352,7 @@ [% FOREACH type = bug.flag_types %] [% FOREACH flag = type.flags %] [% flag.setter.nick FILTER html %]: - [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %] + [%+ flag.type.name FILTER html %][% flag.status %] [%+ IF flag.status == "?" && flag.requestee %] ([% flag.requestee.nick FILTER html %]) [% END %]
diff --git a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl index 7547e5687c5..047fd44259a 100644 --- a/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/flag/list.html.tmpl @@ -80,7 +80,7 @@ [% ELSE %] [% flag.setter.nick FILTER html %]: [% END %] - [%+ type.name FILTER html FILTER no_break %][% flag.status %] + [%+ type.name FILTER html %][% flag.status %] [% IF flag.requestee %] [% IF flag.requestee.name %] ([% flag.requestee.nick FILTER html %]) @@ -107,9 +107,9 @@ [% addl_text FILTER html %] [% END %] - + + [%- type.name FILTER html %] diff --git a/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl index 7349d1ced1f..a1582532ace 100644 --- a/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/global/choose-product.html.tmpl @@ -45,10 +45,10 @@ [% FOREACH p = c.products %] - + - [% p.name FILTER html FILTER no_break %]:  + [% p.name FILTER html %]: [% p.description FILTER html_light %] diff --git a/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl index 97c7f709c7e..5c5bfc31691 100644 --- a/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/global/useful-links.html.tmpl @@ -46,7 +46,7 @@ - [%- q.name FILTER html FILTER no_break %] + [%- q.name FILTER html %] [% END %]