dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4957
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-10-14 14:46:59 +0200
message:
  Updated Light french translation
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/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-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java	2011-10-14 08:53:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java	2011-10-14 12:46:59 +0000
@@ -41,7 +41,7 @@
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.version.Version;
 import org.hisp.dhis.version.VersionService;
-
+import org.hisp.dhis.organisationunit.comparator.OrganisationUnitNameComparator;
 import com.opensymphony.xwork2.Action;
 
 /**
@@ -155,6 +155,8 @@
         Collections.sort( rootOrganisationUnits, new OrganisationUnitNameComparator() );
         
         version = getVersionString();
+        //hack to sort orphaned children
+        Collections.sort( rootOrganisationUnits, new OrganisationUnitNameComparator() );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2011-10-14 10:44:57 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2011-10-14 12:46:59 +0000
@@ -1,4 +1,4 @@
-DHIS_2 = DHIS 2
+DHIS_2 = DHIS2
 menu = Menu
 home = Home
 navigate_to = Navigate to

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties	2011-10-14 12:31:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties	2011-10-14 12:46:59 +0000
@@ -1,16 +1,25 @@
+DHIS_2 = DHIS2
 menu = Menu
 home = Accueil
 navigate_to = Acc\u00e9dez \u00e0 navigation
+reports = Rapports
+charts = Graphiques
+documents = Documents
 dashboard = Tableau de bord
+dashboard_reports = Rapports de tableau de bord
+dashboard_charts = Graphiques de tableau de bord
+dashboard_documents = Documents de tableau de bord
 data_entry = Entr\u00e9e de donn\u00e9es
 logout = D\u00e9connexion
 desktop_version = Version bureau
 report_table_parameters = Rapport param\u00e8tres
 get_report = Obtenir le rapport
-reporting_period = p\u00e9riode du rapport
+reporting_period = P\u00e9riode du rapport
 select_organisation_unit = S'il vous pla\u00eet s\u00e9lectionner unit\u00e9 d'organisation
-available_datasets = ensembles de donn\u00e9es disponibles
+available_datasets = Ensembles de donn\u00e9es disponibles
 available_organisation_units = Disponible unit\u00e9s d'organisation
-available_periods = p\u00e9riodes Disponible
+available_periods = P\u00e9riodes Disponible
 dataset_is_complete = DataSet est termin\u00e9e
-reports = Rapports
+settings = Parametres
+language = Langue de l'interface
+db_language = Langue base de donn\u00e9es
\ No newline at end of file