From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Thu, 13 Oct 2011 05:33:39 +0000 (+0200)
Subject: Bug 6904: Changes 'asked' to 'pending' in suggestions for more consistency
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=087bb15e7003cb1f5e271b5b88c1abb99f33c89c;p=koha.git

Bug 6904: Changes 'asked' to 'pending' in suggestions for more consistency

In some places the suggestions were 'pending' in others the same status
was named 'pending'. This patch changes the status to 'pending' in all
places on the suggestion page to make it more consistent.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 9a9f3320cc..47ee96ac43 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -130,8 +130,8 @@ $(document).ready(function() { calcNewsuggTotal(); });
     <fieldset class="rows"> <legend>Suggestion management</legend>
        <ol>
             [% IF ( suggestionid ) %]<li><label for="status">Status:</label><select id="STATUS" name="STATUS"><option value="">No Status</option>
-                [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Asked</option> 
-                [% ELSE %]<option value="ASKED">Asked</option>[% END %]
+                [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Pending</option> 
+                [% ELSE %]<option value="ASKED">Pending</option>[% END %]
                 [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
                 [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
                 [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
@@ -268,7 +268,7 @@ $(document).ready(function() { calcNewsuggTotal(); });
                     [% suggestions_loo.budget_name %]
                 </td>
                 <td>
-                    [% IF ( suggestions_loo.ASKED ) %]Asked[% END %] [% IF ( suggestions_loo.ACCEPTED ) %]Accepted[% END %] [% IF ( suggestions_loo.ORDERED ) %]Ordered[% END %] [% IF ( suggestions_loo.REJECTED ) %]Rejected[% END %] [% IF ( suggestions_loo.CHECKED ) %]Checked[% END %] [% IF ( suggestions_loo.reason ) %]<br />([% suggestions_loo.reason %])[% END %]
+                    [% IF ( suggestions_loo.ASKED ) %]Pending[% END %] [% IF ( suggestions_loo.ACCEPTED ) %]Accepted[% END %] [% IF ( suggestions_loo.ORDERED ) %]Ordered[% END %] [% IF ( suggestions_loo.REJECTED ) %]Rejected[% END %] [% IF ( suggestions_loo.CHECKED ) %]Checked[% END %] [% IF ( suggestions_loo.reason ) %]<br />([% suggestions_loo.reason %])[% END %]
                 </td>
         </tr>
         [% END %]</tbody>
@@ -277,8 +277,8 @@ $(document).ready(function() { calcNewsuggTotal(); });
         <div id="status[% suggestion.suggestiontype %]">
 	<label for="STATUS[% suggestion.suggestiontype %]">Mark selected as: </label><select name="STATUS" id="STATUS[% suggestion.suggestiontype %]">
 	<option value=""> -- Choose a status --</option>
-    [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Asked</option> 
-    [% ELSE %]<option value="ASKED">Asked</option>[% END %]
+    [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Pending</option> 
+    [% ELSE %]<option value="ASKED">Pending</option>[% END %]
     [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
     [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
     [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>
@@ -338,8 +338,8 @@ $(document).ready(function() { calcNewsuggTotal(); });
 				 <fieldset class="brief"><h4 class="collapse"><a href="#">Suggestion information</a></h4>
                     <ol>
                       <li><label for="status"> Status:</label><select name="STATUS" id="STATUS"><option value="">Any</option>
-                        [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Asked</option> 
-                        [% ELSE %]<option value="ASKED">Asked</option>[% END %]
+                        [% IF (statusselected_ASKED ) %]<option value="ASKED" selected="selected">Pending</option> 
+                        [% ELSE %]<option value="ASKED">Pending</option>[% END %]
                         [% IF (statusselected_ACCEPTED ) %]<option value="ACCEPTED" selected="selected">Accepted</option>
                         [% ELSE %]<option value="ACCEPTED">Accepted</option>[% END %]
                         [% IF (statusselected_CHECKED ) %]<option value="CHECKED" selected="selected">Checked</option>