Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nghyd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
A compter du 1er avril, attention à vos pipelines :
Nouvelles limitations de Docker Hub
Show more breadcrumbs
Cassiopée
nghyd
Commits
af144b01
Commit
af144b01
authored
6 years ago
by
francois.grand
Browse files
Options
Downloads
Patches
Plain Diff
#77
correction des unités pour la charge spécifique, critique, etc...
parent
bf604c8e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!15
Resolve "faire les modifications nécessaires prendre en compte le ticket cassiopee/jalhyd#46 (Gestion de la session dans la lib)"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/calculators/remous/remous.fr.json
+2
-2
2 additions, 2 deletions
src/app/calculators/remous/remous.fr.json
src/locale/error_messages.en.json
+16
-16
16 additions, 16 deletions
src/locale/error_messages.en.json
src/locale/error_messages.fr.json
+16
-16
16 additions, 16 deletions
src/locale/error_messages.fr.json
with
34 additions
and
34 deletions
src/app/calculators/remous/remous.fr.json
+
2
−
2
View file @
af144b01
...
@@ -48,6 +48,6 @@
...
@@ -48,6 +48,6 @@
"select_target_Yco"
:
"Le tirant d'eau conjugué (m)"
,
"select_target_Yco"
:
"Le tirant d'eau conjugué (m)"
,
"select_target_J"
:
"La perte de charge (m)"
,
"select_target_J"
:
"La perte de charge (m)"
,
"select_target_I-J"
:
"Variation linéaire de l'énergie spécifique (m/m)"
,
"select_target_I-J"
:
"Variation linéaire de l'énergie spécifique (m/m)"
,
"select_target_Imp"
:
"Impulsion (
m/m
)"
,
"select_target_Imp"
:
"Impulsion (
N
)"
,
"select_target_Tau0"
:
"La force tractrice (
N
)"
"select_target_Tau0"
:
"La force tractrice (
Pa
)"
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/locale/error_messages.en.json
+
16
−
16
View file @
af144b01
...
@@ -43,23 +43,23 @@
...
@@ -43,23 +43,23 @@
"INFO_LECHAPT_TITRE"
:
"Lechapt-Calmon"
,
"INFO_LECHAPT_TITRE"
:
"Lechapt-Calmon"
,
"INFO_REGUNI_TITRE"
:
"Uniform flow calculation"
,
"INFO_REGUNI_TITRE"
:
"Uniform flow calculation"
,
"INFO_SECTPARAM_TITRE"
:
"Parametric section"
,
"INFO_SECTPARAM_TITRE"
:
"Parametric section"
,
"INFO_GRANDEUR_HS"
:
"Specific head"
,
"INFO_GRANDEUR_HS"
:
"Specific head
(m)
"
,
"INFO_GRANDEUR_HSC"
:
"Critical head"
,
"INFO_GRANDEUR_HSC"
:
"Critical head
(m)
"
,
"INFO_GRANDEUR_B"
:
"Surface width"
,
"INFO_GRANDEUR_B"
:
"Surface width
(m)
"
,
"INFO_GRANDEUR_P"
:
"Wetted perimeter"
,
"INFO_GRANDEUR_P"
:
"Wetted perimeter
(m)
"
,
"INFO_GRANDEUR_S"
:
"Wetted area"
,
"INFO_GRANDEUR_S"
:
"Wetted area
(m2)
"
,
"INFO_GRANDEUR_R"
:
"Hydraulic radius"
,
"INFO_GRANDEUR_R"
:
"Hydraulic radius
(m)
"
,
"INFO_GRANDEUR_V"
:
"Average speed"
,
"INFO_GRANDEUR_V"
:
"Average speed
(m/s)
"
,
"INFO_GRANDEUR_FR"
:
"Froude number"
,
"INFO_GRANDEUR_FR"
:
"Froude number"
,
"INFO_GRANDEUR_YC"
:
"Critical depth"
,
"INFO_GRANDEUR_YC"
:
"Critical depth
(m)
"
,
"INFO_GRANDEUR_YN"
:
"Normal depth"
,
"INFO_GRANDEUR_YN"
:
"Normal depth
(m)
"
,
"INFO_GRANDEUR_YF"
:
"Subcritical depth"
,
"INFO_GRANDEUR_YF"
:
"Subcritical depth
(m)
"
,
"INFO_GRANDEUR_YT"
:
"Supercritical depth"
,
"INFO_GRANDEUR_YT"
:
"Supercritical depth
(m)
"
,
"INFO_GRANDEUR_YCO"
:
"Conjugate depth"
,
"INFO_GRANDEUR_YCO"
:
"Conjugate depth
(m)
"
,
"INFO_GRANDEUR_J"
:
"Head loss"
,
"INFO_GRANDEUR_J"
:
"Head loss
(m)
"
,
"INFO_GRANDEUR_I-J"
:
"Linear variation of specific head"
,
"INFO_GRANDEUR_I-J"
:
"Linear variation of specific head
(m/m)
"
,
"INFO_GRANDEUR_IMP"
:
"Impulse"
,
"INFO_GRANDEUR_IMP"
:
"Impulse
(N)
"
,
"INFO_GRANDEUR_TAU0"
:
"Tractive force"
,
"INFO_GRANDEUR_TAU0"
:
"Tractive force
(Pa)
"
,
"INFO_REMOUS_TITRE"
:
"Backwater curves"
,
"INFO_REMOUS_TITRE"
:
"Backwater curves"
,
"INFO_REMOUSRESULTS_TITREJOURNAL"
:
"Calculation log"
,
"INFO_REMOUSRESULTS_TITREJOURNAL"
:
"Calculation log"
,
"INFO_REMOUSRESULTS_LIGNEFLUVIALE"
:
"Subcritical water profile"
,
"INFO_REMOUSRESULTS_LIGNEFLUVIALE"
:
"Subcritical water profile"
,
...
...
This diff is collapsed.
Click to expand it.
src/locale/error_messages.fr.json
+
16
−
16
View file @
af144b01
...
@@ -49,23 +49,23 @@
...
@@ -49,23 +49,23 @@
"INFO_LECHAPT_TITRE"
:
"Lechapt-Calmon"
,
"INFO_LECHAPT_TITRE"
:
"Lechapt-Calmon"
,
"INFO_REGUNI_TITRE"
:
"Régime uniforme"
,
"INFO_REGUNI_TITRE"
:
"Régime uniforme"
,
"INFO_SECTPARAM_TITRE"
:
"Section paramétrée"
,
"INFO_SECTPARAM_TITRE"
:
"Section paramétrée"
,
"INFO_GRANDEUR_HS"
:
"La charge spécifique"
,
"INFO_GRANDEUR_HS"
:
"La charge spécifique
(m)
"
,
"INFO_GRANDEUR_HSC"
:
"La charge critique"
,
"INFO_GRANDEUR_HSC"
:
"La charge critique
(m)
"
,
"INFO_GRANDEUR_B"
:
"La largeur au miroir"
,
"INFO_GRANDEUR_B"
:
"La largeur au miroir
(m)
"
,
"INFO_GRANDEUR_P"
:
"Le périmètre mouillé"
,
"INFO_GRANDEUR_P"
:
"Le périmètre mouillé
(m)
"
,
"INFO_GRANDEUR_S"
:
"La surface mouillée"
,
"INFO_GRANDEUR_S"
:
"La surface mouillée
(m2)
"
,
"INFO_GRANDEUR_R"
:
"Le rayon hydraulique"
,
"INFO_GRANDEUR_R"
:
"Le rayon hydraulique
(m)
"
,
"INFO_GRANDEUR_V"
:
"La vitesse moyenne"
,
"INFO_GRANDEUR_V"
:
"La vitesse moyenne
(m/s)
"
,
"INFO_GRANDEUR_FR"
:
"Le Froude"
,
"INFO_GRANDEUR_FR"
:
"Le Froude"
,
"INFO_GRANDEUR_YC"
:
"Le tirant d'eau critique"
,
"INFO_GRANDEUR_YC"
:
"Le tirant d'eau critique
(m)
"
,
"INFO_GRANDEUR_YN"
:
"Le tirant d'eau normal"
,
"INFO_GRANDEUR_YN"
:
"Le tirant d'eau normal
(m)
"
,
"INFO_GRANDEUR_YF"
:
"Le tirant d'eau fluvial"
,
"INFO_GRANDEUR_YF"
:
"Le tirant d'eau fluvial
(m)
"
,
"INFO_GRANDEUR_YT"
:
"Le tirant d'eau torrentiel"
,
"INFO_GRANDEUR_YT"
:
"Le tirant d'eau torrentiel
(m)
"
,
"INFO_GRANDEUR_YCO"
:
"Le tirant d'eau conjugué"
,
"INFO_GRANDEUR_YCO"
:
"Le tirant d'eau conjugué
(m)
"
,
"INFO_GRANDEUR_J"
:
"La perte de charge"
,
"INFO_GRANDEUR_J"
:
"La perte de charge
(m)
"
,
"INFO_GRANDEUR_I-J"
:
"Variation linéaire de l'énergie spécifique"
,
"INFO_GRANDEUR_I-J"
:
"Variation linéaire de l'énergie spécifique
(m/m)
"
,
"INFO_GRANDEUR_IMP"
:
"Impulsion"
,
"INFO_GRANDEUR_IMP"
:
"Impulsion
(N)
"
,
"INFO_GRANDEUR_TAU0"
:
"La force tractrice"
,
"INFO_GRANDEUR_TAU0"
:
"La force tractrice
(Pa)
"
,
"INFO_REMOUS_TITRE"
:
"Courbes de remous"
,
"INFO_REMOUS_TITRE"
:
"Courbes de remous"
,
"INFO_REMOUSRESULTS_TITREJOURNAL"
:
"Journal de calcul"
,
"INFO_REMOUSRESULTS_TITREJOURNAL"
:
"Journal de calcul"
,
"INFO_REMOUSRESULTS_LIGNEFLUVIALE"
:
"Ligne d'eau fluviale"
,
"INFO_REMOUSRESULTS_LIGNEFLUVIALE"
:
"Ligne d'eau fluviale"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment