dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32339
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16503: PT DV GIS ER EV i18n fallback.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16503 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-08-25 15:13:05 +0200
message:
PT DV GIS ER EV i18n fallback.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/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
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-08-25 11:55:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/app/scripts/app.js 2014-08-25 13:11:09 +0000
@@ -7134,6 +7134,7 @@
});
}
else {
+ fn();
failure();
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-08-25 11:57:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/app/scripts/app.js 2014-08-25 13:11:09 +0000
@@ -533,7 +533,7 @@
else {
container.valueStore.loadOptionSet();
}
- }
+ }
});
this.valueCmp = Ext.create('Ext.form.field.Text', {
@@ -6775,6 +6775,7 @@
});
}
else {
+ fn();
failure();
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-08-25 09:12:15 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/app/scripts/app.js 2014-08-25 13:11:09 +0000
@@ -9077,7 +9077,8 @@
requests.push({
url: init.contextPath + '/api/me/user-account.json',
success: function(r) {
- init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || 'en';
+ var defaultKeyUiLocale = 'en';
+ init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
// i18n
Ext.Ajax.request({
@@ -9085,6 +9086,31 @@
success: function(r) {
GIS.i18n = Ext.decode(r.responseText);
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 = Ext.decode(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: function() {
+ fn();
+ }
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-20 13:05:12 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-08-25 13:11:09 +0000
@@ -6108,7 +6108,8 @@
requests.push({
url: init.contextPath + '/api/me/user-account.json',
success: function(r) {
- init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || 'en';
+ var defaultKeyUiLocale = 'en';
+ init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
// i18n
Ext.Ajax.request({
@@ -6116,6 +6117,31 @@
success: function(r) {
NS.i18n = Ext.decode(r.responseText);
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 = Ext.decode(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: function() {
+ fn();
+ }
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-20 13:27:26 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/app/scripts/app.js 2014-08-25 13:11:09 +0000
@@ -5996,11 +5996,12 @@
}
}());
- // user info
+ // user info, i18n
requests.push({
url: init.contextPath + '/api/me/user-account.json',
success: function(r) {
- init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || 'en';
+ var defaultKeyUiLocale = 'en';
+ init.keyUiLocale = Ext.decode(r.responseText).settings.keyUiLocale || defaultKeyUiLocale;
// i18n
Ext.Ajax.request({
@@ -6008,6 +6009,31 @@
success: function(r) {
NS.i18n = Ext.decode(r.responseText);
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 = Ext.decode(r.responseText);
+ },
+ failure: function() {
+ failure();
+ },
+ callback: function() {
+ fn();
+ }
+ });
+ }
+ else {
+ fn();
+ failure();
+ }
}
});
}
