Updated calculators config & lang files for #419

DEVELOPERS.md

@@ -290,6 +290,8 @@ Dans le fichier de configuration du module, ajouter la définition des listes d
 }
 ```
 
+**IMPORTANT** : les id doivent être de la forme `select_`_`unmotclesansespacenitirets`_
+
 #### si la liste n'est pas associée à un enum
  
 Une liste déroulante peut être associée à une **source**, qui détermine quels sont les choix possibles.

src/app/calculators/bief/en.json

@@ -2,16 +2,16 @@
     "fs_water_line": "Type of water line",
     "select_regime": "Regime",
 
-    "select_regime_0": "Fluvial",
-    "select_regime_1": "Torrential",
+    "REGIME_0": "Fluvial",
+    "REGIME_1": "Torrential",
 
     "fs_section": "Type of section",
     "select_section": "Choice of section type",
 
-    "select_section_2": "Trapezoidal",
-    "select_section_1": "Rectangular",
-    "select_section_0": "Circular",
-    "select_section_3": "Parabolic",
+    "SECTION_2": "Trapezoidal",
+    "SECTION_1": "Rectangular",
+    "SECTION_0": "Circular",
+    "SECTION_3": "Parabolic",
 
     "LargeurFond": "Width at bottom",
     "Fruit": "Bank slope",

src/app/calculators/bief/fr.json

@@ -2,16 +2,16 @@
     "fs_water_line": "Type de ligne d'eau",
     "select_regime": "Régime",
 
-    "select_regime_0": "Fluvial",
-    "select_regime_1": "Torrentiel",
+    "REGIME_0": "Fluvial",
+    "REGIME_1": "Torrentiel",
 
     "fs_section": "Type de section",
     "select_section": "Choix du type de section",
 
-    "select_section_2": "Trapézoïdale",
-    "select_section_1": "Rectangulaire",
-    "select_section_0": "Circulaire",
-    "select_section_3": "Parabolique",
+    "SECTION_2": "Trapézoïdale",
+    "SECTION_1": "Rectangulaire",
+    "SECTION_0": "Circulaire",
+    "SECTION_3": "Parabolique",
 
     "LargeurFond": "Largeur au fond",
     "Fruit": "Fruit des berges",

src/app/calculators/courberemous/en.json

@@ -2,10 +2,10 @@
     "fs_section": "Type of section",
     "select_section": "Choice of section type",
 
-    "select_section_2": "Trapezoidal",
-    "select_section_1": "Rectangular",
-    "select_section_0": "Circular",
-    "select_section_3": "Parabolic",
+    "SECTION_2": "Trapezoidal",
+    "SECTION_1": "Rectangular",
+    "SECTION_0": "Circular",
+    "SECTION_3": "Parabolic",
 
     "LargeurFond": "Width at bottom",
     "Fruit": "Bank slope",
@@ -43,27 +43,27 @@
     "UNIT_IMP": "N",
     "UNIT_TAU0": "Pa",
 
-    "select_resolution_0": "Integration by trapezoid",
-    "select_resolution_1": "Runge Kutta fourth order",
-    "select_resolution_2": "Explicit Euler",
+    "RESOLUTION_0": "Integration by trapezoid",
+    "RESOLUTION_1": "Runge Kutta fourth order",
+    "RESOLUTION_2": "Explicit Euler",
 
     "fs_target_data": "Data to compute",
     "select_target": "Choice of the data to compute",
-    "select_target_none": "None",
-    "select_target_Hs": "Head (m)",
-    "select_target_Hsc": "Critical head (m)",
-    "select_target_B": "Surface width (m)",
-    "select_target_P": "Wetted perimeter (m)",
-    "select_target_S": "Wetted area (m2)",
-    "select_target_R": "Hydraulic radius (m)",
-    "select_target_V": "Average speed (m/s)",
-    "select_target_Fr": "Froude number",
-    "select_target_Yc": "Critical depth (m)",
-    "select_target_Yn": "Normal depth (m)",
-    "select_target_Ycor": "Corresponding depth (m)",
-    "select_target_Ycon": "Conjugate depth (m)",
-    "select_target_J": "Head loss (m)",
-    "select_target_I-J": "Linear variation of specific head (m/m)",
-    "select_target_Imp": "Impulse (N)",
-    "select_target_Tau0": "Tractive force (Pa)"
+    "TARGET_none": "None",
+    "TARGET_Hs": "Head (m)",
+    "TARGET_Hsc": "Critical head (m)",
+    "TARGET_B": "Surface width (m)",
+    "TARGET_P": "Wetted perimeter (m)",
+    "TARGET_S": "Wetted area (m2)",
+    "TARGET_R": "Hydraulic radius (m)",
+    "TARGET_V": "Average speed (m/s)",
+    "TARGET_Fr": "Froude number",
+    "TARGET_Yc": "Critical depth (m)",
+    "TARGET_Yn": "Normal depth (m)",
+    "TARGET_Ycor": "Corresponding depth (m)",
+    "TARGET_Ycon": "Conjugate depth (m)",
+    "TARGET_J": "Head loss (m)",
+    "TARGET_I-J": "Linear variation of specific head (m/m)",
+    "TARGET_Imp": "Impulse (N)",
+    "TARGET_Tau0": "Tractive force (Pa)"
 }
\ No newline at end of file

src/app/calculators/courberemous/fr.json

@@ -2,10 +2,10 @@
     "fs_section": "Type de section",
     "select_section": "Choix du type de section",
 
-    "select_section_2": "Trapézoïdale",
-    "select_section_1": "Rectangulaire",
-    "select_section_0": "Circulaire",
-    "select_section_3": "Parabolique",
+    "SECTION_2": "Trapézoïdale",
+    "SECTION_1": "Rectangulaire",
+    "SECTION_0": "Circulaire",
+    "SECTION_3": "Parabolique",
 
     "LargeurFond": "Largeur au fond",
     "Fruit": "Fruit des berges",
@@ -42,27 +42,27 @@
     "UNIT_IMP": "N",
     "UNIT_TAU0": "Pa",
 
-    "select_resolution_0": "Intégration par trapèzes",
-    "select_resolution_1": "Runge Kutta d'ordre 4",
-    "select_resolution_2": "Euler explicite",
+    "RESOLUTION_0": "Intégration par trapèzes",
+    "RESOLUTION_1": "Runge Kutta d'ordre 4",
+    "RESOLUTION_2": "Euler explicite",
 
     "fs_target_data": "Donnée à calculer",
     "select_target": "Choix de la donnée à calculer",
-    "select_target_none": "Aucune",
-    "select_target_Hs": "La charge (m)",
-    "select_target_Hsc": "La charge critique (m)",
-    "select_target_B": "La largeur au miroir (m)",
-    "select_target_P": "Le périmètre mouillé (m)",
-    "select_target_S": "La surface mouillée (m2)",
-    "select_target_R": "Le rayon hydraulique (m)",
-    "select_target_V": "La vitesse moyenne (m/s)",
-    "select_target_Fr": "Le Froude",
-    "select_target_Yc": "Le tirant d'eau critique (m)",
-    "select_target_Yn": "Le tirant d'eau normal (m)",
-    "select_target_Ycor": "Le tirant d'eau correspondant (m)",
-    "select_target_Ycon": "Le tirant d'eau conjugué (m)",
-    "select_target_J": "La perte de charge (m)",
-    "select_target_I-J": "La variation linéaire de l'énergie spécifique (m/m)",
-    "select_target_Imp": "L'impulsion (N)",
-    "select_target_Tau0": "La force tractrice (Pa)"
+    "TARGET_none": "Aucune",
+    "TARGET_Hs": "La charge (m)",
+    "TARGET_Hsc": "La charge critique (m)",
+    "TARGET_B": "La largeur au miroir (m)",
+    "TARGET_P": "Le périmètre mouillé (m)",
+    "TARGET_S": "La surface mouillée (m2)",
+    "TARGET_R": "Le rayon hydraulique (m)",
+    "TARGET_V": "La vitesse moyenne (m/s)",
+    "TARGET_Fr": "Le Froude",
+    "TARGET_Yc": "Le tirant d'eau critique (m)",
+    "TARGET_Yn": "Le tirant d'eau normal (m)",
+    "TARGET_Ycor": "Le tirant d'eau correspondant (m)",
+    "TARGET_Ycon": "Le tirant d'eau conjugué (m)",
+    "TARGET_J": "La perte de charge (m)",
+    "TARGET_I-J": "La variation linéaire de l'énergie spécifique (m/m)",
+    "TARGET_Imp": "L'impulsion (N)",
+    "TARGET_Tau0": "La force tractrice (Pa)"
 }
\ No newline at end of file

src/app/calculators/grille/config.json

@@ -19,7 +19,7 @@
         "type": "fieldset",
         "fields": [
             {
-                "id": "select_grid_type",
+                "id": "select_gridtype",
                 "type": "select",
                 "property": "gridType",
                 "default": "Conventional",
@@ -46,7 +46,7 @@
         "type": "fieldset",
         "fields": [
             {
-                "id": "select_grid_profile",
+                "id": "select_gridprofile",
                 "type": "select",
                 "property": "gridProfile",
                 "default": "Rectangular",
@@ -91,7 +91,7 @@
     },
     {
         "type": "options",
-        "selectIds": [ "select_grid_type", "select_grid_profile" ],
+        "selectIds": [ "select_gridtype", "select_gridprofile" ],
         "help": "devalaison/grille.html",
         "resultsHelp": {
             "VAPDG": "devalaison/grille.html#vitesse-dapproche-moyenne-pour-le-debit-maximum-turbine-en-soustrayant-la-partie-superieure-eventuellement-obturee",

src/app/calculators/grille/en.json

@@ -19,16 +19,16 @@
     "OEntH": "Effective obstruction due to spacers and transversal elements",
     "cIncl": "Average shape coefficient of spacers and transversal elements",
 
-    "select_grid_type": "Grid type",
-    "select_grid_profile": "Bars profile",
+    "select_gridtype": "Grid type",
+    "select_gridprofile": "Bars profile",
 
-    "select_grid_type_0": "Conventional",
-    "select_grid_type_1": "Oriented",
-    "select_grid_type_2": "Inclined",
+    "GRIDTYPE_0": "Conventional",
+    "GRIDTYPE_1": "Oriented",
+    "GRIDTYPE_2": "Inclined",
 
-    "select_grid_profile_0": "Rectangular",
-    "select_grid_profile_1": "Hydrodynamic",
-    "select_grid_profile_2": "Custom",
+    "GRIDPROFILE_0": "Rectangular",
+    "GRIDPROFILE_1": "Hydrodynamic",
+    "GRIDPROFILE_2": "Custom",
 
     "H": "Water height",
     "HG": "Grid  height",

src/app/calculators/grille/fr.json

@@ -19,16 +19,16 @@
     "OEntH": "Obstruction effective due aux entretoises et éléments transversaux",
     "cIncl": "Coefficient de forme moyen des entretoises et éléments transversaux",
 
-    "select_grid_type": "Type de grille",
-    "select_grid_profile": "Profil des barreaux",
+    "select_gridtype": "Type de grille",
+    "select_gridprofile": "Profil des barreaux",
 
-    "select_grid_type_0": "Conventionnelle",
-    "select_grid_type_1": "Orientée",
-    "select_grid_type_2": "Inclinée",
+    "GRIDTYPE_0": "Conventionnelle",
+    "GRIDTYPE_1": "Orientée",
+    "GRIDTYPE_2": "Inclinée",
 
-    "select_grid_profile_0": "Rectangulaire",
-    "select_grid_profile_1": "Hydrodynamique",
-    "select_grid_profile_2": "Personnalisé",
+    "GRIDPROFILE_0": "Rectangulaire",
+    "GRIDPROFILE_1": "Hydrodynamique",
+    "GRIDPROFILE_2": "Personnalisé",
 
     "H": "Hauteur d'eau",
     "HG": "Hauteur de grille",

src/app/calculators/macrorugocompound/config.json

@@ -33,7 +33,7 @@
         "type": "fieldset",
         "fields": [
             {
-                "id": "select_pass_type",
+                "id": "select_passtype",
                 "type": "select",
                 "property": "inclinedApron"
             },
@@ -61,7 +61,7 @@
     {
         "type": "options",
         "idCal": "Q",
-        "selectIds": [ "select_pass_type" ],
+        "selectIds": [ "select_passtype" ],
         "help": "pam/macrorugo_complexe.html"
     }
 ]
\ No newline at end of file

src/app/calculators/macrorugocompound/en.json

@@ -6,7 +6,7 @@
     "macrorugo_container": "Aprons",
     "fs_macrorugo": "Apron",
 
-    "select_pass_type": "Pass type",
+    "select_passtype": "Pass type",
     "If": "Slope",
     "Ks": "Bottom roughness",
     "C": "Block concentration",
@@ -21,8 +21,8 @@
     "Y": "Water depth",
     "xCenter": "Mid-apron abscissa",
 
-    "select_pass_type_0": "Multiple aprons",
-    "select_pass_type_1": "Inclined apron",
+    "PASSTYPE_0": "Multiple aprons",
+    "PASSTYPE_1": "Inclined apron",
 
     "UNIT_Q": "m³/s",
     "UNIT_PV": "W/m³",

src/app/calculators/macrorugocompound/fr.json

@@ -6,7 +6,7 @@
     "macrorugo_container": "Radiers",
     "fs_macrorugo": "Radier",
 
-    "select_pass_type": "Type de passe",
+    "select_passtype": "Type de passe",
     "If": "Pente",
     "Ks": "Rugosité de fond",
     "C": "Concentration de blocs",
@@ -21,8 +21,8 @@
     "Y": "Profondeur",
     "xCenter": "Abscisse du milieu du radier",
 
-    "select_pass_type_0": "Radiers multiples",
-    "select_pass_type_1": "Radier incliné",
+    "PASSTYPE_0": "Radiers multiples",
+    "PASSTYPE_1": "Radier incliné",
 
     "UNIT_Q": "m³/s",
     "UNIT_PV": "W/m³",

src/app/calculators/regimeuniforme/en.json

@@ -2,10 +2,10 @@
     "fs_section": "Type of section",
     "select_section": "Choice of section type",
 
-    "select_section_2": "Trapezoidal",
-    "select_section_1": "Rectangular",
-    "select_section_0": "Circular",
-    "select_section_3": "Parabolic",
+    "SECTION_2": "Trapezoidal",
+    "SECTION_1": "Rectangular",
+    "SECTION_0": "Circular",
+    "SECTION_3": "Parabolic",
 
     "LargeurFond": "Width at bottom",
     "Fruit": "Bank slope",

src/app/calculators/regimeuniforme/fr.json

@@ -2,10 +2,10 @@
     "fs_section": "Type de section",
     "select_section": "Choix du type de section",
 
-    "select_section_2": "Trapézoïdale",
-    "select_section_1": "Rectangulaire",
-    "select_section_0": "Circulaire",
-    "select_section_3": "Parabolique",
+    "SECTION_2": "Trapézoïdale",
+    "SECTION_1": "Rectangulaire",
+    "SECTION_0": "Circulaire",
+    "SECTION_3": "Parabolique",
 
     "LargeurFond": "Largeur au fond",
     "Fruit": "Fruit des berges",

src/app/calculators/sectionparametree/en.json

@@ -2,10 +2,10 @@
     "fs_section": "Type of section",
     "select_section": "Choice of section type",
 
-    "select_section_2": "Trapezoidal",
-    "select_section_1": "Rectangular",
-    "select_section_0": "Circular",
-    "select_section_3": "Parabolic",
+    "SECTION_2": "Trapezoidal",
+    "SECTION_1": "Rectangular",
+    "SECTION_0": "Circular",
+    "SECTION_3": "Parabolic",
 
     "LargeurFond": "Width at bottom",
     "Fruit": "Bank slope",

src/app/calculators/sectionparametree/fr.json

@@ -2,10 +2,10 @@
     "fs_section": "Type de section",
     "select_section": "Choix du type de section",
 
-    "select_section_2": "Trapézoïdale",
-    "select_section_1": "Rectangulaire",
-    "select_section_0": "Circulaire",
-    "select_section_3": "Parabolique",
+    "SECTION_2": "Trapézoïdale",
+    "SECTION_1": "Rectangulaire",
+    "SECTION_0": "Circulaire",
+    "SECTION_3": "Parabolique",
 
     "LargeurFond": "Largeur au fond",
     "Fruit": "Fruit des berges",

src/app/calculators/spp/config.json

@@ -4,7 +4,7 @@
         "type": "fieldset",
         "fields": [
             {
-                "id": "select_spp_operation",
+                "id": "select_sppoperation",
                 "type": "select",
                 "property": "sppOperation",
                 "default": "SUM"
@@ -32,7 +32,7 @@
     {
         "type": "options",
         "idCal": "Y",
-        "selectIds": [ "select_spp_operation" ],
+        "selectIds": [ "select_sppoperation" ],
         "_help": "util/spp.html"
     }
 ]
\ No newline at end of file

src/app/calculators/spp/en.json

 {
     "fs_spp": "Parameters",
 
-    "select_spp_operation": "Operation",
-    "select_spp_operation_0": "Sum",
-    "select_spp_operation_1": "Product",
+    "select_sppoperation": "Operation",
+    "SPPOPERATION_0": "Sum",
+    "SPPOPERATION_1": "Product",
 
     "Y": "Y",
 

src/app/calculators/spp/fr.json

 {
     "fs_spp": "Paramètres",
 
-    "select_spp_operation": "Opération",
-    "select_spp_operation_0": "Somme",
-    "select_spp_operation_1": "Produit",
+    "select_sppoperation": "Opération",
+    "SPPOPERATION_0": "Somme",
+    "SPPOPERATION_1": "Produit",
 
     "Y": "Y",
 

src/app/calculators/trigo/en.json

@@ -2,16 +2,16 @@
     "fs_trigo": "Trigonometric parameters",
 
     "select_operation": "Operation",
-    "select_operation_0": "cos",
-    "select_operation_1": "sin",
-    "select_operation_2": "tan",
-    "select_operation_3": "cosh",
-    "select_operation_4": "sinh",
-    "select_operation_5": "tanh",
+    "OPERATION_0": "cos",
+    "OPERATION_1": "sin",
+    "OPERATION_2": "tan",
+    "OPERATION_3": "cosh",
+    "OPERATION_4": "sinh",
+    "OPERATION_5": "tanh",
 
     "select_unit": "Unit",
-    "select_unit_0": "Degrees",
-    "select_unit_1": "Radians",
+    "UNIT_0": "Degrees",
+    "UNIT_1": "Radians",
 
     "fs_params": "Equation parameters",
 

src/app/calculators/trigo/fr.json

@@ -2,16 +2,16 @@
     "fs_trigo": "Paramètres trigonométriques",
 
     "select_operation": "Opération",
-    "select_operation_0": "cos",
-    "select_operation_1": "sin",
-    "select_operation_2": "tan",
-    "select_operation_3": "cosh",
-    "select_operation_4": "sinh",
-    "select_operation_5": "tanh",
+    "OPERATION_0": "cos",
+    "OPERATION_1": "sin",
+    "OPERATION_2": "tan",
+    "OPERATION_3": "cosh",
+    "OPERATION_4": "sinh",
+    "OPERATION_5": "tanh",
 
     "select_unit": "Unité",
-    "select_unit_0": "Degrés",
-    "select_unit_1": "Radians",
+    "UNIT_0": "Degrés",
+    "UNIT_1": "Radians",
 
     "fs_params": "Paramètres de l'équation",