🐛 (i18n) 修复国际化 resource bundle 无法正确加载的问题

ballcat-projects · May 7, 2024 · 0900399 · 0900399
1 parent 1e345aa
commit 0900399
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...at-i18n/src/main/java/org/ballcat/i18n/WildcardReloadableResourceBundleMessageSource.java b/...at-i18n/src/main/java/org/ballcat/i18n/WildcardReloadableResourceBundleMessageSource.java
@@ -114,7 +114,7 @@ protected List<String> calculateFilenamesForLocale(String basename, Locale local
 	private Resource[] getResources(String resourceLocationPattern) throws IOException {
 		// 支持用 . 表示文件层级
 		resourceLocationPattern = resourceLocationPattern.replace(".", "/");
-		return this.resolver.getResources(resourceLocationPattern + PROPERTIES_SUFFIX);
+		return this.resolver.getResources("classpath*:" + resourceLocationPattern + PROPERTIES_SUFFIX);
 	}
 
 	private boolean containsWildcard(String str) {

diff --git a/i18n/ballcat-i18n/src/test/java/org/ballcat/i18n/HierarchicalMessageSourceTest.java b/i18n/ballcat-i18n/src/test/java/org/ballcat/i18n/HierarchicalMessageSourceTest.java
@@ -29,7 +29,7 @@ class HierarchicalMessageSourceTest {
 	MessageSource messageSource() {
 		ReloadableResourceBundleMessageSource messageSource = new WildcardReloadableResourceBundleMessageSource();
 		// Specify the location of the properties file
-		messageSource.setBasename("classpath:test-*");
+		messageSource.setBasename("test-*");
 		messageSource.setDefaultEncoding("UTF-8");
 		messageSource.setFallbackToSystemLocale(false);
 

diff --git a/...18n/src/test/java/org/ballcat/i18n/WildcardReloadableResourceBundleMessageSourceTest.java b/...18n/src/test/java/org/ballcat/i18n/WildcardReloadableResourceBundleMessageSourceTest.java
@@ -30,7 +30,7 @@ ReloadableResourceBundleMessageSource messageSource(boolean fallbackToSystemLoca
 		ReloadableResourceBundleMessageSource messageSource = new WildcardReloadableResourceBundleMessageSource();
 
 		// Specify the location of the properties file
-		messageSource.setBasename("classpath*:org.ballcat.**.messages");
+		messageSource.setBasename("org.ballcat.**.messages");
 		messageSource.setDefaultEncoding("UTF-8");
 		messageSource.setFallbackToSystemLocale(fallbackToSystemLocale);
 		return messageSource;