=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js 2013-10-01 16:44:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js 2014-07-08 07:36:33 +0000 @@ -7,7 +7,7 @@ if ( loc != 'NONE' ) { jQuery.postJSON( 'getTranslations.action', { - id: getFieldValue( 'objectId' ), + objectUid: getFieldValue( 'uid' ), className: getFieldValue( 'className' ), loc: loc }, === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetTranslationsAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetTranslationsAction.java 2014-05-05 12:22:43 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetTranslationsAction.java 2014-07-08 07:36:33 +0000 @@ -45,7 +45,7 @@ { private String className; - private String uid; + private String objectUid; private String loc; @@ -71,9 +71,9 @@ this.className = className; } - public void setUid( String uid ) + public void setObjectUid( String objectUid ) { - this.uid = uid; + this.objectUid = objectUid; } public void setLoc( String locale ) @@ -95,7 +95,7 @@ { Locale locale = LocaleUtils.getLocale( loc ); - translations = i18nService.getTranslationsNoFallback( className, uid, locale ); + translations = i18nService.getTranslationsNoFallback( className, objectUid, locale ); return SUCCESS; }