[open-ils-commits] [GIT] Evergreen ILS branch master updated. eb2b8f0b7743b38060b6d5eee5c9622223ffebc9

[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, master has been updated
       via  eb2b8f0b7743b38060b6d5eee5c9622223ffebc9 (commit)
       via  501efed0b7140b2d3a5272349ab0fc3ab820b240 (commit)
      from  6aa8c2a0bb78e9bab518e5bfa85333d21890808e (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 eb2b8f0b7743b38060b6d5eee5c9622223ffebc9
Author: Dan Scott <dscott at laurentian.ca>
Date:   Fri Nov 16 16:01:10 2012 -0500

    Make the "user account expired" warning i18n-friendly
    
    The warning message is now capable of being translated, and we're
    formatting of the date consistently with other uses throughout the TPAC.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index c28ea71..dee5662 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -51,10 +51,12 @@
     <div style="width:662px;">
         <div style="float:left;">
             <div style="padding:10px 0px;">
-		[% IF date.format(ctx.user.expire_date, '%s') < date.format(date.now , '%s') %]
-                <span class="alert">Your library card expired on [% date.format(ctx.user.expire_date, '%B %d, %Y') %]. Please contact a librarian to resolve this issue.</span>
-                [% END %]
-	    </div>
+            [%- IF date.format(ctx.user.expire_date, '%s') < date.format(date.now , '%s');
+               fmt_expire_date = date.format(ctx.user.expire_date, DATE_FORMAT);
+            %]
+            <span class="alert">[% l("Your library card expired on [_1]. Please contact a librarian to resolve this issue.", fmt_expire_date) %]</span>
+            [% END %]
+            </div>
             <div class="acct_sum_row">
                 <table width="100%" cellspacing="0" cellpadding="0">
                     <tr>

commit 501efed0b7140b2d3a5272349ab0fc3ab820b240
Author: Justin Hopkins <hopkinsju at gmail.com>
Date:   Mon Jul 30 17:25:20 2012 -0500

    Add card expired message to the myopac account summary
    
    The JSPAC included a message to users who had an expired card alerting them to this fact.
    This message is useful and was not writted into the TPAC.
    
    Signed-off-by: Justin Hopkins <hopkinsju at gmail.com>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index 02c1509..c28ea71 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -50,7 +50,11 @@
 
     <div style="width:662px;">
         <div style="float:left;">
-            <div style="padding:10px 0px;"></div>
+            <div style="padding:10px 0px;">
+		[% IF date.format(ctx.user.expire_date, '%s') < date.format(date.now , '%s') %]
+                <span class="alert">Your library card expired on [% date.format(ctx.user.expire_date, '%B %d, %Y') %]. Please contact a librarian to resolve this issue.</span>
+                [% END %]
+	    </div>
             <div class="acct_sum_row">
                 <table width="100%" cellspacing="0" cellpadding="0">
                     <tr>

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

Summary of changes:
 .../src/templates/opac/parts/myopac/main_base.tt2  |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS