dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15797
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5829: (DV) Minor fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 5829 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-01-30 21:33:43 +0100
message:
(DV) Minor fixes.
modified:
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
dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.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-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 2012-01-30 13:51:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module.properties 2012-01-30 20:32:59 +0000
@@ -10,9 +10,9 @@
series=Series
category=Category
filter=Filter
-alert_no_indicators_selected=No indicators or data elements selected.
-no_periods_selected=No periods selected.
-no_orgunits_selected=No organisation units selected.
+alert_no_indicators_selected=No indicators or data elements selected
+no_periods_selected=No periods selected
+no_orgunits_selected=No organisation units selected
example_chart=Example chart
loading=Loading...
no_data=No data
@@ -70,13 +70,13 @@
example_chart_cannot_be_saved=* The example chart cannot be saved
overwrite=Overwrite
download_as=Download..
-alert_browser_download=Please use Chrome, Firefox, Opera or Safari to export images.
+alert_browser_download=Please use Chrome, Firefox, Opera or Safari to export images
no_svg_format=No SVG format
image_png=Image (PNG)
hide_data_table=Hide data table
-no_indicators_selected=No indicators selected.
-no_data_elements_selected=No data elements selected.
-data_element_store_does_not_exist=Data element store does not exist.
+no_indicators_selected=No indicators selected
+no_data_elements_selected=No data elements selected
+data_element_store_does_not_exist=Data element store does not exist
saving=Saving
renaming=Renaming
deleting=Deleting
=== 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 2012-01-30 13:51:10 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/resources/org/hisp/dhis/visualizer/i18n_module_fr_FR.properties 2012-01-30 20:32:59 +0000
@@ -52,7 +52,7 @@
show_hide_chart_settings=Montrer/Masquer les param\u00e8tres du graphique
update=Actualiser
data_table=Tableau de donn\u00e9es
-favorites=Favoris...
+favorites=Favoris..
manage_favorites=G\u00e9rer les favoris
save_favorite=Enregistrer le favori
sort_by=Trier par
@@ -69,14 +69,14 @@
save=Enregistrer
example_chart_cannot_be_saved=* L'exemple de graphique ne peut \u00eatre enregistr\u00e9
overwrite=Ecraser
-download_as=T\u00e9l\u00e9charger comme
+download_as=T\u00e9l\u00e9charger comme..
alert_browser_download=Veuillez utiliser Chrome, Firefox, Opera ou Safari pour exporter les images
no_svg_format=Aucun format SVG
image_png=Image (PNG)
hide_data_table=Masquer le tableau de donn\u00e9es
no_indicators_selected=Aucun indicateur s\u00e9lectionn\u00e9
-no_data_elements_selected=Aucun \u00e9lement de donn\u00e9es s\u00e9lectionn\u00e9.
-data_element_store_does_not_exist=Le stock d'\u00e9lement de donn\u00e9es n'existe pas.
+no_data_elements_selected=Aucun \u00e9lement de donn\u00e9es s\u00e9lectionn\u00e9
+data_element_store_does_not_exist=Le stock d'\u00e9lement de donn\u00e9es n'existe pas
saving=Enregistrement
renaming=Changement de nom
deleting=Suppression
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-01-30 20:15:40 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/app.js 2012-01-30 20:32:59 +0000
@@ -642,6 +642,9 @@
type: 'Category',
position: 'bottom',
title: DV.state.domainAxisLabel || false,
+ labelTitle: {
+ font: '17px ' + DV.conf.chart.style.font
+ },
fields: DV.conf.finals.data.domain,
label: DV.util.chart.default.label.getCategory()
};