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

Evergreen Git git at git.evergreen-ils.org
Tue Aug 29 18:12:49 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  4bea26e2721cd0cb52f2a4a6f7b570e98a83b720 (commit)
      from  4b462fb7dd61713d69c89d3b02c4ad77217b441d (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 4bea26e2721cd0cb52f2a4a6f7b570e98a83b720
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Thu Aug 24 17:17:11 2017 -0400

    LP#1710512 - OPAC js strings need to be i18n-izable
    
    Adds a way to translate displayed string messages, in OPAC
    JS source code alerts and other outputs. This is done by having
    js.tt2 include i18n-strings.tt2 which contains an explosed/global
    JS blob variable called eg_opac_i18n. This is intended to work
    in similar fashion as base_js.tt2 in the webstaff ng client.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    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/opac/i18n_strings.tt2 b/Open-ILS/src/templates/opac/i18n_strings.tt2
new file mode 100644
index 0000000..d92c2b5
--- /dev/null
+++ b/Open-ILS/src/templates/opac/i18n_strings.tt2
@@ -0,0 +1,9 @@
+<!--
+This file allows us to bring TT2 i18n'ized strings
+to js source files, via js blob.
+-->
+<script>
+    var eg_opac_i18n = {};
+
+    eg_opac_i18n.EG_MISSING_REQUIRED_INPUT = "[% l('Please fill out all required fields') %]";
+</script>
diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index e581b07..d4c588f 100644
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -1,6 +1,6 @@
 <!-- JS imports, etc.  -->
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/simple.js[% ctx.cache_key %]"></script>
-
+[% INCLUDE "opac/i18n_strings.tt2" %]
 <!-- DOB validation for Patron Registration in OPAC -->
 <script type="text/javascript">
     function dobValidate(input) {
diff --git a/Open-ILS/web/js/ui/default/opac/holds-validation.js b/Open-ILS/web/js/ui/default/opac/holds-validation.js
index 842366c..ef3c4cd 100644
--- a/Open-ILS/web/js/ui/default/opac/holds-validation.js
+++ b/Open-ILS/web/js/ui/default/opac/holds-validation.js
@@ -66,7 +66,7 @@ function validateHoldForm() {
     {
         return true;
     } else {
-        alert ("Please complete hold notification method info.");
+        alert(eg_opac_i18n.EG_MISSING_REQUIRED_INPUT);
         res.culpritNames.forEach(function(n){
             document.getElementsByName(n)[0].style.backgroundColor  = "yellow";
         });

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

Summary of changes:
 Open-ILS/src/templates/opac/i18n_strings.tt2       |    9 +++++++++
 Open-ILS/src/templates/opac/parts/js.tt2           |    2 +-
 .../web/js/ui/default/opac/holds-validation.js     |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/templates/opac/i18n_strings.tt2


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list