From fc1cccb9f4ddaa4ceb97b641110e1bb88357050e Mon Sep 17 00:00:00 2001 From: Timo Schmidt Date: Tue, 26 May 2026 20:12:29 +0200 Subject: [PATCH 1/2] fix: fixing of loading of i18n resources Issue #1465 --- .../select2/Select2LanguageResourceReference.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java index dc9203ff33..27350021c1 100644 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java @@ -1,5 +1,7 @@ package org.wicketstuff.select2; +import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference; + import org.apache.wicket.request.resource.JavaScriptResourceReference; /** @@ -8,16 +10,17 @@ * * @author Tom Götz (tom@decoded.de) */ -class Select2LanguageResourceReference extends JavaScriptResourceReference { +class Select2LanguageResourceReference extends WebjarsJavaScriptResourceReference { private static final long serialVersionUID = 1L; - private static final String resourceName = "res/js/i18n/%s.js"; + //private static final String resourceName = "res/js/i18n/%s.js"; + private static final String resourceName = "select2/current/dist/js/i18n/%s.js"; private static final String defaultLanguage = "en"; /** * @param language i18n file to load (e.g. "en", "de", "fr" ...) */ Select2LanguageResourceReference(String language) { - super(Select2LanguageResourceReference.class, getResourceName(language)); + super(getResourceName(language)); } /** @@ -30,7 +33,7 @@ class Select2LanguageResourceReference extends JavaScriptResourceReference { private static String getResourceName(String language) { try { String name = String.format(resourceName, language); - if (Select2LanguageResourceReference.class.getResource(name) != null) { + if (WebjarsJavaScriptResourceReference.class.getResource(name) != null) { return name; } } catch (Exception ignore) { From 10b0981cc40d81102fffd7600452706b6d4922ec Mon Sep 17 00:00:00 2001 From: Timo Schmidt Date: Wed, 27 May 2026 19:41:56 +0200 Subject: [PATCH 2/2] fix: fixing setup of resource name when loading i18n resources Checking whether a resource file exists does not work with Webjars as previously implemented. The new check is now a simple implementation whether the given language string is empty or not. Issue # #1465 --- .../select2/Select2LanguageResourceReference.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java index 27350021c1..8a4916bfff 100644 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java @@ -2,6 +2,7 @@ import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference; +import static org.apache.wicket.util.string.Strings.isEmpty; import org.apache.wicket.request.resource.JavaScriptResourceReference; /** @@ -12,7 +13,6 @@ */ class Select2LanguageResourceReference extends WebjarsJavaScriptResourceReference { private static final long serialVersionUID = 1L; - //private static final String resourceName = "res/js/i18n/%s.js"; private static final String resourceName = "select2/current/dist/js/i18n/%s.js"; private static final String defaultLanguage = "en"; @@ -31,14 +31,10 @@ class Select2LanguageResourceReference extends WebjarsJavaScriptResourceReferenc * @return resource name */ private static String getResourceName(String language) { - try { - String name = String.format(resourceName, language); - if (WebjarsJavaScriptResourceReference.class.getResource(name) != null) { - return name; - } - } catch (Exception ignore) { - // noop + if (isEmpty(language)) { + return String.format(resourceName, defaultLanguage); } - return String.format(resourceName, defaultLanguage); + + return String.format(resourceName, language); } }