From 77231bd68c6627b555b5ce8517992f96d34fa484 Mon Sep 17 00:00:00 2001 From: Erik Jan de Wit Date: Mon, 21 Oct 2024 10:34:44 +0200 Subject: [PATCH] always try and translate the error message Signed-off-by: Erik Jan de Wit --- .../keycloak.v3/account/messages/messages_en.properties | 4 ++-- .../maven-resources/theme/keycloak.v2/admin/index.ftl | 2 ++ .../keycloak.v2/admin/messages/messages_en.properties | 9 ++++++++- js/libs/ui-shared/src/context/ErrorPage.tsx | 3 +-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/js/apps/account-ui/maven-resources/theme/keycloak.v3/account/messages/messages_en.properties b/js/apps/account-ui/maven-resources/theme/keycloak.v3/account/messages/messages_en.properties index 2fa1c76472..fbede00034 100644 --- a/js/apps/account-ui/maven-resources/theme/keycloak.v3/account/messages/messages_en.properties +++ b/js/apps/account-ui/maven-resources/theme/keycloak.v3/account/messages/messages_en.properties @@ -75,7 +75,6 @@ linkedAccounts=Linked accounts personalInfoDescription=Manage your basic information removeAccess=Remove access signingInDescription=Configure ways to sign in. -somethingWentWrongDescription=Sorry, an unexpected error has occurred. personalInfo=Personal info removeCred=Remove {{name}} signOutAllDevices=Sign out all devices @@ -98,10 +97,11 @@ permissionRequest=Permission requests - {{name}} add=Add error-invalid-value='{{0}}' has invalid value. somethingWentWrong=Something went wrong +somethingWentWrongDescription=Sorry, an unexpected error has occurred. +tryAgain=Try again rolesScope=If there is no role scope mapping defined, each user is permitted to use this client scope. If there are role scope mappings defined, the user must be a member of at least one of the roles. unShareError=Could not un-share the resource due to\: {{error}} ipAddress=IP address -tryAgain=Try again resourceName=Resource name unlinkedEmpty=No unlinked providers done=Done diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/index.ftl b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/index.ftl index acc7cbcded..eacd4a84e8 100644 --- a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/index.ftl +++ b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/index.ftl @@ -15,6 +15,8 @@ body, #app { height: 100%; + overflow-x: hidden; + overflow-y: hidden; } .container { diff --git a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties index aa6a4580ec..1497862548 100644 --- a/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties +++ b/js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties @@ -3273,8 +3273,15 @@ groupDuplicated=Group duplicated duplicateAGroup=Duplicate group couldNotFetchClientRoleMappings=Could not fetch client role mappings\: {{error}} duplicateGroupWarning=Duplication of groups with a large number of subgroups is not supported. Please ensure that the group you are duplicating does not have a large number of subgroups. +<<<<<<< HEAD showMemberships=Show memberships showMembershipsTitle={{username}} Group Memberships noGroupMembershipsText=This user is not a member of any groups. noGroupMemberships=No memberships -termsAndConditionsDeclined=You need to accept the Terms and Conditions to continue \ No newline at end of file +termsAndConditionsDeclined=You need to accept the Terms and Conditions to continue +======= +termsAndConditionsDeclined=You need to accept the Terms and Conditions to continue +somethingWentWrong=Something went wrong +somethingWentWrongDescription=Sorry, an unexpected error has occurred. +tryAgain=Try again +>>>>>>> a163063cc4 (always try and translate the error message) diff --git a/js/libs/ui-shared/src/context/ErrorPage.tsx b/js/libs/ui-shared/src/context/ErrorPage.tsx index 402aa4afcd..5035e7ec8c 100644 --- a/js/libs/ui-shared/src/context/ErrorPage.tsx +++ b/js/libs/ui-shared/src/context/ErrorPage.tsx @@ -7,7 +7,6 @@ import { TextContent, } from "@patternfly/react-core"; import { useTranslation } from "react-i18next"; -import { label } from "../user-profile/utils"; import { getNetworkErrorDescription } from "../utils/errors"; type ErrorPageProps = { @@ -42,7 +41,7 @@ export const ErrorPage = (props: ErrorPageProps) => { > {errorMessage ? ( - {label(t, errorMessage)} + {t(errorMessage)} ) : ( {t("somethingWentWrongDescription")} )}