diff --git a/DEVELOPERS.md b/DEVELOPERS.md index 82e88bb26244e2f4d2eacf6022a362c215818d6d..4a6b1d4d7c84a92e4065a46daaac74f043aa8559 100644 --- a/DEVELOPERS.md +++ b/DEVELOPERS.md @@ -575,7 +575,7 @@ Dans la configuration du module, dans le "fieldset_template", ajouter un sélect "id": "fs_ouvrage", "type": "fieldset_template", "calcType": "Structure", - "defaultStructType": "VanneRectangulaire", + "defaultStructType": "VanneFondRectangulaire", "defaultLoiDebit": "GateCem88v", "fields": [ { @@ -594,7 +594,7 @@ Dans la configuration du module, dans le "fieldset_template", ajouter un sélect "SeuilRectangulaire_WeirVillemonte": "structures/kivi.html", "SeuilRectangulaire_WeirSubmergedLarinier": "structures/fente_noyee.html", "SeuilRectangulaire_WeirCunge80": "structures/cunge_80.html", - "VanneRectangulaire_GateCunge80": "structures/cunge_80.html", + "VanneFondRectangulaire_GateCunge80": "structures/cunge_80.html", "SeuilTriangulaire_TriangularWeirFree": "structures/dever_triang.html", "SeuilTriangulaire_TriangularWeirBroad": "structures/dever_triang.html", "SeuilTriangulaireTrunc_TriangularTruncWeirFree": "structures/dever_triang_tronque.html" diff --git a/src/app/calculators/parallelstructure/config.json b/src/app/calculators/parallelstructure/config.json index 3ac1aef2cfeda5da3ba2b81728bf66fa1960d946..0e8c2886dd4f02da96d30961f3d87485b8866b3c 100644 --- a/src/app/calculators/parallelstructure/config.json +++ b/src/app/calculators/parallelstructure/config.json @@ -13,7 +13,7 @@ "id": "fs_ouvrage", "type": "fieldset_template", "calcType": "Structure", - "defaultStructType": "VanneRectangulaire", + "defaultStructType": "VanneFondRectangulaire", "defaultLoiDebit": "GateCem88v", "fields": [ { diff --git a/src/locale/messages.en.json b/src/locale/messages.en.json index 56a2f105b8fe381cc8260baac031adecf8349a29..2501dfefb79c19fb5806f6b77f308298acd11f3b 100755 --- a/src/locale/messages.en.json +++ b/src/locale/messages.en.json @@ -359,9 +359,10 @@ "INFO_LIB_STRUCT_CONTAINER": "Devices", "INFO_LIB_STRUCTURE_ORIFICE": "Orifice", "INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Rectangular weir", + "INFO_LIB_STRUCTURE_SEUILORIFICERECTANGULAIRE": "Rectangular weir/orifice", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Triangular weir", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Truncated triangular weir", - "INFO_LIB_STRUCTURE_VANNERECTANGULAIRE": "Rectangular gate", + "INFO_LIB_STRUCTURE_VANNEFONDRECTANGULAIRE": "Rectangular bottom gate", "INFO_LIB_STRUCTURE_N_COURT": "D", "INFO_LIB_TAU0": "Tractive force", "INFO_LIB_TOR": "Supercritical water line", diff --git a/src/locale/messages.fr.json b/src/locale/messages.fr.json index 225b0751e30d7981d2294f75d501e110605f0bed..a0387005d38b9a907ac2976e1b5b63a8bd3ab797 100755 --- a/src/locale/messages.fr.json +++ b/src/locale/messages.fr.json @@ -360,9 +360,10 @@ "INFO_LIB_STRUCT_CONTAINER": "Ouvrages", "INFO_LIB_STRUCTURE_ORIFICE": "Orifice", "INFO_LIB_STRUCTURE_SEUILRECTANGULAIRE": "Seuil rectangulaire", + "INFO_LIB_STRUCTURE_SEUILORIFICERECTANGULAIRE": "Seuil/orifice rectangulaire", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRE": "Seuil triangulaire", "INFO_LIB_STRUCTURE_SEUILTRIANGULAIRETRUNC": "Seuil triangulaire tronqué", - "INFO_LIB_STRUCTURE_VANNERECTANGULAIRE": "Vanne rectangulaire", + "INFO_LIB_STRUCTURE_VANNEFONDRECTANGULAIRE": "Vanne de fond rectangulaire", "INFO_LIB_STRUCTURE_N_COURT": "O", "INFO_LIB_TAU0": "Force tractrice", "INFO_LIB_TOR": "Ligne d'eau torrentielle",