| Thread Previous • Date Previous • Date Next • Thread Next |
Merge authors: Jan Henrik Øverland (janhenrik-overland) ------------------------------------------------------------ revno: 16543 [merge] committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx> branch nick: dhis2 timestamp: Wed 2014-08-27 16:04:10 +0200 message: Moved properties parser to dhis2 util. removed: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js modified: dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js -- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-08-27 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-08-27 14:03:18 +0000
@@ -7111,54 +7111,47 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
+ // i18n
Ext.Ajax.request({
- url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
+ url: 'i18n/' + init.keyUiLocale + '.properties',
success: function(r) {
- var parseProperties = Ext.decode(r.responseText).parseProperties;
-
- // i18n
- Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
- success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
- failure();
- },
- callback: fn
- });
- }
- else {
- fn();
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
failure();
- }
- }
- });
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-08-27 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-08-27 14:03:18 +0000
@@ -6747,54 +6747,47 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
+ // i18n
Ext.Ajax.request({
- url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
+ url: 'i18n/' + init.keyUiLocale + '.properties',
success: function(r) {
- var parseProperties = Ext.decode(r.responseText).parseProperties;
-
- // i18n
- Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
- success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
- failure();
- },
- callback: fn
- });
- }
- else {
- fn();
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
failure();
- }
- }
- });
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-08-27 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-08-27 14:03:18 +0000
@@ -9178,54 +9178,47 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
+ // i18n
Ext.Ajax.request({
- url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
+ url: 'i18n/' + init.keyUiLocale + '.properties',
success: function(r) {
- var parseProperties = Ext.decode(r.responseText).parseProperties;
-
- // i18n
- Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
- success: function(r) {
- GIS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(GIS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- GIS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
- failure();
- },
- callback: fn
- });
- }
- else {
- fn();
+ GIS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(GIS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ GIS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
failure();
- }
- }
- });
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-08-27 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-08-27 14:03:18 +0000
@@ -6199,54 +6199,47 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
+ // i18n
Ext.Ajax.request({
- url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
+ url: 'i18n/' + init.keyUiLocale + '.properties',
success: function(r) {
- var parseProperties = Ext.decode(r.responseText).parseProperties;
-
- // i18n
- Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
- success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
- failure();
- },
- callback: fn
- });
- }
- else {
- fn();
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
failure();
- }
- }
- });
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-08-27 13:10:38 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-08-27 14:03:18 +0000
@@ -6092,54 +6092,47 @@
var defaultKeyUiLocale = 'en';
init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
+ // i18n
Ext.Ajax.request({
- url: init.contextPath + '/dhis-web-commons/javascripts/javaProperties.js',
+ url: 'i18n/' + init.keyUiLocale + '.properties',
success: function(r) {
- var parseProperties = Ext.decode(r.responseText).parseProperties;
-
- // i18n
- Ext.Ajax.request({
- url: 'i18n/' + init.keyUiLocale + '.properties',
- success: function(r) {
- NS.i18n = parseProperties(r.responseText);
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
- success: function(r) {
- Ext.applyIf(NS.i18n, parseProperties(r.responseText));
- },
- callback: fn
- })
- }
- else {
- fn();
- }
- },
- failure: function() {
- var failure = function() {
- alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (init.keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + init.keyUiLocale + ').');
- NS.i18n = parseProperties(r.responseText);
- },
- failure: function() {
- failure();
- },
- callback: fn
- });
- }
- else {
- fn();
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ success: function(r) {
+ Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ callback: fn
+ })
+ }
+ else {
+ fn();
+ }
+ },
+ failure: function() {
+ var failure = function() {
+ alert('No translations found for system locale (' + init.keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ };
+
+ if (init.keyUiLocale !== defaultKeyUiLocale) {
+ Ext.Ajax.request({
+ url: 'i18n/' + defaultKeyUiLocale + '.json',
+ success: function(r) {
+ console.log('No translations found for system locale (' + init.keyUiLocale + ').');
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
failure();
- }
- }
- });
+ },
+ callback: fn
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2014-08-19 11:45:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2014-08-27 14:03:18 +0000
@@ -60,6 +60,28 @@
};
/**
+ * Convert a Java properties file into a javascript object.
+ */
+dhis2.util.parseJavaProperties = function( javaProperties ) {
+ var obj = {}, lines;
+
+ if (typeof javaProperties !== 'string') {
+ return obj;
+ }
+
+ lines = javaProperties.split(/\n/);
+
+ for (var i = 0, a; i < lines.length; i++) {
+ if (!!(typeof lines[i] === 'string' && lines[i].length && lines[i].indexOf('=') !== -1)) {
+ a = lines[i].split('=');
+ obj[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
+ }
+ }
+
+ return obj;
+};
+
+/**
* jQuery cannot correctly filter strings with () in them, so here is a fix
* until jQuery gets updated.
*/
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js 2014-08-27 12:44:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/javaProperties.js 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-{
- parseProperties: function(responseText) {
- var i18n = {}, rows;
-
- if (typeof responseText !== 'string') {
- return i18n;
- }
-
- rows = responseText.split(/\n/);
-
- for (var i = 0, a; i < rows.length; i++) {
- if (!!(typeof rows[i] === 'string' && rows[i].length && rows[i].indexOf('=') !== -1)) {
- a = rows[i].split('=');
- i18n[a[0].trim()] = eval('"' + a[1].trim().replace(/"/g, '\'') + '"');
- }
- }
-
- return i18n;
- }
-}
| Thread Previous • Date Previous • Date Next • Thread Next |
