From 2a6074cb99cad0a40ca4a47b697f694223045e07 Mon Sep 17 00:00:00 2001 From: miker Date: Thu, 17 Apr 2008 19:21:56 +0000 Subject: [PATCH] move locale parsing out to a separate javascript file; translations of group names and descriptions git-svn-id: svn://svn.open-ils.org/ILS/trunk@9374 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../web/conify/global/actor/org_unit.html | 9 +-------- .../conify/global/actor/org_unit_type.html | 10 +--------- Open-ILS/web/conify/global/admin.js | 6 ++++++ .../conify/global/permission/grp_tree.html | 20 ++++++++++++------- .../web/conify/global/permission/grp_tree.js | 1 + 5 files changed, 22 insertions(+), 24 deletions(-) create mode 100644 Open-ILS/web/conify/global/admin.js diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html index 1264bd5e60..4c796559b8 100644 --- a/Open-ILS/web/conify/global/actor/org_unit.html +++ b/Open-ILS/web/conify/global/actor/org_unit.html @@ -51,14 +51,7 @@ - + diff --git a/Open-ILS/web/conify/global/actor/org_unit_type.html b/Open-ILS/web/conify/global/actor/org_unit_type.html index fce1551316..1c7e88bcf6 100644 --- a/Open-ILS/web/conify/global/actor/org_unit_type.html +++ b/Open-ILS/web/conify/global/actor/org_unit_type.html @@ -51,15 +51,7 @@ - - + diff --git a/Open-ILS/web/conify/global/admin.js b/Open-ILS/web/conify/global/admin.js new file mode 100644 index 0000000000..e3b4ae2be9 --- /dev/null +++ b/Open-ILS/web/conify/global/admin.js @@ -0,0 +1,6 @@ +var djConfig = { parseOnLoad : true }; + +var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").toLowerCase().replace(/-/,'_'); +if (_url_locale) djConfig.locale = _url_locale; +else djConfig.locale = ''; + diff --git a/Open-ILS/web/conify/global/permission/grp_tree.html b/Open-ILS/web/conify/global/permission/grp_tree.html index f8ea5ca092..723a6c93e9 100644 --- a/Open-ILS/web/conify/global/permission/grp_tree.html +++ b/Open-ILS/web/conify/global/permission/grp_tree.html @@ -64,7 +64,8 @@ - + + @@ -190,6 +191,7 @@ right_pane_toggler.show(); current_group = item; + window.current_fm_group = new pgt().fromStoreItem(item); perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 }; perm_map_model.refresh(); @@ -267,17 +269,21 @@ } + Description - + + + + diff --git a/Open-ILS/web/conify/global/permission/grp_tree.js b/Open-ILS/web/conify/global/permission/grp_tree.js index 05d3dbd34b..151a3431ff 100644 --- a/Open-ILS/web/conify/global/permission/grp_tree.js +++ b/Open-ILS/web/conify/global/permission/grp_tree.js @@ -16,6 +16,7 @@ */ dojo.require('fieldmapper.dojoData'); +dojo.require('openils.I18N'); dojo.require('dojo.parser'); dojo.require('dojo.data.ItemFileWriteStore'); dojo.require('dojo.date.stamp'); -- 2.43.2