Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move utils to I18NUtils

Browse Source
This commit is contained in:
Dreeam
2024-05-29 20:34:27 +08:00
parent c53f622e94
commit 89817d420c
4 changed files with 116 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/message/AbstractMessageFileHandler.java
+2 -2
View File
@@ -8,7 +8,7 @@ import fr.xephi.authme.output.ConsoleLoggerFactory;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.PluginSettings;
import fr.xephi.authme.util.FileUtils;
import fr.xephi.authme.util.PlayerUtils;
import fr.xephi.authme.util.message.I18NUtils;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -122,7 +122,7 @@ public abstract class AbstractMessageFileHandler implements Reloadable {
i18nConfiguration = new ConcurrentHashMap<>();
}
locale = PlayerUtils.LocaleToCode(locale, settings);
locale = I18NUtils.localeToCode(locale, settings);
if (i18nConfiguration.containsKey(locale)) {
return i18nConfiguration.get(locale);
src/main/java/fr/xephi/authme/message/Messages.java
+2 -2
View File
@@ -4,8 +4,8 @@ import com.google.common.collect.ImmutableMap;
import fr.xephi.authme.ConsoleLogger;
import fr.xephi.authme.mail.EmailService;
import fr.xephi.authme.output.ConsoleLoggerFactory;
import fr.xephi.authme.util.PlayerUtils;
import fr.xephi.authme.util.expiring.Duration;
import fr.xephi.authme.util.message.I18NUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -121,7 +121,7 @@ public class Messages {
* @return The message from the file
*/
private String retrieveMessage(MessageKey key, CommandSender sender) {
String locale = PlayerUtils.getLocale(sender);
String locale = I18NUtils.getLocale(sender);
String message = messagesFileHandler.getMessageByLocale(key.getKey(), locale);
String displayName = sender.getName();
if (sender instanceof Player) {