dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13426
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-12-25 13:07:24 +0100
message:
  I18n
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js


--
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-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	2013-12-22 10:11:38 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/org/hisp/dhis/de/i18n_module.properties	2013-12-25 12:07:24 +0000
@@ -109,4 +109,4 @@
 validation_rules_are_being_processed_please_wait=Validation rules are being processed, please wait
 section=Section
 print_form=Print form
-print_blank_form=Print blank form
+print_blank_form=Print blank form
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2013-11-21 10:14:59 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/org/hisp/dhis/reporting/i18n_module.properties	2013-12-25 12:07:24 +0000
@@ -20,6 +20,7 @@
 selected_dataelements= Selected data elements
 available_organisationunits= Available organisation units
 select_organisationunit_level_all=Select organsation unit level / View all
+select_option_view_all=Select option / View all
 level= Level
 available_organisationunits= Available organisation units
 selected_organisationunits= Selected organisation units

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2013-12-25 11:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/dataSetReportForm.vm	2013-12-25 12:07:24 +0000
@@ -38,6 +38,7 @@
 var i18n_generating_report = '$encoder.jsEscape( $i18n.getString( "generating_report" ), "'")';    
 var i18n_share_your_interpretation = '$encoder.jsEscape( $i18n.getString( "share_your_interpretation" ), "'")';
 var i18n_interpretation_was_shared = '$encoder.jsEscape( $i18n.getString( "interpretation_was_shared" ), "'")';
+var i18n_select_option_view_all = '$encoder.jsEscape( $i18n.getString( "select_option_view_all" ) , "'")';
 </script>
 
 <style type="text/css" media="print">

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2013-12-25 11:46:47 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/dataSetReport.js	2013-12-25 12:07:24 +0000
@@ -81,8 +81,7 @@
 }
 
 /**
-* Set markup for drop down boxes to be put in the selection box for the
-* given categories.
+* Sets markup for drop down boxes for the given categories in the selection div.
 */
 dhis2.dsr.setAttributesMarkup = function( categoryIds )
 {
@@ -95,7 +94,7 @@
 		categoryRx.push( $.get( "../api/dimensions/" + id + ".json" ) );
 	} );
 
-	var defer = $.when.apply( $, categoryRx ).done( function() {
+	$.when.apply( $, categoryRx ).done( function() {
 		var html = '';
 		
 		$.each( arguments, function( idx, cat ) {
@@ -104,7 +103,7 @@
 			html += '<div class="inputSection">';
 			html += '<label>' + category.name + '</label>';
 			html += '<select class="dimension" data-uid="' + category.id + '" style="width:330px">';
-			html += '<option value="-1">[ ' + 'Select option / View all' + ' ]</option>';
+			html += '<option value="-1">[ ' + i18n_select_option_view_all + ' ]</option>';
 			
 			$.each( category.items, function( idx, option ) {
 				html += '<option value="' + option.id + '">' + option.name + '</option>';