dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1974
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-06-09 11:08:45 +0700
message:
  Minor fixed for showing the feedback warning - Translation functionality.
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-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm


--
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-06-06 13:49:53 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.js	2010-06-09 04:08:45 +0000
@@ -142,6 +142,9 @@
 
 function setMessage( message )
 {
-	document.getElementById('message').innerHTML = message;
-	document.getElementById('message').style.display = 'block';
+	if ( message != "" )
+	{
+		document.getElementById('message').innerHTML = message;
+		document.getElementById('message').style.display = 'block';
+	}
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm	2010-06-07 06:17:12 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/translate.vm	2010-06-09 04:08:45 +0000
@@ -10,8 +10,8 @@
 					,errorElement:"td"
 				});
 				jQuery.validator.loadLocaled( jQuery("#curLocaleCode").val() );
+				setMessage( '$!message' );
 			}
-  
 	);
 
 </script>
@@ -110,11 +110,4 @@
     var variant_must_be_specified = '$i18n.getString( "translation_variant_must_be_specified" )';
     var locale_already_exists = '$i18n.getString( "translation_locale_already_exists" )';
 	
-	$(document).ready( function()
-	{
-		#if ( $message )
-			setMessage( '$!message' );
-		#end
-	});
-	
 </script>
\ No newline at end of file