[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 769198bfb2935a90df96e81febc0392c30e9df58
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, rel_2_12 has been updated
via 769198bfb2935a90df96e81febc0392c30e9df58 (commit)
via a53539602a68cedcbf55578868e13cba8805ec63 (commit)
from 60babbe6d9bea564d5653f7136e658d8717695ba (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 769198bfb2935a90df96e81febc0392c30e9df58
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Aug 29 18:28:03 2017 -0400
update POT for TPAC
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/build/i18n/po/tpac/tpac.pot b/build/i18n/po/tpac/tpac.pot
index 8189da5..dc8978a 100644
--- a/build/i18n/po/tpac/tpac.pot
+++ b/build/i18n/po/tpac/tpac.pot
@@ -69,9 +69,9 @@ msgstr ""
msgid "%1 %2"
msgstr ""
-#. (title, hold.hold.part.label)
#. (copy.label, copy_org.name)
#. (title, part.label)
+#. (title, hold.hold.part.label)
#: ../../Open-ILS/src/templates/opac/myopac/holds.tt2:188 ../../Open-ILS/src/templates/opac/myopac/holds/edit.tt2:27 ../../Open-ILS/src/templates/opac/myopac/lists.tt2:360 ../../Open-ILS/src/templates/opac/parts/anon_list.tt2:65 ../../Open-ILS/src/templates/opac/parts/place_hold_result.tt2:37
msgid "%1 (%2)"
msgstr ""
@@ -91,9 +91,9 @@ msgstr ""
msgid "%1 OpenSearch"
msgstr ""
-#. (attrs.copy_counts.$depth.available, attrs.copy_counts.$depth.count, ou_name)
-#. (attrs.plib_copy_counts.$depth.available, attrs.plib_copy_counts.$depth.count, ou_name)
#. (ou_avail, ou_count, ou_name)
+#. (attrs.plib_copy_counts.$depth.available, attrs.plib_copy_counts.$depth.count, ou_name)
+#. (attrs.copy_counts.$depth.available, attrs.copy_counts.$depth.count, ou_name)
#: ../../Open-ILS/src/templates/opac/parts/record/copy_counts.tt2:22 ../../Open-ILS/src/templates/opac/parts/record/copy_counts.tt2:40 ../../Open-ILS/src/templates/opac/parts/result/copy_counts.tt2:14 ../../Open-ILS/src/templates/opac/parts/result/copy_counts.tt2:33
msgid "%1 of %quant(%2,copy,copies) available at %3."
msgstr ""
@@ -3097,6 +3097,10 @@ msgstr ""
msgid "Please enter your user name or barcode to identify your library account and request a password reset"
msgstr ""
+#: ../../Open-ILS/src/templates/opac/i18n_strings.tt2:8
+msgid "Please fill out all required fields"
+msgstr ""
+
#: ../../Open-ILS/src/templates/opac/parts/login/form.tt2:25
msgid "Please include leading zeros."
msgstr ""
@@ -4700,7 +4704,7 @@ msgstr ""
msgid "You either have no fines to pay or you have selected fines whose total is non-positive. We cannot process non-positive amounts."
msgstr ""
-#: ../../Open-ILS/src/templates/opac/parts/js.tt2:10
+#: ../../Open-ILS/src/templates/opac/parts/js.tt2:11
msgid "You have entered an invalid date, or an improperly formatted date. Please enter Date of Birth in YYYY-MM-DD or YYYY/MM/DD format and try again."
msgstr ""
commit a53539602a68cedcbf55578868e13cba8805ec63
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>
Conflicts:
Open-ILS/src/templates/opac/parts/js.tt2
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 2e878c7..5b0540d 100644
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -1,6 +1,7 @@
<!-- JS imports, etc. -->
<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/simple.js"></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 | 1 +
.../web/js/ui/default/opac/holds-validation.js | 2 +-
build/i18n/po/tpac/tpac.pot | 12 ++++++++----
4 files changed, 19 insertions(+), 5 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