Skip to content

Commit

Permalink
fix: [DHIS2-17135][DHIS2-17018] Adjust strings for error messages (#3858
Browse files Browse the repository at this point in the history
)

* fix: string adjustment

* fix: disable button and add tooltip

* Revert "fix: disable button and add tooltip"

This reverts commit 8cfb4a6.

* fix: string improvement for record access error

* fix: string improvement

* fix: merge conflict

* fix: merge conflict
  • Loading branch information
henrikmv authored Nov 4, 2024
1 parent 2bbea47 commit 1d9ae57
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
16 changes: 10 additions & 6 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,12 @@ msgstr "There are no active enrollments."
msgid "Add new enrollment for {{teiDisplayName}} in this program."
msgstr "Add new enrollment for {{teiDisplayName}} in this program."

msgid "No access to program owner."
msgstr "No access to program owner."
msgid ""
"You do not have permissions to access to this program, registering unit or "
"record, contact your administrator for more information."
msgstr ""
"You do not have permissions to access to this program, registering unit or "
"record, contact your administrator for more information."

msgid "{{teiDisplayName}} is not enrolled in this program."
msgstr "{{teiDisplayName}} is not enrolled in this program."
Expand Down Expand Up @@ -1074,17 +1078,17 @@ msgstr "No tracked entity types available"
msgid "Assigned to"
msgstr "Assigned to"

msgid "You don't have access to edit this assignee"
msgstr "You don't have access to edit this assignee"
msgid "You don't have access to edit the assigned user"
msgstr "You don't have access to edit the assigned user"

msgid "Edit"
msgstr "Edit"

msgid "No one is assigned to this event"
msgstr "No one is assigned to this event"

msgid "You don't have access to assign an assignee"
msgstr "You don't have access to assign an assignee"
msgid "You don't have access to assign a user to this event"
msgstr "You don't have access to assign a user to this event"

msgid "Assign"
msgstr "Assign"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export const MissingMessage = withStyles(getStyles)(({
{
missingStatus === missingStatuses.RESTRICTED_PROGRAM_NO_ACCESS &&
<IncompleteSelectionsMessage>
{i18n.t('No access to program owner.')}
{i18n.t('You do not have permissions to access to this program, registering unit or record, contact your administrator for more information.')}
</IncompleteSelectionsMessage>
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const DisplayModePlain = ({ assignee, onEdit, writeAccess, avatarId, classes }:
{assignee.name}
</div>
<ConditionalTooltip
content={i18n.t("You don't have access to edit this assignee")}
content={i18n.t("You don't have access to edit the assigned user")}
enabled={!writeAccess}
>
<Button
Expand All @@ -63,7 +63,7 @@ const DisplayModePlain = ({ assignee, onEdit, writeAccess, avatarId, classes }:
<div className={classes.wrapper}>
{i18n.t('No one is assigned to this event')}
<ConditionalTooltip
content={i18n.t("You don't have access to assign an assignee")}
content={i18n.t("You don't have access to assign a user to this event")}
enabled={!writeAccess}
>
<Button
Expand Down

0 comments on commit 1d9ae57

Please sign in to comment.