andreacavalli/TelegramBots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor localized message helper method

Browse Source
This commit is contained in:
davioooh 2018-04-30 19:50:44 +02:00
parent 16fa704a17
commit f64d556610
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java
View File

@ -159,12 +159,15 @@ public final class AbilityUtils {
public static String getLocalizedMessage(String messageCode, Locale locale, Object...arguments) { public static String getLocalizedMessage(String messageCode, Locale locale, Object...arguments) {
ResourceBundle bundle; ResourceBundle bundle;
if(locale == null){ if(locale == null){
bundle = ResourceBundle.getBundle("default_messages"); bundle = ResourceBundle.getBundle("messages", Locale.ROOT);
}else { }else {
try { try {
bundle = ResourceBundle.getBundle("messages", locale); bundle = ResourceBundle.getBundle(
"messages",
locale,
ResourceBundle.Control.getNoFallbackControl(ResourceBundle.Control.FORMAT_PROPERTIES));
} catch (MissingResourceException e) { } catch (MissingResourceException e) {
bundle = ResourceBundle.getBundle("default_messages"); bundle = ResourceBundle.getBundle("messages", Locale.ROOT);
} }
} }
String message = bundle.getString(messageCode); String message = bundle.getString(messageCode);

0
telegrambots-abilities/src/main/resources/default_messages.properties → telegrambots-abilities/src/main/resources/messages.properties
View File