From d01f531b8254ce0feba551c305c1e567d0ce7145 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Mon, 23 Sep 2024 07:42:07 +0200
Subject: [PATCH] removed server side translation in favour of client side
 (#32985)

fixes: #32984

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
---
 .../account-ui/src/applications/Applications.tsx  | 15 +++++++++++----
 .../resources/account/AccountRestService.java     |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/js/apps/account-ui/src/applications/Applications.tsx b/js/apps/account-ui/src/applications/Applications.tsx
index c6b6c1e837..a97e9ffe74 100644
--- a/js/apps/account-ui/src/applications/Applications.tsx
+++ b/js/apps/account-ui/src/applications/Applications.tsx
@@ -1,5 +1,6 @@
 import {
   ContinueCancelModal,
+  label,
   useEnvironment,
 } from "@keycloak/keycloak-ui-shared";
 import {
@@ -142,14 +143,20 @@ export const Applications = () => {
                         variant="link"
                         onClick={() => window.open(application.effectiveUrl)}
                       >
-                        {application.clientName || application.clientId}{" "}
+                        {label(
+                          t,
+                          application.clientName || application.clientId,
+                        )}{" "}
                         <ExternalLinkAltIcon />
                       </Button>
                     )}
                     {!application.effectiveUrl && (
-                      <span>
-                        {application.clientName || application.clientId}
-                      </span>
+                      <>
+                        {label(
+                          t,
+                          application.clientName || application.clientId,
+                        )}
+                      </>
                     )}
                   </DataListCell>,
                   <DataListCell
diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java
index 8cbbaf5663..8e09d6e641 100755
--- a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java
+++ b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java
@@ -244,7 +244,7 @@ public class AccountRestService {
     private ClientRepresentation modelToRepresentation(ClientModel model, List<String> inUseClients, List<String> offlineClients, Map<String, UserConsentModel> consents) {
         ClientRepresentation representation = new ClientRepresentation();
         representation.setClientId(model.getClientId());
-        representation.setClientName(StringPropertyReplacer.replaceProperties(model.getName(), getProperties()));
+        representation.setClientName(model.getName());
         representation.setDescription(model.getDescription());
         representation.setUserConsentRequired(model.isConsentRequired());
         representation.setInUse(inUseClients.contains(model.getClientId()));