Avoid surplus blanks in source strings

Closes #37582

Signed-off-by: Alexander Schwartz <[email protected]>

Author: ahus1

js/apps/account-ui/maven-resources/theme/keycloak.v3/account/messages/messages_en.properties

@@ -148,7 +148,7 @@ systemDefined=System defined
 hasAccessTo=Has access to
 internalApp=Internal
 updateError=Could not update the resource due to\: {{error}}
-accessGrantedOn=Access granted on\: 
+accessGrantedOn=Access granted on\:
 editTheResource=Edit the resource - {{name}}
 permissionRequests=Permission requests
 shareSuccess=Resource successfully shared.
@@ -164,7 +164,7 @@ termsOfService=Terms of service
 jumpToSection=Jump to section
 linkError=Could not link due to\: {{error}}
 requestor=Requestor
-shareWith=Share with 
+shareWith=Share with
 updateCredAriaLabel=Update credential
 error-pattern-no-match='{{0}}' doesn't match required format.
 application=Application

js/apps/account-ui/src/resources/ShareTheResource.tsx

@@ -177,7 +177,7 @@ export const ShareTheResource = ({
             </InputGroupItem>
           </InputGroup>
           {fields.length > 1 && (
-            <ChipGroup categoryName={t("shareWith")}>
+            <ChipGroup categoryName={t("shareWith") + " "}>
               {fields.map(
                 (field, index) =>
                   index !== fields.length - 1 && (

js/apps/admin-ui/maven-resources/theme/keycloak.v2/admin/messages/messages_en.properties

@@ -49,6 +49,7 @@ public List<String> verify() throws MojoExecutionException {
             String contents = Files.readString(file.toPath());
             verifyNoDuplicateKeys(contents);
             verifySafeHtml();
+            verifyProblematicBlanks();
         } catch (IOException e) {
             throw new MojoExecutionException("Can not read file " + file, e);
         }
@@ -114,6 +115,39 @@ private void verifySafeHtml() {
         });
     }
 
+    /**
+     * Double blanks and blanks at the beginning of end of the string are difficult to translation in the translation tools and
+     * are easily missed. If a blank before or after the string is needed in the UI, add it in the HTML template.
+     */
+    private void verifyProblematicBlanks() {
+        if (!file.getName().endsWith("_en.properties")) {
+            // Only check EN original files, as the other files are checked by the translation tools
+            return;
+        }
+        PropertyResourceBundle bundle;
+        try (FileInputStream fis = new FileInputStream(file)) {
+            bundle = new PropertyResourceBundle(fis);
+        } catch (IOException e) {
+            throw new RuntimeException("unable to read file " + file, e);
+        }
+
+        bundle.getKeys().asIterator().forEachRemaining(key -> {
+            String value = bundle.getString(key);
+
+            if (value.contains("  ")) {
+                messages.add("Duplicate blanks in " + key + " for file " + file + ": '" + value);
+            }
+
+            if (value.startsWith(" ")) {
+                messages.add(key + " starts with a blank in file " + file + ": '" + value);
+            }
+
+            if (value.endsWith(" ")) {
+                messages.add(key + " ends with a blank in file " + file + ": '" + value);
+            }
+        });
+    }
+
     private String normalizeValue(String key, String value) {
         if (key.equals("templateHelp")) {
             // Allow "CLAIM.<NAME>" here

misc/theme-verifier/src/main/java/org/keycloak/themeverifier/VerifyMessageProperties.java

@@ -51,6 +51,14 @@ void verifyNoChangedAnchors() throws MojoExecutionException {
         MatcherAssert.assertThat(verify, Matchers.hasItem(Matchers.containsString("Didn't find anchor tag")));
     }
 
+    @Test
+    void verifyNoExtraBlanks() throws MojoExecutionException {
+        List<String> verify = getFile("blanks_en.properties").verify();
+        MatcherAssert.assertThat(verify, Matchers.hasItem(Matchers.containsString("Duplicate blanks")));
+        MatcherAssert.assertThat(verify, Matchers.hasItem(Matchers.containsString("starts with a blank")));
+        MatcherAssert.assertThat(verify, Matchers.hasItem(Matchers.containsString("ends with a blank")));
+    }
+
     private static VerifyMessageProperties getFile(String fixture) {
         URL resource = VerifyMessageProperties.class.getResource("/" + fixture);
         if (resource == null) {

misc/theme-verifier/src/test/java/org/keycloak/themeverifier/VerifyMessagePropertiesTest.java

@@ -0,0 +1,17 @@
+#
+# Copyright 2025 Red Hat, Inc. and/or its affiliates
+# and other contributors as indicated by the @author tags.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+key=\ word  word\ 

misc/theme-verifier/src/test/resources/blanks_en.properties

@@ -20,8 +20,8 @@ errorDeletingAccount=Error happened while deleting account
 deletingAccountForbidden=You do not have enough permissions to delete your own account, contact admin.
 kerberosNotConfigured=Kerberos Not Configured
 kerberosNotConfiguredTitle=Kerberos Not Configured
-bypassKerberosDetail=Either you are not logged in by Kerberos or your browser is not set up for Kerberos login.  Please click continue to login in through other means
-kerberosNotSetUp=Kerberos is not set up.  You cannot login.
+bypassKerberosDetail=Either you are not logged in by Kerberos or your browser is not set up for Kerberos login. Please click continue to login in through other means
+kerberosNotSetUp=Kerberos is not set up. You cannot login.
 registerTitle=Register
 loginAccountTitle=Sign in to your account
 loginTitle=Sign in to {0}
@@ -33,13 +33,13 @@ unknownUser=Unknown user
 loginTotpTitle=Mobile Authenticator Setup
 loginProfileTitle=Update Account Information
 loginIdpReviewProfileTitle=Update Account Information
-loginTimeout=Your login attempt timed out.  Login will start from the beginning.
+loginTimeout=Your login attempt timed out. Login will start from the beginning.
 reauthenticate=Please re-authenticate to continue
 authenticateStrong=Strong authentication required to continue
 oauthGrantTitle=Grant Access to {0}
 oauthGrantTitleHtml={0}
 oauthGrantInformation=Make sure you trust {0} by learning how {0} will handle your data.
-oauthGrantReview=You could review the 
+oauthGrantReview=You could review the
 oauthGrantTos=terms of service.
 oauthGrantPolicy=privacy policy.
 errorTitle=We are sorry...
@@ -373,7 +373,7 @@ credentialSetupRequired=Cannot login, credential setup required.
 identityProviderNotUniqueMessage=Realm supports multiple identity providers. Could not determine which identity provider should be used to authenticate with.
 emailVerifiedMessage=Your email address has been verified.
 emailVerifiedAlreadyMessage=Your email address has been verified already.
-staleEmailVerificationLink=The link you clicked is an old stale link and is no longer valid.  Maybe you have already verified your email.
+staleEmailVerificationLink=The link you clicked is an old stale link and is no longer valid. Maybe you have already verified your email.
 identityProviderAlreadyLinkedMessage=Federated identity returned by {0} is already linked to another user.
 confirmAccountLinking=Confirm linking the account {0} of identity provider {1} with your account.
 confirmEmailAddressVerification=Confirm validity of e-mail address {0}.
@@ -415,7 +415,7 @@ console-otp=One Time Password:
 console-new-password=New Password:
 console-confirm-password=Confirm Password:
 console-update-password=Update of your password is required.
-console-verify-email=You need to verify your email address.  We sent an email to {0} that contains a verification code.  Please enter this code into the input below.
+console-verify-email=You need to verify your email address. We sent an email to {0} that contains a verification code. Please enter this code into the input below.
 console-email-code=Email Code:
 console-accept-terms=Accept Terms? [y/n]:
 console-accept=y
@@ -429,7 +429,7 @@ openshift.scope.list-projects=List projects
 # SAML authentication
 saml.post-form.title=Authentication Redirect
 saml.post-form.message=Redirecting, please wait.
-saml.post-form.js-disabled=JavaScript is disabled. We strongly recommend to enable it. Click the button below to continue. 
+saml.post-form.js-disabled=JavaScript is disabled. We strongly recommend to enable it. Click the button below to continue.
 saml.artifactResolutionServiceInvalidResponse=Unable to resolve artifact.
 
 #authenticators