libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Restore support for locales with extensions (#27285)

Browse source 
Closes #27284

Signed-off-by: Albrecht Scheidig <albrecht.scheidig@hype.de>
This commit is contained in:
Albrecht Scheidig 2024-02-29 18:16:44 +01:00 committed by GitHub
parent ae0a0ea30b
commit cad34cbb04
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/src/main/java/org/keycloak/theme/FolderTheme.java
View file

@ -107,7 +107,7 @@ public class FolderTheme implements Theme {
return getMessages("messages", locale);
}
private static final Pattern LEGAL_LOCALE = Pattern.compile("[a-zA-Z0-9-_]*");
private static final Pattern LEGAL_LOCALE = Pattern.compile("[a-zA-Z0-9-_#]*");
@Override
public Properties getMessages(String baseBundlename, Locale locale) throws IOException {

42
services/src/test/java/org/keycloak/theme/FolderThemeTest.java Normal file
View file

@ -0,0 +1,42 @@
/*
* Copyright 2016 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.
*/
package org.keycloak.theme;
import static org.junit.Assert.*;
import static org.keycloak.theme.Theme.Type.LOGIN;
import org.junit.Test;
import java.io.File;
import java.util.Locale;
import java.util.Set;
public class FolderThemeTest {
private final Set<String> someValidISOLocaleCodes = Set.of("de", "de-DE", "de-x-informal");
@Test
public void testLocaleWithExtension() throws Exception {
FolderTheme theme = new FolderTheme(new File("."), "name", LOGIN);
for (String localeCode : someValidISOLocaleCodes) {
Locale locale = Locale.forLanguageTag(localeCode);
assertNotNull(theme.getMessages("base", locale));
}
}
}