=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2010-06-19 17:11:55 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2012-02-27 14:53:31 +0000 @@ -18,6 +18,7 @@
$i18n.getString( "os_name" ):
$systemProperties.get( "os.name" )
$i18n.getString( "os_architecture" ):
$systemProperties.get( "os.arch" )
$i18n.getString( "os_version" ):
$systemProperties.get( "os.version" )
+
$i18n.getString( "server_date" ):
$format.formatDateTime( $serverDate )
#end
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2012-02-27 14:53:31 +0000 @@ -173,6 +173,13 @@ { return currentUserIsSuper; } + + private Date serverDate = new Date(); + + public Date getServerDate() + { + return serverDate; + } // ------------------------------------------------------------------------- // Action implementation === 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 2012-02-23 12:29:39 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2012-02-27 14:53:31 +0000 @@ -283,7 +283,8 @@ my_datamart_description=Local data mart for off-line data analysis mobile_client=Mobile client mobile_client_description=Client for data capture on mobile devices -web_api = Web API +web_api=Web API +server_date=Server date #-- Change Log------------------------------------------------------------------#