Skip to content

Commit 52b4944

Browse files
xomitTimo Schmidt
andauthored
Fixing setup of resource name when loading i18n resources (#1467)
* fix: fixing of loading of i18n resources Issue #1465 * 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 --------- Co-authored-by: Timo Schmidt <timo@xinterchange.net>
1 parent d57fbb2 commit 52b4944

1 file changed

Lines changed: 5 additions & 9 deletions

File tree

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

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
44

5+
import static org.apache.wicket.util.string.Strings.isEmpty;
56
import org.apache.wicket.request.resource.JavaScriptResourceReference;
67

78
/**
@@ -12,7 +13,6 @@
1213
*/
1314
class Select2LanguageResourceReference extends WebjarsJavaScriptResourceReference {
1415
private static final long serialVersionUID = 1L;
15-
//private static final String resourceName = "res/js/i18n/%s.js";
1616
private static final String resourceName = "select2/current/dist/js/i18n/%s.js";
1717
private static final String defaultLanguage = "en";
1818

@@ -31,14 +31,10 @@ class Select2LanguageResourceReference extends WebjarsJavaScriptResourceReferenc
3131
* @return resource name
3232
*/
3333
private static String getResourceName(String language) {
34-
try {
35-
String name = String.format(resourceName, language);
36-
if (WebjarsJavaScriptResourceReference.class.getResource(name) != null) {
37-
return name;
38-
}
39-
} catch (Exception ignore) {
40-
// noop
34+
if (isEmpty(language)) {
35+
return String.format(resourceName, defaultLanguage);
4136
}
42-
return String.format(resourceName, defaultLanguage);
37+
38+
return String.format(resourceName, language);
4339
}
4440
}

0 commit comments

Comments
 (0)