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
Show more breadcrumbs
Cassiopée
nghyd
Commits
f9d4de5c
Commit
f9d4de5c
authored
4 years ago
by
mathias.chouet
Browse files
Options
Downloads
Patches
Plain Diff
Update config and translation for
jalhyd#239
parent
d67e7759
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!82
Resolve "Ajout de la fonctionnalité "Respect des critères""
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/calculators/espece/config.json
+5
-1
5 additions, 1 deletion
src/app/calculators/espece/config.json
src/locale/messages.en.json
+3
-0
3 additions, 0 deletions
src/locale/messages.en.json
src/locale/messages.fr.json
+3
-0
3 additions, 0 deletions
src/locale/messages.fr.json
with
11 additions
and
1 deletion
src/app/calculators/espece/config.json
+
5
−
1
View file @
f9d4de5c
...
...
@@ -4,7 +4,11 @@
"type"
:
"fieldset"
,
"fields"
:
[
{
"id"
:
"PVMax"
,
"id"
:
"PVMaxPrec"
,
"allowEmpty"
:
true
},
{
"id"
:
"PVMaxLim"
,
"allowEmpty"
:
true
}
]
...
...
This diff is collapsed.
Click to expand it.
src/locale/messages.en.json
+
3
−
0
View file @
f9d4de5c
...
...
@@ -364,6 +364,8 @@
"INFO_LIB_YMINSB"
:
"Minimal water level on superactive baffles"
,
"INFO_LIB_YMINPB"
:
"Minimal water level on plane baffles"
,
"INFO_LIB_PVMAX"
:
"Maximal dissipated power"
,
"INFO_LIB_PVMAXPREC"
:
"Recommanded maximal dissipated power"
,
"INFO_LIB_PVMAXLIM"
:
"Limit maximal dissipated power"
,
"INFO_LIB_PAB_CHART_SEUILS"
:
"Weirs (%s)"
,
"INFO_LINKED_VALUE_CHILD"
:
"%s (%s, %s %s)"
,
"INFO_LINKED_VALUE_EXTRA_RESULT_OF"
:
"%s (%s)"
,
...
...
@@ -666,6 +668,7 @@
"ERROR_VERIF_PAR_YMIN"
:
"Water level %h% too low (minimum: %minY%)"
,
"ERROR_VERIF_KO"
:
"Crossability criteria are not met for at least one species group"
,
"ERROR_VERIF_VARYING_KO"
:
"Crossability criteria are not met for at least one species group, for all pass modalities"
,
"WARNING_VERIF_PAB_PVMAX"
:
"Wall #%N%: dissipated power %PV% very high (recommanded: %maxPV%)"
,
"ERROR_VERIF_SPECIES_GROUP_KO"
:
"Crossability criteria are not met for species group ENUM_%speciesGroup%"
,
"WARNING_VERIF_SPECIES_GROUP_OK_BUT"
:
"Crossability criteria are met for species group ENUM_%speciesGroup%, but there are warnings"
,
"INFO_VERIF_SPECIES_GROUP_OK"
:
"Crossability criteria are met for species group ENUM_%speciesGroup%"
,
...
...
This diff is collapsed.
Click to expand it.
src/locale/messages.fr.json
+
3
−
0
View file @
f9d4de5c
...
...
@@ -365,6 +365,8 @@
"INFO_LIB_YMINSB"
:
"Tirant d'eau minimal sur les ralentisseurs suractifs de fond"
,
"INFO_LIB_YMINPB"
:
"Tirant d'eau minimal sur les ralentisseurs plans"
,
"INFO_LIB_PVMAX"
:
"Puissance volumique dissipée maximale"
,
"INFO_LIB_PVMAXPREC"
:
"Puissance volumique dissipée maximale recommandée"
,
"INFO_LIB_PVMAXLIM"
:
"Puissance volumique dissipée maximale limite"
,
"INFO_LIB_PAB_CHART_SEUILS"
:
"Seuils (%s)"
,
"INFO_LINKED_VALUE_CHILD"
:
"%s (%s, %s %s)"
,
"INFO_LINKED_VALUE_EXTRA_RESULT_OF"
:
"%s (%s)"
,
...
...
@@ -670,6 +672,7 @@
"ERROR_VERIF_KO"
:
"Le franchissement est impossible pour au moins un groupe d'espèces"
,
"ERROR_VERIF_VARYING_KO"
:
"Le franchissement est impossible pour au moins un groupe d'espèces, pour toutes les modalités de la passe"
,
"ERROR_VERIF_SPECIES_GROUP_KO"
:
"ENUM_%speciesGroup% : franchissement impossible"
,
"WARNING_VERIF_PAB_PVMAX"
:
"Cloison n°%N% : puissance dissipée %PV% très élevée (recommandée : %maxPV%)"
,
"WARNING_VERIF_SPECIES_GROUP_OK_BUT"
:
"ENUM_%speciesGroup% : OK, avec des avertissements"
,
"INFO_VERIF_SPECIES_GROUP_OK"
:
"ENUM_%speciesGroup% : OK"
,
"ERROR_VERIF_SPECIES_NUB_KO"
:
"FORM_ID_%uid% : franchissement impossible"
,
...
...
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