Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 10:36:06 +01:00
Code Issues Projects Releases Wiki Activity

Improved localization loading on startup.

Browse Source
This commit is contained in:
main() 2012-10-24 16:58:04 +02:00
parent 0b7b91a081
commit 703707a39b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -67,8 +67,11 @@ import com.onarandombox.MultiverseCore.listeners.MVEntityListener;
import com.onarandombox.MultiverseCore.listeners.MVPlayerChatListener;
import com.onarandombox.MultiverseCore.listeners.MVPlayerListener;
import com.onarandombox.MultiverseCore.listeners.MVPluginListener;
import com.onarandombox.MultiverseCore.localization.LazyLocaleMessageProvider;
import com.onarandombox.MultiverseCore.localization.LocalizationLoadingException;
import com.onarandombox.MultiverseCore.localization.MessageProvider;
import com.onarandombox.MultiverseCore.localization.MessageProviding;
import com.onarandombox.MultiverseCore.localization.NoSuchLocalizationException;
import com.onarandombox.MultiverseCore.listeners.MVPortalListener;
import com.onarandombox.MultiverseCore.listeners.MVWeatherListener;
import com.onarandombox.MultiverseCore.localization.MultiverseMessage;
@ -310,7 +313,19 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core, Listen
// Setup & Load our Configuration files.
loadConfigs();
try {
this.messageProvider.setLocale((this.config.getLocale() == null) ? Locale.getDefault() : this.config.getLocale());
Locale l = (this.config.getLocale() == null) ? Locale.getDefault() : this.config.getLocale();
if (this.messageProvider instanceof LazyLocaleMessageProvider)
((LazyLocaleMessageProvider)this.messageProvider).loadLocale(l);
this.messageProvider.setLocale(l);
} catch (NoSuchLocalizationException e) {
if (this.config.getLocale() != null)
this.log(Level.SEVERE, String.format(
"Multiverse couldn't find any translations for the selected locale '%s'. '%s' will be used instead.",
this.config.getLocale(), this.messageProvider.getLocale()));
} catch (LocalizationLoadingException e) {
this.log(Level.SEVERE, String.format("Failed to load the selected locale '%s'. '%s' will be used instead.",
this.config.getLocale(), this.messageProvider.getLocale()));
e.printStackTrace();
} catch (IllegalArgumentException e) {
this.log(Level.SEVERE, e.getMessage());
this.getServer().getPluginManager().disablePlugin(this);