=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2014-12-03 17:48:48 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/index.html 2014-12-03 17:53:38 +0000 @@ -1,5 +1,4 @@ - Event Capture === modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/d2Providers.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/d2Providers.js 2014-12-03 17:48:48 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/d2Providers.js 2014-12-03 17:53:38 +0000 @@ -27,12 +27,10 @@ url: url, type: 'GET' }).done(function(response) { - console.log('custom locale'); translation.keys = response; localStorage['LOCALE'] = locale; def.resolve(translation); }).fail(function(){ - console.log('default locale'); $.ajax({ url: defaultUrl , type: 'GET' @@ -77,13 +75,11 @@ if(userProfile && userProfile.settings && userProfile.settings.keyUiLocale){ getTranslations(userProfile.settings.keyUiLocale).done(function(response){ - console.log('the locale is: ', response.locale); $translateProvider.translations(response.locale, dhis2.util.parseJavaProperties(response.keys)); }); } else{ getLocale().done(function(response){ - console.log('the locale is: ', response.locale); $translateProvider.translations(response.locale, dhis2.util.parseJavaProperties(response.keys)); }); } === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/CacheManifest.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/CacheManifest.java 2014-12-03 17:48:48 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/appcache/CacheManifest.java 2014-12-03 17:53:38 +0000 @@ -99,12 +99,10 @@ String translationFile = ""; if ( locale.equalsIgnoreCase( "en" ) ) { - System.out.println( "EN" ); translationFile = defaultTranslationFile; } else { - System.out.println( locale ); translationFile = "i18n_app_" + locale + ".properties"; } @@ -154,7 +152,6 @@ { if ( i18nfiles[i].isFile() && i18nfiles[i].getName().equalsIgnoreCase( translationFile ) ) { - System.out.println("tx file"); fileExists = true; stringBuffer.append( i18nPath + "/" + translationFile ); stringBuffer.append( "\n" ); @@ -164,7 +161,6 @@ if ( !fileExists ) { - System.out.println("No tx file"); stringBuffer.append( i18nPath + "/" + defaultTranslationFile ); stringBuffer.append( "\n" ); @@ -173,7 +169,6 @@ stringBuffer.append( "\n" ); stringBuffer.append( "*" ); - System.out.println( "The manifest: " + stringBuffer.toString() ); inputStream = new ByteArrayInputStream( stringBuffer.toString().getBytes() ); return SUCCESS;