diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/general/GeneralCommands.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/general/GeneralCommands.java index 93082324..7f159386 100644 --- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/general/GeneralCommands.java +++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/general/GeneralCommands.java @@ -66,11 +66,16 @@ public void main(CommandSender sender) { @CommandPermission("simpleclans.anyone.locale") @Description("{@@command.description.locale}") @CommandCompletion("@locales") - public void locale(ClanPlayer cp, @Values("@locales") @Name("locale") String locale) { + public void locale(ClanPlayer cp, @Values("@locales") @Name("locale") @Single String locale) { + if (!settings.is(LANGUAGE_SELECTOR)) { + ChatBlock.sendMessageKey(cp, "locale.is.prohibited"); + return; + } + cp.setLocale(Helper.forLanguageTag(locale.replace("_", "-"))); plugin.getStorageManager().updateClanPlayer(cp); - ChatBlock.sendMessage(cp, lang("locale.has.been.changed")); + ChatBlock.sendMessageKey(cp, "locale.has.been.changed"); } @Subcommand("%create") diff --git a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/StaffCommands.java b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/StaffCommands.java index f23a9062..a9cf8491 100644 --- a/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/StaffCommands.java +++ b/src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/StaffCommands.java @@ -379,7 +379,7 @@ public void rename(CommandSender sender, @Name("clan") ClanInput clanInput, @Nam @CommandPermission("simpleclans.mod.locale") @Description("{@@command.description.mod.locale}") @CommandCompletion("@locales") - public void locale(CommandSender sender, @Name("player") ClanPlayerInput input, @Values("@locales") @Name("locale") String locale) { + public void locale(CommandSender sender, @Name("player") ClanPlayerInput input, @Values("@locales") @Name("locale") @Single String locale) { ClanPlayer cp = input.getClanPlayer(); cp.setLocale(Helper.forLanguageTag(locale.replace("_", "-"))); plugin.getStorageManager().updateClanPlayer(cp); diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index c33643b7..97b31dcc 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -418,6 +418,7 @@ inactive.0=Inactive: {0} clan.commands=clan commands you.can.only.modify.the.color.and.case.of.the.tag=You can only modify the color and case of the tag locale.has.been.changed=&cYour language has been changed +locale.is.prohibited=&cLanguage selection on the server is prohibited. tag.changed.to.0=Tag changed to {0} 0.tag.changed.to.1=&bSuccessfully changed {0}''s tag to {1} name.0=Name: {0}