dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1720
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-04-01 16:31:33 +0700
message:
  Quickly fixed
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/ValidateAddDuplicatedTranslationAction.java
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties


--
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	2010-03-31 09:54:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js	2010-04-01 09:31:33 +0000
@@ -213,14 +213,14 @@
 {
 	var type = xmlObject.getAttribute( 'type' );
 	
+	setMessage( xmlObject.firstChild.nodeValue );
+	
 	if ( type == 'input' )
 	{
 		byId("name").select();
-		setMessage( xmlObject.firstChild.nodeValue );
 	}
 	else if ( type == 'success' )
 	{
-		setMessage( xmlObject.firstChild.nodeValue );
 		byId( "translateForm" ).submit();
 	}
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/ValidateAddDuplicatedTranslationAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/ValidateAddDuplicatedTranslationAction.java	2010-03-31 09:54:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/ValidateAddDuplicatedTranslationAction.java	2010-04-01 09:31:33 +0000
@@ -180,31 +180,35 @@
 
                 if ( objMatch != null )
                 {
-                    message = i18n.getString( WARNING_MESSAGE + PROPERTY_NAME + "_with" ) + " <br/><br/> <center><strong>[ "
-                        + i18n.getString( "id" ) + ":: " + objMatch.getId() + " ]  -  [ " + i18n.getString( "name" )
-                        + ":: " + objMatch.getValue() + " ]</strong></center>";
+                    message = i18n.getString( WARNING_MESSAGE + PROPERTY_NAME + "_with" )
+                        + " <br/><br/> <center><strong>[ " + className + " ]  -  [ "
+                        + i18n.getString( "translation_label_id" ) + ":= " + objMatch.getId() + " ]  -  [ "
+                        + i18n.getString( "translation_label_name" ) + ":= " + objMatch.getValue()
+                        + " ]</strong></center>";
 
                     return INPUT;
                 }
             }
             else if ( propertyName.equalsIgnoreCase( PROPERTY_SHORTNAME ) )
             {
-                Translation objMatch = translationService.getTranslation( className, thisLocale, propertyName, name,
-                    Integer.parseInt( id ) );
+                Translation objMatch = translationService.getTranslation( className, thisLocale, propertyName,
+                    shortName, Integer.parseInt( id ) );
 
                 if ( objMatch != null )
                 {
-                    message = i18n.getString( WARNING_MESSAGE + PROPERTY_NAME + "_with" ) + " <br/><br/> <center><strong>[ "
-                        + i18n.getString( "id" ) + ":: " + objMatch.getId() + " ]  -  [ " + i18n.getString( "name" )
-                        + ":: " + objMatch.getValue() + " ]</strong></center>";
+                    message = i18n.getString( WARNING_MESSAGE + PROPERTY_SHORTNAME + "_with" )
+                        + " <br/><br/> <center><strong>[ " + className + " ]  -  [ "
+                        + i18n.getString( "translation_label_id" ) + ":= " + objMatch.getId() + " ]  -  [ "
+                        + i18n.getString( "translation_label_short_name" ) + ":= " + objMatch.getValue()
+                        + " ]</strong></center>";
 
                     return INPUT;
                 }
             }
         }
-        
+
         message = "OK";
-        
+
         return SUCCESS;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-03-31 09:54:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-04-01 09:31:33 +0000
@@ -167,6 +167,7 @@
 translation_select_locale = [ Select locale ]
 translation_select_ref = [ Select reference ]
 translation_save = Save
+translation_label_id = Id
 translation_label_name = Name
 translation_label_short_name = Short name
 translation_label_description = Description

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2010-03-31 09:54:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_vi_VN.properties	2010-04-01 09:31:33 +0000
@@ -154,6 +154,7 @@
 translation_select_locale 							= [ Ch\u1ecdn v\u00f9ng ]
 translation_select_ref 								= [ Ch\u1ecdn tham kh\u1ea3o ]
 translation_save 									= L\u01b0u
+translation_label_id                                = M\u00e3
 translation_label_name 								= T\u00ean
 translation_label_short_name 						= T\u00ean vi\u1ebft t\u1eaft
 translation_label_description 						= M\u00f4 t\u1ea3