dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16014
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-07-08 09:36:33 +0200
message:
  I18n fix from msf-tw branch
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetTranslationsAction.java


--
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-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;
     }