EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-04 06:34:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

Browse Source 
Conflicts:
	src/main/java/com/gmail/nossr50/locale/mcLocale.java
This commit is contained in:
nossr50
2012-04-26 11:54:45 -07:00
parent 2729b37b76 0a5b0eb6d5
commit b8e128e0a9
16 changed files with 17 additions and 18 deletions

5
src/main/java/com/gmail/nossr50/locale/mcLocale.java

@ -27,10 +27,9 @@ public class mcLocale {
public static String getString(String key, Object[] messageArguments) {
try {
if (RESOURCE_BUNDLE == null) {
Locale.setDefault(new Locale("en", "US"));
String[] myLocale = Config.getLocale().split("[-_ ]");
Locale.setDefault(new Locale("en", "US"));
Locale locale = null;
String[] myLocale = Config.getLocale().split("[-_ ]");
if (myLocale.length == 1) {
locale = new Locale(myLocale[0]);