summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2014-05-05 20:47:48 +0100
committerKHobbits <rob@khobbits.co.uk>2014-05-05 20:47:48 +0100
commit04666b66b4e88f9b4b9ebb964e5c367b50c693e2 (patch)
tree8cd9e2439aff8a21fd8e4dfd2eaafa8214c25df7
parent363aee70d57bc14165e6a639ec1a03e49525bdc2 (diff)
downloadEssentials-04666b66b4e88f9b4b9ebb964e5c367b50c693e2.tar
Essentials-04666b66b4e88f9b4b9ebb964e5c367b50c693e2.tar.gz
Essentials-04666b66b4e88f9b4b9ebb964e5c367b50c693e2.tar.lz
Essentials-04666b66b4e88f9b4b9ebb964e5c367b50c693e2.tar.xz
Essentials-04666b66b4e88f9b4b9ebb964e5c367b50c693e2.zip
Reload locale even if it is set to null.
-rw-r--r--Essentials/src/com/earth2me/essentials/I18n.java29
1 files changed, 14 insertions, 15 deletions
diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/com/earth2me/essentials/I18n.java
index 507cd9b02..3cf8c3a5d 100644
--- a/Essentials/src/com/earth2me/essentials/I18n.java
+++ b/Essentials/src/com/earth2me/essentials/I18n.java
@@ -123,22 +123,21 @@ public class I18n implements net.ess3.api.II18n
public void updateLocale(final String loc)
{
- if (loc == null || loc.isEmpty())
+ if (loc != null && !loc.isEmpty())
{
- return;
- }
- final String[] parts = loc.split("[_\\.]");
- if (parts.length == 1)
- {
- currentLocale = new Locale(parts[0]);
- }
- if (parts.length == 2)
- {
- currentLocale = new Locale(parts[0], parts[1]);
- }
- if (parts.length == 3)
- {
- currentLocale = new Locale(parts[0], parts[1], parts[2]);
+ final String[] parts = loc.split("[_\\.]");
+ if (parts.length == 1)
+ {
+ currentLocale = new Locale(parts[0]);
+ }
+ if (parts.length == 2)
+ {
+ currentLocale = new Locale(parts[0], parts[1]);
+ }
+ if (parts.length == 3)
+ {
+ currentLocale = new Locale(parts[0], parts[1], parts[2]);
+ }
}
ResourceBundle.clearCache();
messageFormatCache = new HashMap<String, MessageFormat>();