From 707f5cb4cd965ddc6782c48854ca792b08c7e6f0 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Mon, 11 Feb 2019 09:12:41 +0100
Subject: [PATCH] =?UTF-8?q?TItres=20et=20descriptions=20des=20th=C3=A8mes?=
=?UTF-8?q?=20pour=20la=20page=20d'accueil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/config.json | 3 +--
src/locale/messages.en.json | 22 +++++++++++-----------
src/locale/messages.fr.json | 14 +++++++-------
3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/app/config.json b/src/app/config.json
index 37d246e53..721905441 100644
--- a/src/app/config.json
+++ b/src/app/config.json
@@ -13,8 +13,7 @@
"title": "Passe à poisson sur le Lez, entre Bollène et Suze",
"credits": "Hervé Capra / Irstea"
},
- "calculators": [ 6, 10, 9 ],
- "_calculators": [ 5, 6, 10, 9 ]
+ "calculators": [ 5, 6, 10, 9 ]
},
{
"name": "PASSE_NATURELLE",
diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json
index 554fbba13..fa9c47aa6 100644
--- a/src/locale/messages.en.json
+++ b/src/locale/messages.en.json
@@ -169,18 +169,18 @@
"INFO_SETUP_PRECISION_CALCUL": "Computation accuracy",
"INFO_SETUP_TITLE": "Application setup",
"INFO_THEME_CREDITS": "Credit",
- "INFO_THEME_MODULES_INUTILISES_TITRE": "Other calculator modules",
- "INFO_THEME_MODULES_INUTILISES_DESCRIPTION": "Calculator modules not used in themes above",
- "INFO_THEME_PASSE_A_BASSIN_TITRE": "Basin pass",
- "INFO_THEME_PASSE_A_BASSIN_DESCRIPTION": "A great pass with a great basin",
+ "INFO_THEME_MODULES_INUTILISES_TITRE": "Other calculation modules",
+ "INFO_THEME_MODULES_INUTILISES_DESCRIPTION": "Various calculation modules",
+ "INFO_THEME_PASSE_A_BASSIN_TITRE": "Fish ladder",
+ "INFO_THEME_PASSE_A_BASSIN_DESCRIPTION": "Tools for sizing a fish pass made with pools also called fish steps",
"INFO_THEME_PASSE_NATURELLE_TITRE": "Natural pass",
- "INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "A great and very natural pass",
- "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_TITRE": "Hydraulics on free surface",
- "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_DESCRIPTION": "Hydraulics on free surface is great!",
- "INFO_THEME_HYDRAULIQUE_EN_CHARGE_TITRE": "Hydraulics on charge",
- "INFO_THEME_HYDRAULIQUE_EN_CHARGE_DESCRIPTION": "Hydraulics on charge is great!",
- "INFO_THEME_LOIS_D_OUVRAGES_TITRE": "Parallel structures",
- "INFO_THEME_LOIS_D_OUVRAGES_DESCRIPTION": "Parallel structures are great!",
+ "INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Tools for sizing a natural fish pass also called macroroughness pass or rock-ramp fish pass",
+ "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_TITRE": "Hydraulics with free surfaces",
+ "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_DESCRIPTION": "Calculation modules for flows in channels and rivers",
+ "INFO_THEME_HYDRAULIQUE_EN_CHARGE_TITRE": "Pipe flow",
+ "INFO_THEME_HYDRAULIQUE_EN_CHARGE_DESCRIPTION": "Modules for calculating head losses in pressure pipes",
+ "INFO_THEME_LOIS_D_OUVRAGES_TITRE": "Hydraulic structures",
+ "INFO_THEME_LOIS_D_OUVRAGES_DESCRIPTION": "Flow calculation for hydraulic devices (gates, weir, orifices)",
"WARNING_REMOUS_ARRET_CRITIQUE": "Calculation stopped: critical elevation reached at abscissa %x%",
"WARNING_STRUCTUREKIVI_HP_TROP_ELEVE": "h/p must not be greater than 2.5. h/p is forced to 2.5",
"WARNING_STRUCTUREKIVI_PELLE_TROP_FAIBLE": "Threshold height should be greater than 0.1 m. Beta coefficient is forced to 0"
diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json
index f510f9910..d4d47df5a 100644
--- a/src/locale/messages.fr.json
+++ b/src/locale/messages.fr.json
@@ -170,17 +170,17 @@
"INFO_SETUP_TITLE": "Paramètres de l'application",
"INFO_THEME_CREDITS": "Crédit",
"INFO_THEME_MODULES_INUTILISES_TITRE": "Autres modules de calcul",
- "INFO_THEME_MODULES_INUTILISES_DESCRIPTION": "Modules de calculs non utilisés dans les thèmes ci-dessus",
+ "INFO_THEME_MODULES_INUTILISES_DESCRIPTION": "Modules de calculs divers",
"INFO_THEME_PASSE_A_BASSIN_TITRE": "Passe à bassin",
- "INFO_THEME_PASSE_A_BASSIN_DESCRIPTION": "Une super passe avec un super bassin",
+ "INFO_THEME_PASSE_A_BASSIN_DESCRIPTION": "Outils de dimensionnement d'une passe à poissons de type passe à bassin ou encore appelée échelle à poisson",
"INFO_THEME_PASSE_NATURELLE_TITRE": "Passe naturelle",
- "INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Une super passe super naturelle",
- "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_TITRE": "Hydraulique à surface libre",
- "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_DESCRIPTION": "L'hydraulique à surface libre c'est super !",
+ "INFO_THEME_PASSE_NATURELLE_DESCRIPTION": "Outils de dimensionnement d'une passe à poissons de type passe naturelle ou encore appelée passe à macro-rugosités",
+ "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_TITRE": "Hydraulique à surfaces libres",
+ "INFO_THEME_HYDRAULIQUE_A_SURFACE_LIBRE_DESCRIPTION": "Modules de calcul pour les écoulements en canaux et rivières",
"INFO_THEME_HYDRAULIQUE_EN_CHARGE_TITRE": "Hydraulique en charge",
- "INFO_THEME_HYDRAULIQUE_EN_CHARGE_DESCRIPTION": "L'hydraulique en charge c'est super !",
+ "INFO_THEME_HYDRAULIQUE_EN_CHARGE_DESCRIPTION": "Modules de calcul de perte de charge dans les conduites sous pression",
"INFO_THEME_LOIS_D_OUVRAGES_TITRE": "Lois d'ouvrages",
- "INFO_THEME_LOIS_D_OUVRAGES_DESCRIPTION": "Les lois d'ouvrages c'est super !",
+ "INFO_THEME_LOIS_D_OUVRAGES_DESCRIPTION": "Calculs basés sur les lois de débits d'ouvrages hydrauliques (Vannes, seuils, orifices)",
"WARNING_REMOUS_ARRET_CRITIQUE": "Arrêt du calcul : hauteur critique atteinte à l'abscisse %x%",
"WARNING_STRUCTUREKIVI_HP_TROP_ELEVE": "h/p ne doit pas être supérieur à 2,5. h/p est forcé à 2,5",
"WARNING_STRUCTUREKIVI_PELLE_TROP_FAIBLE": "La pelle du seuil doit mesurer au moins 0,1 m. Le coefficient béta est forcé à 0"
--
GitLab