=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-02-21 13:32:39 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2012-08-12 20:22:53 +0000
@@ -1,5 +1,5 @@
 dataelement_comment=Comment
-history_not_valid=History is not applied for this dataelement!
+history_not_valid=No history for this data element
 data_element=Data Element
 min=Min
 entry=Entry

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2012-08-02 13:19:00 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/history.vm	2012-08-12 20:22:53 +0000
@@ -1,6 +1,8 @@
 <script type="text/javascript">
+#if( $dataElementHistory )
 var currentDataElementId = $!{dataElementHistory.dataElement.id};
 var currentOptionComboId = $!{dataElementHistory.optionCombo.id};
+#end
 </script>
 
 #set( $width = 40 * $dataElementHistory.historyLength )