Commit 681cd783 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com

Bug 330989: illegal_change_deps error uses "empowered" inconsistently with…

Bug 330989: illegal_change_deps error uses "empowered" inconsistently with "allowed" (+ some other minor changes) - Patch by Mike Durthaler <mdurthaler@sbcglobal.net> r=timeless a=LpSolit
parent c9406294
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
<code>[% name FILTER html %] <code>[% name FILTER html %]
[% IF status == "X" %][% old_status FILTER html %][% END %]</code>. [% IF status == "X" %][% old_status FILTER html %][% END %]</code>.
Only a sufficiently empowered user can make this change. Only a user with the required permissions may make this change.
[% ELSIF error == "format_not_found" %] [% ELSIF error == "format_not_found" %]
[% title = "Format Not Found" %] [% title = "Format Not Found" %]
...@@ -710,14 +710,14 @@ ...@@ -710,14 +710,14 @@
[% IF privs < 2 %] or reporter [% END %] [% IF privs < 2 %] or reporter [% END %]
of the [% terms.bug %], or of the [% terms.bug %], or
[% END %] [% END %]
a sufficiently empowered user may change that field. a user with the required permissions may change that field.
[% ELSIF error == "illegal_change_deps" %] [% ELSIF error == "illegal_change_deps" %]
[% title = "Not allowed" %] [% title = "Not allowed" %]
You tried to change the You tried to change the
<strong>[% field_descs.$field FILTER html %]</strong> field <strong>[% field_descs.$field FILTER html %]</strong> field
but only a user empowered to edit but only a user allowed to edit
both involved [% terms.bugs %] may change that field. both related [% terms.bugs %] may change that field.
[% ELSIF error == "illegal_changed_in_last_x_days" %] [% ELSIF error == "illegal_changed_in_last_x_days" %]
[% title = "Your Search Makes No Sense" %] [% title = "Your Search Makes No Sense" %]
...@@ -951,7 +951,7 @@ ...@@ -951,7 +951,7 @@
[% ELSIF error == "milestone_required" %] [% ELSIF error == "milestone_required" %]
[% title = "Milestone Required" %] [% title = "Milestone Required" %]
You must determine a target milestone for [% terms.bug %] You must select a target milestone for [% terms.bug %]
[%+ bug.id FILTER html %] [%+ bug.id FILTER html %]
if you are going to accept it. Part of accepting if you are going to accept it. Part of accepting
[%+ terms.abug %] is giving an estimate of when it will be fixed. [%+ terms.abug %] is giving an estimate of when it will be fixed.
...@@ -1303,9 +1303,9 @@ ...@@ -1303,9 +1303,9 @@
You must enter a name for the new product. You must enter a name for the new product.
[% ELSIF error == "product_disabled" %] [% ELSIF error == "product_disabled" %]
[% title = BLOCK %]Product closed for [% terms.Bugs %] Entry[% END %] [% title = BLOCK %]Product closed for [% terms.Bug %] Entry[% END %]
[% admindocslinks = {'products.html' => 'Administering products'} %] [% admindocslinks = {'products.html' => 'Administering products'} %]
Sorry, entering [% terms.bugs %] into the Sorry, entering [% terms.abug %] into the
product <em>[% product.name FILTER html %]</em> has been disabled. product <em>[% product.name FILTER html %]</em> has been disabled.
[% ELSIF error == "product_edit_denied" %] [% ELSIF error == "product_edit_denied" %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment