dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33922
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17374: PT DV GIS ER EV i18n files renamed.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 17374 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-11-06 15:20:41 +0100
message:
PT DV GIS ER EV i18n files renamed.
renamed:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/ar.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ar.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/es.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/fr.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_fr.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/id.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_id.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/lo.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_lo.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/my.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_my.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/pt.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/pt_BR.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt_BR.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/ru.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ru.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/tg.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_tg.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/vi.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_vi.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/zh.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_zh.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/ar.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_ar.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/es.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_es.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/fr.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_fr.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/lo.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_lo.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/pt.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_pt.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/ru.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_ru.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/tg.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_tg.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/ar.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_ar.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/es.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_es.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/fr.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_fr.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/id.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_id.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/lo.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_lo.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/my.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_my.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/pt.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_pt.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/pt_BR.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_pt_BR.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/ru.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_ru.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/tg.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_tg.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/vi.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_vi.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/zh.properties => dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_zh.properties
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
--
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
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/i18n_app.properties'
=== 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-11-05 14:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-11-06 13:56:20 +0000
@@ -7376,46 +7376,37 @@
// i18n
requests.push({
- url: 'i18n/' + keyUiLocale + '.properties',
+ url: 'i18n/i18n_app.properties',
success: function(r) {
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- Ext.get('init').update(NS.i18n.initializing + '..');
- if (keyUiLocale !== defaultKeyUiLocale) {
+ if (keyUiLocale === defaultKeyUiLocale) {
+ fn();
+ }
+ else {
Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
success: function(r) {
- Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ Ext.apply(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ failure: function() {
+ console.log('No translations found for system locale (' + keyUiLocale + ')');
},
callback: fn
- })
- }
- else {
- fn();
+ });
}
},
failure: function() {
- var onFailure = function() {
- alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + keyUiLocale + ').');
- NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- },
- failure: function() {
- onFailure();
- },
- callback: fn
- });
- }
- else {
- fn();
- onFailure();
- }
+ Ext.Ajax.request({
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
+ alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ },
+ callback: fn
+ });
}
});
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/i18n_app.properties'
=== 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-11-05 14:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-11-06 13:56:20 +0000
@@ -7000,46 +7000,37 @@
// i18n
requests.push({
- url: 'i18n/' + keyUiLocale + '.properties',
+ url: 'i18n/i18n_app.properties',
success: function(r) {
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- Ext.get('init').update(NS.i18n.initializing + '..');
- if (keyUiLocale !== defaultKeyUiLocale) {
+ if (keyUiLocale === defaultKeyUiLocale) {
+ fn();
+ }
+ else {
Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
success: function(r) {
- Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ Ext.apply(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ failure: function() {
+ console.log('No translations found for system locale (' + keyUiLocale + ')');
},
callback: fn
- })
- }
- else {
- fn();
+ });
}
},
failure: function() {
- var onFailure = function() {
- alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + keyUiLocale + ').');
- NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- },
- failure: function() {
- onFailure();
- },
- callback: fn
- });
- }
- else {
- fn();
- onFailure();
- }
+ Ext.Ajax.request({
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
+ alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ },
+ callback: fn
+ });
}
});
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/ar.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ar.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/es.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_es.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/fr.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_fr.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/id.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_id.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/lo.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_lo.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/my.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_my.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/pt.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/pt_BR.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_pt_BR.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/ru.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_ru.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/tg.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_tg.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/vi.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_vi.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/zh.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app_zh.properties'
=== 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-11-05 14:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-11-06 13:56:20 +0000
@@ -9303,46 +9303,37 @@
// i18n
requests.push({
- url: 'i18n/' + keyUiLocale + '.properties',
+ url: 'i18n/i18n_app.properties',
success: function(r) {
GIS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- Ext.get('init').update(GIS.i18n.initializing + '..');
- if (keyUiLocale !== defaultKeyUiLocale) {
+ if (keyUiLocale === defaultKeyUiLocale) {
+ fn();
+ }
+ else {
Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
success: function(r) {
- Ext.applyIf(GIS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ Ext.apply(GIS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ failure: function() {
+ console.log('No translations found for system locale (' + keyUiLocale + ')');
},
callback: fn
- })
- }
- else {
- fn();
+ });
}
},
failure: function() {
- var onFailure = function() {
- alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + keyUiLocale + ').');
- GIS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- },
- failure: function() {
- onFailure();
- },
- callback: fn
- });
- }
- else {
- fn();
- onFailure();
- }
+ Ext.Ajax.request({
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
+ success: function(r) {
+ GIS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
+ alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ },
+ callback: fn
+ });
}
});
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/ar.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_ar.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/es.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_es.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/fr.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_fr.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/lo.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_lo.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/pt.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_pt.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/ru.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_ru.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/tg.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/i18n_app_tg.properties'
=== 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-11-05 14:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-11-06 13:56:20 +0000
@@ -6248,45 +6248,37 @@
// i18n
requests.push({
- url: 'i18n/' + keyUiLocale + '.properties',
+ url: 'i18n/i18n_app.properties',
success: function(r) {
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- if (keyUiLocale !== defaultKeyUiLocale) {
+ if (keyUiLocale === defaultKeyUiLocale) {
+ fn();
+ }
+ else {
Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
success: function(r) {
- Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ Ext.apply(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ failure: function() {
+ console.log('No translations found for system locale (' + keyUiLocale + ')');
},
callback: fn
- })
- }
- else {
- fn();
+ });
}
},
failure: function() {
- var onFailure = function() {
- alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + keyUiLocale + ').');
- NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- },
- failure: function() {
- onFailure();
- },
- callback: fn
- });
- }
- else {
- fn();
- onFailure();
- }
+ Ext.Ajax.request({
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
+ alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ },
+ callback: fn
+ });
}
});
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/ar.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_ar.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/es.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_es.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/fr.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_fr.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/id.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_id.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/lo.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_lo.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/my.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_my.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/pt.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_pt.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/pt_BR.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_pt_BR.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/ru.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_ru.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/tg.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_tg.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/vi.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_vi.properties'
=== renamed file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/zh.properties' => 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/i18n_app_zh.properties'
=== 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-11-05 14:51:47 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-11-06 13:56:20 +0000
@@ -6188,45 +6188,37 @@
// i18n
requests.push({
- url: 'i18n/' + keyUiLocale + '.properties',
+ url: 'i18n/i18n_app.properties',
success: function(r) {
NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- if (keyUiLocale !== defaultKeyUiLocale) {
+ if (keyUiLocale === defaultKeyUiLocale) {
+ fn();
+ }
+ else {
Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.properties',
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
success: function(r) {
- Ext.applyIf(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ Ext.apply(NS.i18n, dhis2.util.parseJavaProperties(r.responseText));
+ },
+ failure: function() {
+ console.log('No translations found for system locale (' + keyUiLocale + ')');
},
callback: fn
- })
- }
- else {
- fn();
+ });
}
},
failure: function() {
- var onFailure = function() {
- alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
- };
-
- if (keyUiLocale !== defaultKeyUiLocale) {
- Ext.Ajax.request({
- url: 'i18n/' + defaultKeyUiLocale + '.json',
- success: function(r) {
- console.log('No translations found for system locale (' + keyUiLocale + ').');
- NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
- },
- failure: function() {
- onFailure();
- },
- callback: fn
- });
- }
- else {
- fn();
- onFailure();
- }
+ Ext.Ajax.request({
+ url: 'i18n/i18n_app_' + keyUiLocale + '.properties',
+ success: function(r) {
+ NS.i18n = dhis2.util.parseJavaProperties(r.responseText);
+ },
+ failure: function() {
+ alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').');
+ },
+ callback: fn
+ });
}
});
