From 534ab2e151a61cb26cb1e4d119c9c3f711806d71 Mon Sep 17 00:00:00 2001 From: dbs Date: Wed, 29 Oct 2008 16:40:09 +0000 Subject: [PATCH] Merge r10970, r10973 from trunk: * Craig Ricciuto's patch (with some modifications) for making the Conify perm_list interface internationalized git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_4@10974 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../web/conify/global/permission/perm_list.html | 44 +++++++++++----------- Open-ILS/web/conify/global/permission/perm_list.js | 14 +++---- Open-ILS/web/js/dojo/openils/conify/nls/pgt.js | 15 ++++++++ Open-ILS/web/opac/locale/en-US/conify.dtd | 8 ++++ build/i18n/Makefile | 3 ++ 5 files changed, 56 insertions(+), 28 deletions(-) create mode 100644 Open-ILS/web/js/dojo/openils/conify/nls/pgt.js diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html index 04659da086..bc07a2e661 100644 --- a/Open-ILS/web/conify/global/permission/perm_list.html +++ b/Open-ILS/web/conify/global/permission/perm_list.html @@ -12,9 +12,14 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. --> + +]> - Conify :: Global :: Permission :: Permission List + &conify.perm_list.permission_list.title;