details: https://code.openbravo.com/erp/devel/pi/rev/091ed3ae7404 changeset: 16912:091ed3ae7404 user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Jun 25 16:33:28 2012 +0200 summary: Related to issue 20726: i18n.ftl code refactor
details: https://code.openbravo.com/erp/devel/pi/rev/9d0db21c1a0d changeset: 16913:9d0db21c1a0d user: David Baz Fayos <david.baz <at> openbravo.com> date: Mon Jun 25 16:34:23 2012 +0200 summary: Related to issue 20726: JS code style improvement diffstat: modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl | 89 ++++----- 1 files changed, 44 insertions(+), 45 deletions(-) diffs (106 lines): diff -r 62f97e3bdf5d -r 9d0db21c1a0d modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl Mon Jun 25 14:16:34 2012 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/i18n.ftl Mon Jun 25 16:34:23 2012 +0200 @@ -39,57 +39,56 @@ // then a call to the server is done to request the label. --> OB.I18N.getLabel = function(key, params, object, property) { - if (!OB.I18N.labels[key]) { - if (object && property) { - OB.I18N.getLabelFromServer(key, params, object, property); + if (!OB.I18N.labels[key]) { + if (object && property) { + OB.I18N.getLabelFromServer(key, params, object, property); + } + return 'UNDEFINED ' + key; + } + var label = OB.I18N.labels[key], i; + if (params && params.length && params.length > 0) { + for (i = 0; i < params.length; i++) { + label = label.replace("%" + i, params[i]); } - return 'UNDEFINED ' + key; + } + if (object && property) { + if (Object.prototype.toString.call(object[property]) === '[object Function]') { + object[property](label); + } else { + object[property] = label; } - var label = OB.I18N.labels[key], i; - if (params && params.length && params.length > 0) { - for (i = 0; i < params.length; i++) { - label = label.replace("%" + i, params[i]); - } - } - if (object && property) { - if (Object.prototype.toString.call(object[property]) === '[object Function]') { - object[property](label); - } else { - object[property] = label; - } - } - return label; + } + return label; }; OB.I18N.getLabelFromServer = function(key, params, object, property) { - if (isc) { - var requestParameters = {}; - requestParameters._action = 'org.openbravo.client.kernel.GetLabelActionHandler'; - requestParameters.key = key; + if (!isc) { + return 'UNDEFINED ' + key; + } + var requestParameters = {}; + requestParameters._action = 'org.openbravo.client.kernel.GetLabelActionHandler'; + requestParameters.key = key; - var rpcRequest = {}; - rpcRequest.actionURL = OB.Application.contextUrl + 'org.openbravo.client.kernel'; - rpcRequest.callback = function (response, data, request) { - var clientContext = response.clientContext; - if (data.label) { - OB.I18N.labels[clientContext.key] = data.label; - OB.I18N.getLabel(clientContext.key, clientContext.params, clientContext.object, clientContext.property); - } else { - if (isc.isA.Function(clientContext.object[clientContext.property])) { - clientContext.object[clientContext.property]('LABEL NOT FOUND ' + clientContext.key); - } else { - clientContext.object[clientContext.property] = 'LABEL NOT FOUND ' + clientContext.key; - } - } - }; - rpcRequest.httpMethod = 'GET'; - rpcRequest.contentType = 'application/json;charset=UTF-8'; - rpcRequest.useSimpleHttp = true; - rpcRequest.evalResult = true; - rpcRequest.params = requestParameters; - rpcRequest.clientContext = {'key' : key, 'object': object, 'params': params, 'property': property}; - isc.RPCManager.sendRequest(rpcRequest); + var rpcRequest = {}; + rpcRequest.actionURL = OB.Application.contextUrl + 'org.openbravo.client.kernel'; + rpcRequest.callback = function (response, data, request) { + var clientContext = response.clientContext; + if (data.label) { + OB.I18N.labels[clientContext.key] = data.label; + OB.I18N.getLabel(clientContext.key, clientContext.params, clientContext.object, clientContext.property); } else { - return 'UNDEFINED ' + key; + if (isc.isA.Function(clientContext.object[clientContext.property])) { + clientContext.object[clientContext.property]('LABEL NOT FOUND ' + clientContext.key); + } else { + clientContext.object[clientContext.property] = 'LABEL NOT FOUND ' + clientContext.key; + } } + }; + rpcRequest.httpMethod = 'GET'; + rpcRequest.contentType = 'application/json;charset=UTF-8'; + rpcRequest.useSimpleHttp = true; + rpcRequest.evalResult = true; + rpcRequest.params = requestParameters; + rpcRequest.clientContext = {'key' : key, 'object': object, 'params': params, 'property': property}; + isc.RPCManager.sendRequest(rpcRequest); }; \ No newline at end of file ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
