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
18888b54
Commit
18888b54
authored
Jan 12, 2022
by
Hamza HRAMCHI
Browse files
FIX #19424 TIME 0:10 hide the message Waiting for receipt if acknowledgment of receipt
parent
f3968208
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/frontend/app/sentResource/sent-resource-list.component.html
View file @
18888b54
...
...
@@ -27,8 +27,8 @@
<span
*ngIf=
"row.status === 'DRAFT'"
style=
"flex:1;color:orange"
>
{{'lang.draft' | translate}}
</span>
<span
*ngIf=
"row.sendDate === null && row.status === 'SENT'"
style=
"flex:1;color:orange"
>
En attente de réception
<span
*ngIf=
"row.sendDate === null && row.status === 'SENT'
&& row.type !== 'm2m_ARCHIVETRANSFER'
"
style=
"flex:1;color:orange"
>
{{'lang.waitingReception' | translate}}
</span>
<span
*ngIf=
"row.status === 'WAITING'"
style=
"flex:1;color:orange;font-weight: bold;"
>
{{'lang.emailSendInProgress' | translate}}
...
...
src/lang/lang-en.json
View file @
18888b54
...
...
@@ -2233,5 +2233,6 @@
"userPasswordMaarch2Maarch"
:
"User password"
,
"userIdMaarch2MaarchDesc"
:
"User ID with a web service account"
,
"userPasswordMaarch2MaarchDesc"
:
"User password with a web service account"
,
"m2mEmailDesc"
:
"Used as part of an <b> indirect connection </b> between applications (use of mailings for digital fold)"
"m2mEmailDesc"
:
"Used as part of an <b> indirect connection </b> between applications (use of mailings for digital fold)"
,
"waitingReception"
:
"Waiting for reception"
}
\ No newline at end of file
src/lang/lang-fr.json
View file @
18888b54
...
...
@@ -2245,5 +2245,6 @@
"userPasswordMaarch2Maarch"
:
"Mot de passe de l'utilisateur"
,
"userIdMaarch2MaarchDesc"
:
"Identifiant de l'utilisateur avec un compte webservice"
,
"userPasswordMaarch2MaarchDesc"
:
"Mot de passe de l'utilisateur avec un compte webservice"
,
"m2mEmailDesc"
:
"Utilisé dans le cadre d'une connexion indirecte entre les applications (utilisation des envois de mail pour le pli numérique)"
"m2mEmailDesc"
:
"Utilisé dans le cadre d'une connexion indirecte entre les applications (utilisation des envois de mail pour le pli numérique)"
,
"waitingReception"
:
"En attente de réception"
}
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