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

Evergreen Git git at git.evergreen-ils.org
Tue Feb 18 02:58:40 EST 2014


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  796ed67e12b1aa5cb88a8519e2e8228fbfa2726c (commit)
      from  a380379e291f1b0d42f15a1875c172fd2dc6892f (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 796ed67e12b1aa5cb88a8519e2e8228fbfa2726c
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Tue May 28 10:45:02 2013 +0300

    LP#1184885 ACQ: i18n for search abbreviations
    
    Allow translating the Acq Search dropdown class name abbreviations.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Jeff Godin <jgodin at tadl.org>

diff --git a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
index c7e0bd3..1126774 100644
--- a/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
+++ b/Open-ILS/web/js/dojo/openils/acq/nls/acq.js
@@ -93,5 +93,11 @@
     "INVOICE_COPY_COUNT_INFO": "Copies received on this invoice: ${0} out of ${1}.",
     "INVOICE_IDENT_COLLIDE": "There is already an invoice in the system with the given combination of 'Vendor Invoice ID' and 'Provider,' which is not allowed.",
     "NEW_INVOICE": "New Invoice",
+    "ACQ_SEARCH_CLASS_ABBR_jub": "LI",
+    "ACQ_SEARCH_CLASS_ABBR_acqpl": "SL",
+    "ACQ_SEARCH_CLASS_ABBR_acqpo": "PO",
+    "ACQ_SEARCH_CLASS_ABBR_acqinv": "I",
+    "ACQ_SEARCH_CLASS_ABBR_acqlid": "LID",
+    "ACQ_SEARCH_CLASS_ABBR_acqlia": "LIA",
     "NO_LI_GENERAL" : "You have not selected any (suitable) line items."
 }
diff --git a/Open-ILS/web/js/ui/default/acq/search/unified.js b/Open-ILS/web/js/ui/default/acq/search/unified.js
index 926662f..3aa07c0 100644
--- a/Open-ILS/web/js/ui/default/acq/search/unified.js
+++ b/Open-ILS/web/js/ui/default/acq/search/unified.js
@@ -87,7 +87,9 @@ function TermSelectorFactory(terms) {
 
     /* Create abbreviations for class names to make field categories
      * more readable in field selector control. */
-    this._abbreviate = function(s) {
+    this._abbreviate = function(t, s) {
+	var ca = "ACQ_SEARCH_CLASS_ABBR_" + t;
+	if (localeStrings[ca]) return localeStrings[ca];
         var last, result;
         for (var i = 0; i < s.length; i++) {
             if (s[i] != " ") {
@@ -226,7 +228,7 @@ function TermSelectorFactory(terms) {
         var optgroup = dojo.create(
             "optgroup", {"value": "", "label": this.terms[hint].__label}
         );
-        var prefix = this._abbreviate(this.terms[hint].__label);
+        var prefix = this._abbreviate(hint, this.terms[hint].__label);
 
         for (var field in this.terms[hint]) {
             if (!/^__/.test(field)) {

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

Summary of changes:
 Open-ILS/web/js/dojo/openils/acq/nls/acq.js      |    6 ++++++
 Open-ILS/web/js/ui/default/acq/search/unified.js |    6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list