From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Thu, 29 Jun 2017 21:09:54 +0000 (-0400)
Subject: webstaff: introduce egI18N
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4ff647c2bca626f453f7c5937ebd691a9733c152;p=working%2FEvergreen.git

webstaff: introduce egI18N

egI18N is a module that will serve as a grab-bag of functions
related to I18N and L10N. The initial function it provides
takes a acpl IDL object and returns a formatted name qualified
by the org unit, with the underlying template accessible
to the translation subsystem.

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index cde8b27ff8..b93c74d6a0 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -61,6 +61,7 @@ UpUp.start({
     '[% ctx.media_prefix %]/js/ui/default/staff/services/op_change.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/services/lovefield.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/services/file.js',
+    '[% ctx.media_prefix %]/js/ui/default/staff/services/i18n.js',
     '[% ctx.media_prefix %]/js/ui/default/staff/offline.js',
     '[% ctx.base_path %]/staff/share/t_alert_dialog',
     '[% ctx.base_path %]/staff/share/t_confirm_dialog',
@@ -120,6 +121,7 @@ UpUp.start({
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/user.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/navbar.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/ui.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/services/i18n.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/date.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/op_change.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/services/lovefield.js"></script>
@@ -178,6 +180,7 @@ UpUp.start({
     s.ITEM_NOT_FOUND = "[% l('Item not found') %]";
     s.CONFIRM_CLEAR_PENDING = "[% l('Clear pending transactions') %]";
     s.CONFIRM_CLEAR_PENDING_BODY = "[% l('Are you certain you want to clear these pending offline transactions? This action is irreversible. Transactions cannot be recovered after clearing!') %]";
+    s.LOCATION_NAME_OU_QUALIFIED = "[% l('{{location_name}} ({{owning_lib_shortname}})') %]"
   }]);
 </script>
 
diff --git a/Open-ILS/web/js/ui/default/staff/services/coresvc.js b/Open-ILS/web/js/ui/default/staff/services/coresvc.js
index f75477047a..c1218cc80a 100644
--- a/Open-ILS/web/js/ui/default/staff/services/coresvc.js
+++ b/Open-ILS/web/js/ui/default/staff/services/coresvc.js
@@ -10,10 +10,10 @@ angular.module('egCoreMod')
 .factory('egCore', 
        ['egIDL','egNet','egEnv','egOrg','egPCRUD','egEvent','egAuth',
         'egPerm','egHatch','egPrint','egStartup','egStrings','egAudio',
-        'egDate',
+        'egDate','egI18N',
 function(egIDL , egNet , egEnv , egOrg , egPCRUD , egEvent , egAuth ,
          egPerm , egHatch , egPrint , egStartup , egStrings , egAudio , 
-         egDate) {
+         egDate , egI18N) {
 
     return {
         idl     : egIDL,
@@ -29,7 +29,8 @@ function(egIDL , egNet , egEnv , egOrg , egPCRUD , egEvent , egAuth ,
         startup : egStartup,
         strings : egStrings,
         audio   : egAudio,
-        date    : egDate
+        date    : egDate,
+        i18n    : egI18N
     };
 
 }]);
diff --git a/Open-ILS/web/js/ui/default/staff/services/i18n.js b/Open-ILS/web/js/ui/default/staff/services/i18n.js
new file mode 100644
index 0000000000..2c521d0630
--- /dev/null
+++ b/Open-ILS/web/js/ui/default/staff/services/i18n.js
@@ -0,0 +1,22 @@
+/**
+ * egI18N : service for I18N and L10N functions
+ *
+ * This is a grab-bag of stuff related to I18N.
+ *
+ */
+
+angular.module('egCoreMod')
+.factory('egI18N', ['egStrings',
+            function(egStrings) {
+    return {
+        ou_qualified_location_name : function(loc) {
+            return egStrings.$replace(
+                egStrings.LOCATION_NAME_OU_QUALIFIED,
+                {
+                    location_name : loc.name(),
+                    owning_lib_shortname : loc.owning_lib().shortname()
+                }
+            );
+        }        
+    }
+}]);