From 7ff5be3a72bdb56bbe503933c875fc0db644505e Mon Sep 17 00:00:00 2001 From: davioooh Date: Mon, 30 Apr 2018 19:50:44 +0200 Subject: [PATCH] Refactor localized message helper method --- .../org/telegram/abilitybots/api/util/AbilityUtils.java | 9 ++++++--- .../{default_messages.properties => messages.properties} | 0 2 files changed, 6 insertions(+), 3 deletions(-) rename telegrambots-abilities/src/main/resources/{default_messages.properties => messages.properties} (100%) diff --git a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java index 21043fb3..a213e43b 100644 --- a/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java +++ b/telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/util/AbilityUtils.java @@ -181,12 +181,15 @@ public final class AbilityUtils { public static String getLocalizedMessage(String messageCode, Locale locale, Object...arguments) { ResourceBundle bundle; if(locale == null){ - bundle = ResourceBundle.getBundle("default_messages"); + bundle = ResourceBundle.getBundle("messages", Locale.ROOT); }else { try { - bundle = ResourceBundle.getBundle("messages", locale); + bundle = ResourceBundle.getBundle( + "messages", + locale, + ResourceBundle.Control.getNoFallbackControl(ResourceBundle.Control.FORMAT_PROPERTIES)); } catch (MissingResourceException e) { - bundle = ResourceBundle.getBundle("default_messages"); + bundle = ResourceBundle.getBundle("messages", Locale.ROOT); } } String message = bundle.getString(messageCode); diff --git a/telegrambots-abilities/src/main/resources/default_messages.properties b/telegrambots-abilities/src/main/resources/messages.properties similarity index 100% rename from telegrambots-abilities/src/main/resources/default_messages.properties rename to telegrambots-abilities/src/main/resources/messages.properties