Skip to content

Commit d57fbb2

Browse files
xomitTimo Schmidt
andauthored
fix: fixing of loading of i18n resources (#1466)
Issue #1465 Co-authored-by: Timo Schmidt <timo@xinterchange.net>
1 parent 3b76b82 commit d57fbb2

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.wicketstuff.select2;
22

3+
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
4+
35
import org.apache.wicket.request.resource.JavaScriptResourceReference;
46

57
/**
@@ -8,16 +10,17 @@
810
*
911
* @author Tom Götz (tom@decoded.de)
1012
*/
11-
class Select2LanguageResourceReference extends JavaScriptResourceReference {
13+
class Select2LanguageResourceReference extends WebjarsJavaScriptResourceReference {
1214
private static final long serialVersionUID = 1L;
13-
private static final String resourceName = "res/js/i18n/%s.js";
15+
//private static final String resourceName = "res/js/i18n/%s.js";
16+
private static final String resourceName = "select2/current/dist/js/i18n/%s.js";
1417
private static final String defaultLanguage = "en";
1518

1619
/**
1720
* @param language i18n file to load (e.g. "en", "de", "fr" ...)
1821
*/
1922
Select2LanguageResourceReference(String language) {
20-
super(Select2LanguageResourceReference.class, getResourceName(language));
23+
super(getResourceName(language));
2124
}
2225

2326
/**
@@ -30,7 +33,7 @@ class Select2LanguageResourceReference extends JavaScriptResourceReference {
3033
private static String getResourceName(String language) {
3134
try {
3235
String name = String.format(resourceName, language);
33-
if (Select2LanguageResourceReference.class.getResource(name) != null) {
36+
if (WebjarsJavaScriptResourceReference.class.getResource(name) != null) {
3437
return name;
3538
}
3639
} catch (Exception ignore) {

0 commit comments

Comments
 (0)