=== 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 2015-05-13 02:27:31 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2015-05-13 15:44:45 +0000 @@ -8295,7 +8295,7 @@ Ext.get('init').update(NS.i18n.initializing + '..'); }, failure: function() { - ns.alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); + alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); }, callback: fn }); @@ -8318,7 +8318,7 @@ init.organisationUnitLevels = Ext.decode(r.responseText).organisationUnitLevels || []; if (!init.organisationUnitLevels.length) { - ns.alert('No organisation unit levels'); + alert('No organisation unit levels'); } fn(); @@ -8349,7 +8349,7 @@ init.user.ouc = ouc; } else { - ns.alert('User is not assigned to any organisation units'); + alert('User is not assigned to any organisation units'); } fn(); === 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 2015-05-13 02:27:31 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2015-05-13 15:44:45 +0000 @@ -7968,7 +7968,7 @@ Ext.get('init').update(NS.i18n.initializing + '..'); }, failure: function() { - ns.alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); + alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); }, callback: fn }); @@ -7991,7 +7991,7 @@ init.organisationUnitLevels = Ext.decode(r.responseText).organisationUnitLevels || []; if (!init.organisationUnitLevels.length) { - ns.alert('No organisation unit levels'); + alert('No organisation unit levels found'); } fn(); @@ -8022,7 +8022,7 @@ init.user.ouc = ouc; } else { - ns.alert('User is not assigned to any organisation units'); + alert('User is not assigned to any organisation units'); } fn(); === modified file '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/i18n_app.properties 2015-04-27 13:33:58 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/i18n_app.properties 2015-05-13 15:44:45 +0000 @@ -432,4 +432,3 @@ revision=Revision build_time=Build time username=Username - === 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 2015-05-04 13:42:39 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2015-05-13 15:44:45 +0000 @@ -6827,7 +6827,7 @@ Ext.get('init').update(NS.i18n.initializing + '..'); }, failure: function() { - ns.alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); + alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); }, callback: fn }); @@ -6850,7 +6850,7 @@ init.organisationUnitLevels = Ext.decode(r.responseText).organisationUnitLevels || []; if (!init.organisationUnitLevels.length) { - ns.alert('No organisation unit levels'); + alert('No organisation unit levels found'); } fn(); @@ -6881,7 +6881,7 @@ init.user.ouc = ouc; } else { - ns.alert('User is not assigned to any organisation units'); + alert('User is not assigned to any organisation units'); } fn(); === 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 2015-05-13 02:27:31 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2015-05-13 15:44:45 +0000 @@ -6984,7 +6984,7 @@ Ext.get('init').update(NS.i18n.initializing + '..'); }, failure: function() { - ns.alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); + alert('No translations found for system locale (' + keyUiLocale + ') or default locale (' + defaultKeyUiLocale + ').'); }, callback: fn }); @@ -7007,7 +7007,7 @@ init.organisationUnitLevels = Ext.decode(r.responseText).organisationUnitLevels || []; if (!init.organisationUnitLevels.length) { - ns.alert('No organisation unit levels'); + alert('No organisation unit levels'); } fn(); @@ -7038,7 +7038,7 @@ init.user.ouc = ouc; } else { - ns.alert('User is not assigned to any organisation units'); + alert('User is not assigned to any organisation units'); } fn();