From: dbs Date: Wed, 29 Oct 2008 17:21:54 +0000 (+0000) Subject: As Craig Ricciuto noted, perm_list maps to the ppl class hint X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=64fe0b729e87d3911d8ea13d10b390213b5c8948;p=Evergreen.git As Craig Ricciuto noted, perm_list maps to the ppl class hint git-svn-id: svn://svn.open-ils.org/ILS/trunk@10976 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/conify/global/permission/perm_list.html b/Open-ILS/web/conify/global/permission/perm_list.html index bc07a2e661..71d043e3fc 100644 --- a/Open-ILS/web/conify/global/permission/perm_list.html +++ b/Open-ILS/web/conify/global/permission/perm_list.html @@ -78,7 +78,7 @@ method : 'open-ils.permacrud.search.ppl.atomic', timeout : 10, params : [ ses, { id : { "!=" : null } }, { order_by : { ppl : 'code' } } ], - onerror : function (r) { status_update(pgt_strings.ERROR_FETCHING_PERMS) }, + onerror : function (r) { status_update(ppl_strings.ERROR_FETCHING_PERMS) }, oncomplete : function (r) { window._perm_list = r.recv().content(); @@ -94,11 +94,11 @@ window.perm_grid_layout = [ { cells : [ [ - { name : pgt_strings.LABEL_CODE, field : "code", width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" }, - { name : pgt_strings.LABEL_DESCRIPTION, field : "description", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" } + { name : ppl_strings.LABEL_CODE, field : "code", width : "300px", editor : dojox.grid.editors.Dijit, rowSpan : "2" }, + { name : ppl_strings.LABEL_DESCRIPTION, field : "description", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" } ], [ - { name : pgt_strings.LABEL_TRANSLATION, + { name : ppl_strings.LABEL_TRANSLATION, width : "10em", height : "2em", get : function (row) { @@ -134,7 +134,7 @@ }); if (dirtyStore.length > 0) { - var confirmation = confirm(pgt_strings.CONFIRM_EXIT); + var confirmation = confirm(ppl_strings.CONFIRM_EXIT); if (confirmation) { for (var i in window.dirtyStore) { @@ -171,7 +171,7 @@ params : [ ses, new_fm_obj ], onerror : function (r) { highlighter.red.play(); - status_update( pgt_strings.ERROR_CALLING_METHOD ); + status_update( ppl_strings.ERROR_CALLING_METHOD ); err = true; }, oncomplete : function (r) { @@ -179,12 +179,12 @@ if ( res && res.content() ) { var new_item_hash = res.content().toHash(); perm_store.newItem( new_item_hash ); - status_update( dojo.string.substitute(pgt_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) ); + status_update( dojo.string.substitute(ppl_strings.SUCCESS_CREATING_PERMISSION, [new_item_hash.code]) ); perm_grid.model.sort(-1); highlighter.green.play(); } else { highlighter.red.play(); - status_update( pgt_strings.ERROR_CREATING_PERMISSION ); + status_update( ppl_strings.ERROR_CREATING_PERMISSION ); err = true; } } @@ -225,7 +225,7 @@ for (var i in selected_items) { current_perm = selected_items[i]; - if ( confirm( dojo.string.substitute(pgt_strings.CONFIRM_DELETE, [perm_store.getValue(current_perm, 'code')]) ) ) { + if ( confirm( dojo.string.substitute(ppl_strings.CONFIRM_DELETE, [perm_store.getValue(current_perm, 'code')]) ) ) { perm_store.setValue( current_perm, 'isdeleted', 1 ); @@ -238,7 +238,7 @@ params : [ ses, modified_ppl ], onerror : function (r) { highlighter.red.play(); - status_update( dojo.string.substitute(pgt_strings.ERROR_DELETING, [perm_store.getValue( current_perm, 'code' )]) ); + status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [perm_store.getValue( current_perm, 'code' )]) ); }, oncomplete : function (r) { var res = r.recv(); @@ -255,10 +255,10 @@ current_perm = null; highlighter.green.play(); - status_update( dojo.string.substitute(pgt_strings.STATUS_DELETED, [old_name]) ); + status_update( dojo.string.substitute(ppl_strings.STATUS_DELETED, [old_name]) ); } else { highlighter.red.play(); - status_update( dojo.string.substitute(pgt_strings.ERROR_DELETING, [old_name]) ); + status_update( dojo.string.substitute(ppl_strings.ERROR_DELETING, [old_name]) ); } } }).send(); diff --git a/Open-ILS/web/conify/global/permission/perm_list.js b/Open-ILS/web/conify/global/permission/perm_list.js index 2b0ecc3bda..bfe983f38e 100644 --- a/Open-ILS/web/conify/global/permission/perm_list.js +++ b/Open-ILS/web/conify/global/permission/perm_list.js @@ -29,7 +29,7 @@ dojo.require('dijit.layout.BorderContainer'); dojo.require('dojox.widget.Toaster'); dojo.require('dojox.fx'); dojo.require('dojox.grid.Grid'); -dojo.requireLocalization("openils.config", "pgt"); +dojo.requireLocalization("openils.config", "ppl"); // some handy globals var cgi = new CGI(); @@ -37,7 +37,7 @@ var cookieManager = new HTTP.Cookies(); var ses = cookieManager.read('ses') || cgi.param('ses'); var pCRUD = new OpenSRF.ClientSession('open-ils.permacrud'); -var pgt_strings = dojo.i18n.getLocalization('openils.conify', 'pgt'); +var ppl_strings = dojo.i18n.getLocalization('openils.conify', 'ppl'); var current_perm; var virgin_out_id = -1; @@ -61,17 +61,17 @@ function save_perm () { params : [ ses, modified_ppl ], onerror : function (r) { highlighter.red.play(); - status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) ); + status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) ); }, oncomplete : function (r) { var res = r.recv(); if ( res && res.content() ) { perm_store.setValue( current_perm, 'ischanged', 0 ); highlighter.green.play(); - status_update( dojo.string.substitute(pgt_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) ); + status_update( dojo.string.substitute(ppl_strings.SUCCESS_SAVE, [perm_store.getValue(current_perm, 'code')]) ); } else { highlighter.red.play(); - status_update( dojo.string.substitute(pgt_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) ); + status_update( dojo.string.substitute(ppl_strings.ERROR_SAVING_DATA, [perm_store.getValue(current_perm, 'code')]) ); } }, }).send(); @@ -89,7 +89,7 @@ function save_them_all (event) { if (event && dirtyStore.length > 0) { - confirmation = confirm( pgt_strings.CONFIRM_EXIT ); + confirmation = confirm( ppl_strings.CONFIRM_EXIT ); } if (confirmation) { diff --git a/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js b/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js deleted file mode 100644 index 0cbdf133dd..0000000000 --- a/Open-ILS/web/js/dojo/openils/conify/nls/pgt.js +++ /dev/null @@ -1,15 +0,0 @@ -({ - "CONFIRM_DELETE": "Are you sure you want to delete ${0}?", - "CONFIRM_EXIT": "There are unsaved modified Permissions! OK to save these changes, Cancel to abandon them.", - "ERROR_CALLING_METHOD": "Problem calling method to create new Permission", - "ERROR_CREATING_PERMISSION": "Problem creating new Permission", - "ERROR_DELETING": "Problem deleting ${0}", - "ERROR_FETCHING_PERMS": "Problem fetching perms", - "ERROR_SAVING_DATA": "Problem saving data for ${0}", - "LABEL_CODE": "Code", - "LABEL_DESCRIPTION": "Description", - "LABEL_TRANSLATION": "Translation", - "STATUS_DELETED": "${0} deleted", - "SUCCESS_CREATING_PERMISSION": "New ${0} permission created", - "SUCCESS_SAVE": "Saved changes to ${0}" -}) diff --git a/Open-ILS/web/js/dojo/openils/conify/nls/ppl.js b/Open-ILS/web/js/dojo/openils/conify/nls/ppl.js new file mode 100644 index 0000000000..0cbdf133dd --- /dev/null +++ b/Open-ILS/web/js/dojo/openils/conify/nls/ppl.js @@ -0,0 +1,15 @@ +({ + "CONFIRM_DELETE": "Are you sure you want to delete ${0}?", + "CONFIRM_EXIT": "There are unsaved modified Permissions! OK to save these changes, Cancel to abandon them.", + "ERROR_CALLING_METHOD": "Problem calling method to create new Permission", + "ERROR_CREATING_PERMISSION": "Problem creating new Permission", + "ERROR_DELETING": "Problem deleting ${0}", + "ERROR_FETCHING_PERMS": "Problem fetching perms", + "ERROR_SAVING_DATA": "Problem saving data for ${0}", + "LABEL_CODE": "Code", + "LABEL_DESCRIPTION": "Description", + "LABEL_TRANSLATION": "Translation", + "STATUS_DELETED": "${0} deleted", + "SUCCESS_CREATING_PERMISSION": "New ${0} permission created", + "SUCCESS_SAVE": "Saved changes to ${0}" +})