Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
b420cdbe
Commit
b420cdbe
authored
Aug 25, 2021
by
Hamza HRAMCHI
Browse files
FIX #17812 TIME 0:05 wording
parent
7aba904d
Changes
6
Show whitespace changes
Inline
Side-by-side
src/frontend/app/actions/avis-continue-circuit-action/continue-avis-circuit-action.component.ts
View file @
b420cdbe
...
...
@@ -79,7 +79,7 @@ export class ContinueAvisCircuitActionComponent implements OnInit {
}
executeAction
(
realResSelected
:
number
[])
{
const
noteContent
:
string
=
`[
${
this
.
translate
.
instant
(
'
lang.
avis
UserState
'
)}
]
${
this
.
noteEditor
.
getNoteContent
()}
`
;
const
noteContent
:
string
=
`[
${
this
.
translate
.
instant
(
'
lang.
opinion
UserState
'
)}
]
${
this
.
noteEditor
.
getNoteContent
()}
`
;
this
.
noteEditor
.
setNoteContent
(
noteContent
);
this
.
http
.
put
(
this
.
data
.
processActionRoute
,
{
resources
:
realResSelected
,
note
:
this
.
noteEditor
.
getNote
()}).
pipe
(
tap
((
data
:
any
)
=>
{
...
...
src/frontend/app/actions/avis-give-parallel-action/give-avis-parallel-action.component.ts
View file @
b420cdbe
...
...
@@ -92,8 +92,8 @@ export class GiveAvisParallelActionComponent implements OnInit {
executeAction
(
realResSelected
:
number
[])
{
const
delegateMsg
:
string
=
this
.
translate
.
instant
(
'
lang.insteadOf
'
).
replace
(
/^.
{1}
/g
,
this
.
translate
.
instant
(
'
lang.insteadOf
'
)[
0
].
toLowerCase
());
const
avis
UserState
:
string
=
this
.
delegation
.
isDelegated
?
`
${
this
.
translate
.
instant
(
'
lang.
avis
UserState
'
).
toUpperCase
()}
${
delegateMsg
}
${
this
.
delegation
.
userDelegated
}
`
:
this
.
translate
.
instant
(
'
lang.
avis
UserState
'
);
const
noteContent
:
string
=
`[
${
avis
UserState
}
]
${
this
.
noteEditor
.
getNoteContent
()}
`
;
const
opinion
UserState
:
string
=
this
.
delegation
.
isDelegated
?
`
${
this
.
translate
.
instant
(
'
lang.
opinion
UserState
'
).
toUpperCase
()}
${
delegateMsg
}
${
this
.
delegation
.
userDelegated
}
`
:
this
.
translate
.
instant
(
'
lang.
opinion
UserState
'
);
const
noteContent
:
string
=
`[
${
opinion
UserState
}
]
${
this
.
noteEditor
.
getNoteContent
()}
`
;
this
.
noteEditor
.
setNoteContent
(
noteContent
);
this
.
http
.
put
(
this
.
data
.
processActionRoute
,
{
resources
:
realResSelected
,
note
:
this
.
noteEditor
.
getNote
()}).
pipe
(
tap
((
data
:
any
)
=>
{
...
...
src/frontend/app/notes/note-editor.component.ts
View file @
b420cdbe
...
...
@@ -56,7 +56,7 @@ export class NoteEditorComponent implements OnInit {
if
(
this
.
upMode
)
{
this
.
content
=
this
.
noteContent
;
if
(
this
.
content
.
startsWith
(
`[
${
this
.
translate
.
instant
(
'
lang.
avis
UserState
'
)}
]`
)
||
this
.
content
.
startsWith
(
`[
${
this
.
translate
.
instant
(
'
lang.avisUserAsk
'
).
toUpperCase
()}
]`
))
{
if
(
this
.
content
.
startsWith
(
`[
${
this
.
translate
.
instant
(
'
lang.
opinion
UserState
'
)}
]`
)
||
this
.
content
.
startsWith
(
`[
${
this
.
translate
.
instant
(
'
lang.avisUserAsk
'
).
toUpperCase
()}
]`
))
{
this
.
disableRestriction
=
true
;
}
this
.
entitiesRestriction
=
this
.
entitiesNoteRestriction
;
...
...
src/lang/lang-en.json
View file @
b420cdbe
...
...
@@ -206,7 +206,7 @@
"avisAnswerDesc"
:
"Allow this group to appear in the counsellor's list (sequential and parallel opinion workflow)"
,
"avisSent"
:
"Opinion given"
,
"avisUserAsk"
:
"for opinion"
,
"
avis
UserState"
:
"opinion"
,
"
opinion
UserState"
:
"opinion"
,
"avisWorkflowDeleted"
:
"Opinion workflow deleted"
,
"avisWorkflowUpdated"
:
"Opinion workflow updated"
,
"back"
:
"Back"
,
...
...
src/lang/lang-fr.json
View file @
b420cdbe
...
...
@@ -212,7 +212,7 @@
"avisAnswerDesc"
:
"Permet à ce groupe d'apparaître dans la liste des personnes pouvant donner son avis (parallèle et séquentiel)"
,
"avisSent"
:
"Avis donné"
,
"avisUserAsk"
:
"pour avis"
,
"
avis
UserState"
:
"avis"
,
"
opinion
UserState"
:
"avis"
,
"avisWorkflowDeleted"
:
"Circuit d'avis supprimé"
,
"avisWorkflowUpdated"
:
"Circuit d'avis modifié"
,
"back"
:
"Retour"
,
...
...
src/lang/lang-nl.json
View file @
b420cdbe
...
...
@@ -1471,7 +1471,7 @@
"askOpinion"
:
"Several users ask your opinion__TO_TRANSLATE"
,
"askOpinionUser"
:
"ask your opinion__TO_TRANSLATE"
,
"avisUserAsk"
:
"for opinion__TO_TRANSLATE"
,
"
avis
UserState"
:
"opinion__TO_TRANSLATE"
,
"
opinion
UserState"
:
"opinion__TO_TRANSLATE"
,
"userNotInDiffusionList"
:
"You are not in opinion diffusion list__TO_TRANSLATE"
,
"noOpinionLimitDate"
:
"The opinion limit date is not defined__TO_TRANSLATE"
,
"noOpinionNote"
:
"The reason is not defined__TO_TRANSLATE"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment