dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11057: (PT) Favorite fixes + i18n.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 28 May 2013 16:52:19 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11057 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-05-28 18:51:17 +0200
message:
  (PT) Favorite fixes + i18n.
modified:
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties
  dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties


--
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-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties	2013-05-28 14:37:50 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module.properties	2013-05-28 16:16:39 +0000
@@ -115,5 +115,6 @@
 low_to_high=Low to high
 high_to_low=High to low
 top_limit=Top limit
-plain_data_sources=Plain data sources
-graphics=Graphics
\ No newline at end of file
+plain_data_sources=Plain data source
+graphics=Graphics
+data_sets_cannot_be_specified_as_filter=Data sets cannot be specified as filter
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_fr_FR.properties	2013-05-28 14:37:50 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/resources/org/hisp/dhis/pivot/i18n_module_fr_FR.properties	2013-05-28 16:16:39 +0000
@@ -111,5 +111,6 @@
 options=Options
 download=T\u00E9l\u00E9charger
 favorites=Favoris
-plain_data_sources=Sources de donn\u00E9es simples
+plain_data_sources=Source de donn\u00E9es simples
 graphics=Graphique
+data_sets_cannot_be_specified_as_filter=Ensembles de donn\u00E9es ne peuvent \u00EAtre d\u00E9finies comme filtre
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-05-28 14:43:39 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js	2013-05-28 16:49:29 +0000
@@ -3436,6 +3436,12 @@
 							alert(PT.i18n.categories_cannot_be_specified_as_filter);
 							return;
 						}
+
+						// Data sets as filter
+						if (layout.filters[i].dimension === dimConf.category.objectName) {
+							alert(PT.i18n.data_sets_cannot_be_specified_as_filter);
+							return;
+						}
 					}
 				}
 
@@ -3828,7 +3834,7 @@
 
 						pt.viewport.colStore.add({
 							id: dim.dimensionName,
-							name: dim.name
+							name: dimConf.objectNameMap[dim.dimensionName].name
 						});
 
 						pt.viewport.dimensionStore.remove(pt.viewport.dimensionStore.getById(dim.dimensionName));
@@ -3841,7 +3847,7 @@
 
 						pt.viewport.rowStore.add({
 							id: dim.dimensionName,
-							name: dim.name
+							name: dimConf.objectNameMap[dim.dimensionName].name
 						});
 
 						pt.viewport.dimensionStore.remove(pt.viewport.dimensionStore.getById(dim.dimensionName));
@@ -3854,7 +3860,7 @@
 
 						pt.viewport.filterStore.add({
 							id: dim.dimensionName,
-							name: dim.name
+							name: dimConf.objectNameMap[dim.dimensionName].name
 						});
 
 						pt.viewport.dimensionStore.remove(pt.viewport.dimensionStore.getById(dim.dimensionName));

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-05-28 15:59:59 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js	2013-05-28 16:49:29 +0000
@@ -863,6 +863,7 @@
 						}
 					}
 
+					// Re-layout
 					layout = pt.api.layout.Layout(xLayout);
 
 					return layout ? pt.util.pivot.getExtendedLayout(layout) : null;

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm	2013-05-28 14:37:50 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/i18n.vm	2013-05-28 16:16:39 +0000
@@ -117,5 +117,6 @@
     high_to_low: '$encoder.jsEscape($i18n.getString( 'high_to_low' ) , "'")',
     top_limit: '$encoder.jsEscape($i18n.getString( 'top_limit' ) , "'")',
     plain_data_sources: '$encoder.jsEscape($i18n.getString( 'plain_data_sources' ) , "'")',
-	graphics: '$encoder.jsEscape($i18n.getString( 'graphics' ) , "'")'
+	graphics: '$encoder.jsEscape($i18n.getString( 'graphics' ) , "'")',
+	data_sets_cannot_be_specified_as_filter: '$encoder.jsEscape($i18n.getString( 'data_sets_cannot_be_specified_as_filter' ) , "'")'
 };

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2013-05-28 14:37:50 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties	2013-05-28 16:16:39 +0000
@@ -192,5 +192,5 @@
 search_for_user_groups=Search for user group
 public_access=Public access
 detailed_data_elements_cannot_be_specified_as_filter=Detailed data elements cannot be specified as filter
-plain_data_sources=Plain data sources
+plain_data_sources=Plain data source
 graphics=Graphics
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties	2013-05-28 14:37:50 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties	2013-05-28 16:16:39 +0000
@@ -172,5 +172,5 @@
 can_view=Peut voir
 add_new=Ajouter nouveau
 create=Cr\u00E9er
-plain_data_sources=Sources de donn\u00E9es simples
+plain_data_sources=Source de donn\u00E9es simples
 graphics=Graphique
\ No newline at end of file