dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17444
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-11-11 22:08:03 +0100
message:
  Import/export, event labels
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.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-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2014-11-11 20:22:58 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties	2014-11-11 21:08:03 +0000
@@ -272,14 +272,14 @@
 intro_data_import=Import data values on the DXF 2 XML, JSON, CSV and PDF formats. DXF 2 is the standard exchange format for DHIS 2.
 intro_csv_data_import=Import data values on the CSV format which is used for data exchange by DHIS 2 and other third-party software.
 intro_pdf_data_import=Import data from a PDF data entry form. PDF forms can be generated from the data set module.
-intro_event_data_import=Import events for programs, stages and persons on the DXF 2 format.
+intro_event_import=Import events for programs, stages and persons on the DXF 2 format.
 intro_dhis14_import=Import data from DHIS 1.4 installations. DHIS 1.4 is the predecessor of DHIS 2.
 intro_data_export=Export data values. This is the regular export function which exports data to the DHIS 2 exchange format called DXF 2.
 intro_metadata_export=Export meta data like data elements and organisation units to the standard DHIS 2 exchange format.
 intro_export_to_other_systems=Export data and meta data to formats such as PDF, Excel and the DHIS 1.4 exchange format.
 intro_dhis14_file_configuration=Set the configuration for the DHIS 1.4 file import process, such as the location of the data file.
 intro_metadata_import=Import meta-data like data elements and organisation units using the standard DHIS 2 exchange format called DXF 2.
-intro_event_data_export=Export event data for programs, stages and persons on the DXF 2 format.
+intro_event_export=Export event data for programs, stages and persons on the DXF 2 format.
 intro_xml_metadata_import=Import meta-data like data elements and organisation units using the standard DHIS 2 exchange format called DXF 2.
 intro_csv_metadata_import=Import meta-data using CSV format. Currently only import of data elements is supported.
 intro_gml_import=Import geographic data for organisation units using GML format. GML is an XML grammar for expressing geographical features.
@@ -311,8 +311,8 @@
 xml_data_import=XML Data Import
 csv_data_import=CSV Data Import
 pdf_data_import=PDF Data Import
-event_data_import=Event Data Import
-event_data_export=Event Data Export
+event_import=Event Import
+event_export=Event Export
 programs=Programs
 program_stages=Program Stages
 format=Format

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm	2014-11-11 06:11:25 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm	2014-11-11 21:08:03 +0000
@@ -96,7 +96,7 @@
 });
 </script>
 
-<h3>$i18n.getString( "event_data_export" )</h3>
+<h3>$i18n.getString( "event_export" )</h3>
 
 <div id="inputCriteria" class="inputCriteria" style="width: 730px;">
 <form id="importForm" name="importForm" method="post" enctype="multipart/form-data" action="importMetaData.action">

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm	2014-11-11 20:22:58 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventImportForm.vm	2014-11-11 21:08:03 +0000
@@ -9,7 +9,7 @@
     });
 })
 </script>
-<h3>$i18n.getString( "event_data_import" )</h3>
+<h3>$i18n.getString( "event_import" )</h3>
 
 <div id="inputCriteria" class="inputCriteria" style="width: 380px">
 <form id="importForm" name="importForm" method="post" enctype="multipart/form-data" action="importEvents.action">

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2014-11-11 20:57:25 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/index.vm	2014-11-11 21:08:03 +0000
@@ -4,13 +4,13 @@
     #introListImgItem( "dxf2MetaDataImport.action" "metadata_import" "import" )
     #introListImgItem( "displayImportDataValueForm.action" "data_import" "import" )
     #introListImgItem( "gmlImport.action" "gml_import" "import" )
-    #introListImgItem( "displayEventImportForm.action" "event_data_import" "import" )
+    #introListImgItem( "displayEventImportForm.action" "event_import" "import" )
     #introListImgItem( "displayExternalImportMenu.action" "dhis14_import" "import" )
 
     #introListImgItem( "dxf2MetaDataExport.action" "metadata_export" "export" )
     #introListImgItem( "dxf2FilteredMetaDataExport.action" "filtered_metadata_export" "export")
     #introListImgItem( "displayDataValueExportForm.action" "data_export" "export" )
-    #introListImgItem( "displayEventExportForm.action" "event_data_export" "export" )
+    #introListImgItem( "displayEventExportForm.action" "event_export" "export" )
     #introListImgItem( "displayExternalExportMenu.action" "export_to_other_systems" "export" )
        
     #introListImgItem( "displayConfigDhis14Form.action" "dhis14_file_configuration" "configuration" )

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2014-11-11 20:57:25 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/mainMenu.vm	2014-11-11 21:08:03 +0000
@@ -5,7 +5,7 @@
   <li><a href="dxf2MetaDataImport.action">$i18n.getString( "metadata_import" )&nbsp;</a></li>
   <li><a href="displayImportDataValueForm.action">$i18n.getString( "data_import" )&nbsp;</a></li>
   <li><a href="gmlImport.action">$i18n.getString( "gml_import" )&nbsp;</a></li>
-  <li><a href="displayEventImportForm.action">$i18n.getString( "event_data_import" )&nbsp;</a></li>
+  <li><a href="displayEventImportForm.action">$i18n.getString( "event_import" )&nbsp;</a></li>
   <li><a href="displayExternalImportMenu.action">$i18n.getString( "dhis14_import" )&nbsp;</a></li>
 </ul>
 
@@ -15,7 +15,7 @@
   <li><a href="dxf2MetaDataExport.action">$i18n.getString( "metadata_export" )&nbsp;</a></li>
   <li><a href="dxf2FilteredMetaDataExport.action">$i18n.getString( "filtered_metadata_export" )&nbsp;</a></li>
   <li><a href="displayDataValueExportForm.action">$i18n.getString( "data_export" )&nbsp;</a></li>
-  <li><a href="displayEventExportForm.action">$i18n.getString( "event_data_export" )&nbsp;</a></li>
+  <li><a href="displayEventExportForm.action">$i18n.getString( "event_export" )&nbsp;</a></li>
   <li><a href="displayExternalExportMenu.action">$i18n.getString( "export_to_other_systems" )&nbsp;</a></li>
 </ul>