Skip to content

Commit a7b952f

Browse files
authored
add @PropertyKey to i18n methods for easier translation<->key navigation (#4831)
1 parent 63ceb3c commit a7b952f

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.jackhuang.hmcl.download.game.GameRemoteVersion;
2222
import org.jackhuang.hmcl.util.i18n.translator.Translator;
2323
import org.jetbrains.annotations.Nullable;
24+
import org.jetbrains.annotations.PropertyKey;
2425

2526
import java.io.IOException;
2627
import java.io.InputStream;
@@ -59,11 +60,11 @@ public static Translator getTranslator() {
5960
return locale.getTranslator();
6061
}
6162

62-
public static String i18n(String key, Object... formatArgs) {
63+
public static String i18n(@PropertyKey(resourceBundle = "assets.lang.I18N") String key, Object... formatArgs) {
6364
return locale.i18n(key, formatArgs);
6465
}
6566

66-
public static String i18n(String key) {
67+
public static String i18n(@PropertyKey(resourceBundle = "assets.lang.I18N") String key) {
6768
return locale.i18n(key);
6869
}
6970

HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/SupportedLocale.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.jackhuang.hmcl.util.StringUtils;
2525
import org.jackhuang.hmcl.util.gson.JsonUtils;
2626
import org.jackhuang.hmcl.util.i18n.translator.Translator;
27+
import org.jetbrains.annotations.PropertyKey;
2728

2829
import java.io.IOException;
2930
import java.io.InputStream;
@@ -187,7 +188,7 @@ public List<Locale> getCandidateLocales() {
187188
return candidateLocales;
188189
}
189190

190-
public String i18n(String key, Object... formatArgs) {
191+
public String i18n(@PropertyKey(resourceBundle = "assets.lang.I18N") String key, Object... formatArgs) {
191192
try {
192193
return String.format(getResourceBundle().getString(key), formatArgs);
193194
} catch (MissingResourceException e) {
@@ -199,7 +200,7 @@ public String i18n(String key, Object... formatArgs) {
199200
return key + Arrays.toString(formatArgs);
200201
}
201202

202-
public String i18n(String key) {
203+
public String i18n(@PropertyKey(resourceBundle = "assets.lang.I18N") String key) {
203204
try {
204205
return getResourceBundle().getString(key);
205206
} catch (MissingResourceException e) {

0 commit comments

Comments
 (0)