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
8ad77bad
Commit
8ad77bad
authored
6 years ago
by
mathias.chouet
Browse files
Options
Downloads
Patches
Plain Diff
Traduction des libellés de valeurs liées
parent
95d14ff0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!40
Resolve "Amélioration du système de paramètres liés"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/components/param-link/param-link.component.ts
+21
-5
21 additions, 5 deletions
src/app/components/param-link/param-link.component.ts
src/locale/messages.en.json
+5
-0
5 additions, 0 deletions
src/locale/messages.en.json
src/locale/messages.fr.json
+5
-0
5 additions, 0 deletions
src/locale/messages.fr.json
with
31 additions
and
5 deletions
src/app/components/param-link/param-link.component.ts
+
21
−
5
View file @
8ad77bad
...
...
@@ -6,6 +6,7 @@ import { LinkedValue, ParamValueMode, Observer, Structure } from "jalhyd";
import
{
FormulaireService
}
from
"
../../services/formulaire/formulaire.service
"
;
import
{
I18nService
}
from
"
../../services/internationalisation/internationalisation.service
"
;
import
{
FormulaireDefinition
}
from
"
../../formulaire/definition/form-definition
"
;
import
{
sprintf
}
from
"
sprintf-js
"
;
@
Component
({
selector
:
"
param-link
"
,
...
...
@@ -112,23 +113,38 @@ export class ParamLinkComponent implements OnChanges, Observer, OnDestroy {
p
=
i
.
nub
.
findPositionInParent
();
if
(
i
.
isResult
())
{
// résultat d'ouvrage
return
`
${
s
}
(résultat de
${
c
}
, ouvrage
${
p
+
1
}
)`
;
return
sprintf
(
this
.
intlService
.
localizeText
(
"
INFO_LINKED_VALUE_DEVICE_RESULT
"
),
s
,
c
,
(
p
+
1
)
);
}
else
{
// paramètre d'ouvrage
return
`
${
s
}
(
${
c
}
, ouvrage
${
p
+
1
}
)`
;
return
sprintf
(
this
.
intlService
.
localizeText
(
"
INFO_LINKED_VALUE_DEVICE
"
),
s
,
c
,
(
p
+
1
)
);
}
}
else
// 2. Résultat
if
(
i
.
isResult
())
{
return
`
${
s
}
(résultat de
${
c
}
)`
;
return
sprintf
(
this
.
intlService
.
localizeText
(
"
INFO_LINKED_VALUE_RESULT
"
),
s
,
c
);
}
else
// 3. Résultat complémentaire
if
(
i
.
isExtraResult
())
{
if
(
i
.
meta
[
"
result
"
])
{
// @TODO not used ?
return
`
${
s
}
(
${
c
}
, résultat complémentaire de
${
i
.
meta
[
"
result
"
]}
)`
;
return
sprintf
(
this
.
intlService
.
localizeText
(
"
INFO_LINKED_VALUE_EXTRA_RESULT_OF
"
),
s
,
c
,
i
.
meta
[
"
result
"
]
);
}
else
{
return
`
${
s
}
(
${
c
}
, résultat complémentaire)`
;
return
sprintf
(
this
.
intlService
.
localizeText
(
"
INFO_LINKED_VALUE_EXTRA_RESULT
"
),
s
,
c
);
}
}
else
{
// 4. Paramètre (cas général)
...
...
This diff is collapsed.
Click to expand it.
src/locale/messages.en.json
+
5
−
0
View file @
8ad77bad
...
...
@@ -127,6 +127,11 @@
"INFO_LIB_ZDV"
:
"Crest weir elevation or gate base"
,
"INFO_LIB_ZRAM"
:
"Upstream apron elevation"
,
"INFO_LIB_ZT"
:
"Triangle top elevation"
,
"INFO_LINKED_VALUE_DEVICE"
:
"%s (%s, device %s)"
,
"INFO_LINKED_VALUE_RESULT"
:
"%s (result of %s)"
,
"INFO_LINKED_VALUE_DEVICE_RESULT"
:
"%s (result of %s, device %s)"
,
"INFO_LINKED_VALUE_EXTRA_RESULT"
:
"%s (%s, extra result)"
,
"INFO_LINKED_VALUE_EXTRA_RESULT_OF"
:
"%s (%s, extra result of %s)"
,
"INFO_MACRORUGO_TITRE"
:
"Rock-ramp fishpasses"
,
"INFO_MACRORUGO_TITRE_COURT"
:
"RR fishpasses"
,
"INFO_MENU_HELP_TITLE"
:
"Help"
,
...
...
This diff is collapsed.
Click to expand it.
src/locale/messages.fr.json
+
5
−
0
View file @
8ad77bad
...
...
@@ -127,6 +127,11 @@
"INFO_LIB_ZDV"
:
"Cote de la crête du déversoir ou du radier de la vanne"
,
"INFO_LIB_ZRAM"
:
"Cote du radier amont"
,
"INFO_LIB_ZT"
:
"Cote haute du triangle"
,
"INFO_LINKED_VALUE_DEVICE"
:
"%s (%s, ouvrage %s)"
,
"INFO_LINKED_VALUE_RESULT"
:
"%s (résultat de %s)"
,
"INFO_LINKED_VALUE_DEVICE_RESULT"
:
"%s (résultat de %s, ouvrage %s)"
,
"INFO_LINKED_VALUE_EXTRA_RESULT"
:
"%s (%s, résultat complémentaire)"
,
"INFO_LINKED_VALUE_EXTRA_RESULT_OF"
:
"%s (%s, résultat complémentaire de %s)"
,
"INFO_MENU_HELP_TITLE"
:
"Aide"
,
"INFO_MENU_LOAD_SESSION_TITLE"
:
"Charger une session"
,
"INFO_MENU_SAVE_SESSION_TITLE"
:
"Enregistrer la session"
,
...
...
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