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

Evergreen Git git at git.evergreen-ils.org
Fri Sep 1 15:37:17 EDT 2017


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  df79b43c6c1985211c77420406bfa45d0bb57b8e (commit)
      from  6e64e975f22feb7594d2b32e63f1c53579e14ab0 (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 df79b43c6c1985211c77420406bfa45d0bb57b8e
Author: Ben Shum <ben at evergreener.net>
Date:   Tue Aug 15 18:43:09 2017 -0400

    LP#1710991: Do not translate username and workstation in webclient navbar
    
    In the web client's navbar, do not translate username and workstation. This
    causes errors with rendering the menus if other locales translate the
    variables.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 748ef4b..0482d99 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -510,7 +510,7 @@
       <li>
         <a ng-cloak ng-show="username" title="{{currentToken()}}"
           ng-init="workstation = '[% l('<no workstation>') %]'">
-            [% l('{{username}} @ {{workstation}}') %]
+            {{username}} @ {{workstation}}
         </a>
       </li>
 

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

Summary of changes:
 Open-ILS/src/templates/staff/navbar.tt2 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list