[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. 62890d3546a26da3d790375e02f2cae8093aa5a9

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_3 has been updated
       via  62890d3546a26da3d790375e02f2cae8093aa5a9 (commit)
      from  1e2ab548d358bdf9304e9f9faa653b18ef30c3a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 62890d3546a26da3d790375e02f2cae8093aa5a9
Author: Jane Sandberg <sandbej at linnbenton.edu>
Date:   Fri May 18 19:41:12 2018 -0700

    LP1742523: Allow two strings in the mark damaged popup to be translated
    
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 b/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2
index 7506217532..467fa13f32 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2
@@ -44,10 +44,10 @@
 <div class="modal-footer">
   <div class="btn-group pull-left" ng-if="circ && billArgs.charge != null">
     <label class="btn btn-primary" ng-model="mode" btn-radio="'charge'"
-      ng-class="{active: mode == 'charge'}" ng-click="btnChargeFees()">Charge Fees</label>
+      ng-class="{active: mode == 'charge'}" ng-click="btnChargeFees()">[% l('Charge Fees') %]</label>
     <label class="btn btn-primary" ng-model="mode" btn-radio="'waive'"
-      ng-class="{active: mode == 'waive'}" ng-click="btnWaiveFees()">No Charge</label>
+      ng-class="{active: mode == 'waive'}" ng-click="btnWaiveFees()">[% l('No Charge') %]</label>
   </div>
   <button class="btn btn-primary" ng-disabled="applyFine == 'apply' && circ && (billArgs.charge == null || !billArgs.type)" ng-click="ok()">[% l('Submit') %]</button>
   <button class="btn btn-warning" ng-if="!billArgs.charge && applyFine != 'noapply'" ng-click="cancel()">[% l('Cancel') %]</button>
-</div>
\ No newline at end of file
+</div>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS