diff --git a/src/main/java/com/gmail/nossr50/locale/mcLocale.java b/src/main/java/com/gmail/nossr50/locale/mcLocale.java index 5dbb42c70..d40f94e67 100644 --- a/src/main/java/com/gmail/nossr50/locale/mcLocale.java +++ b/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]); diff --git a/src/main/resources/locale/locale_da.properties b/src/main/resources/locale/locale_da.properties index 8ee259ad0..7dfd1b390 100644 --- a/src/main/resources/locale/locale_da.properties +++ b/src/main/resources/locale/locale_da.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_de.properties b/src/main/resources/locale/locale_de.properties index a3e24d48c..d97ecd17d 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/src/main/resources/locale/locale_de.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Umweltbewusst Taming.Ability.Bonus.1=W\u00f6lfe vermeiden Gefahr diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 0cbb879d1..c27804473 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -249,7 +249,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s #TAMING diff --git a/src/main/resources/locale/locale_es.properties b/src/main/resources/locale/locale_es.properties index ea02a5ed0..808474375 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/src/main/resources/locale/locale_es.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**ATAQUE DENTADO ACTIVADO** Swords.Skills.SS.Refresh=[[GREEN]]\u00a1Tu habilidad de [[YELLOW]]Golpe Dentado [[GREEN]]fue refrescada! Swords.Skills.SS.Other.Off=[[RED]]Ataque Dentado[[GREEN]] le ha expirado a [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]\u00a1{0}[[DARK_GREEN]] us\u00f3 [[RED]]Ataque Dentado! -Swords.SkillUp=[[YELLOW]]Habilidad de Espadas incrementada en {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Habilidad de Espadas incrementada en {0}. Total ({1}) Swords.SS.Length=[[RED]]Duraci\u00f3n del Ataque Dentado: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Consciente del Entorno Taming.Ability.Bonus.1=Lobos evitan peligros diff --git a/src/main/resources/locale/locale_fi.properties b/src/main/resources/locale/locale_fi.properties index 95da3afa4..59f12fd90 100644 --- a/src/main/resources/locale/locale_fi.properties +++ b/src/main/resources/locale/locale_fi.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_fr.properties b/src/main/resources/locale/locale_fr.properties index f25205eb9..ed16bbddc 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/src/main/resources/locale/locale_fr.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**ATTAQUE D\u00c9CHIRANTE ACTIV\u00c9E** Swords.Skills.SS.Refresh=[[GREEN]]Votre comp\u00e9tence [[YELLOW]]Attaque d\u00e9chirante [[GREEN]]est pr\u00eate ! Swords.Skills.SS.Other.Off=[[RED]]Attaque d\u00e9chirante[[GREEN]] s\'est termin\u00e9 pour [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] a utilis\u00e9 [[RED]]Attaque d\u00e9chirante ! -Swords.SkillUp=[[YELLOW]]Le talent \u00c9p\u00e9es augmente de {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Le talent \u00c9p\u00e9es augmente de {0}. Total ({1}) Swords.SS.Length=[[RED]]Dur\u00e9e d\'Attaque d\u00e9chirante : [[YELLOW]]{0}s Taming.Ability.Bonus.0=Attentif \u00e0 l\'environnement Taming.Ability.Bonus.1=Les loups \u00e9vitent les dangers diff --git a/src/main/resources/locale/locale_it.properties b/src/main/resources/locale/locale_it.properties index b9eeefa6f..3d2d815b1 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/src/main/resources/locale/locale_it.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_ko.properties b/src/main/resources/locale/locale_ko.properties index 52576ef55..4961e69fa 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/src/main/resources/locale/locale_ko.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_lv.properties b/src/main/resources/locale/locale_lv.properties index c44b8dc5c..c747e46e3 100644 --- a/src/main/resources/locale/locale_lv.properties +++ b/src/main/resources/locale/locale_lv.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_nl.properties b/src/main/resources/locale/locale_nl.properties index aa44e14fe..1a41bacc9 100644 --- a/src/main/resources/locale/locale_nl.properties +++ b/src/main/resources/locale/locale_nl.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_no.properties b/src/main/resources/locale/locale_no.properties index 8c6a07de7..6ad903483 100644 --- a/src/main/resources/locale/locale_no.properties +++ b/src/main/resources/locale/locale_no.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES AKTIVERT** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] har brukt [[RED]] Taggete Streik! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_pl.properties b/src/main/resources/locale/locale_pl.properties index 9ed694aa9..fccff7fbc 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/src/main/resources/locale/locale_pl.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_pt_BR.properties b/src/main/resources/locale/locale_pt_BR.properties index 8bb087bf5..1be24151c 100644 --- a/src/main/resources/locale/locale_pt_BR.properties +++ b/src/main/resources/locale/locale_pt_BR.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_ru.properties b/src/main/resources/locale/locale_ru.properties index 822924c25..d73f87d51 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/src/main/resources/locale/locale_ru.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**\u0417\u0410\u0417\u0423\u0411\u0420\u0415\u041d\ Swords.Skills.SS.Refresh=[[GREEN]]\u0412\u0430\u0448\u0430 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c [[YELLOW]]\u0417\u0430\u0437\u0443\u0431\u0440\u0435\u043d\u043d\u044b\u0439 \u041c\u0435\u0447 [[GREEN]]\u0432\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043b [[RED]]\u0417\u0430\u0437\u0443\u0431\u0440\u0435\u043d\u043d\u044b\u0439 \u041c\u0435\u0447! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger diff --git a/src/main/resources/locale/locale_sv.properties b/src/main/resources/locale/locale_sv.properties index c48de502d..5f7027aa0 100644 --- a/src/main/resources/locale/locale_sv.properties +++ b/src/main/resources/locale/locale_sv.properties @@ -211,7 +211,7 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED** Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Other.Off=[[RED]]Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! -Swords.SkillUp=[[YELLOW]]Swords skill increased by {0}. Total ({1}) +Swords.Skillup=[[YELLOW]]Swords skill increased by {0}. Total ({1}) Swords.SS.Length=[[RED]]Serrated Strikes Length: [[YELLOW]]{0}s Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.1=Wolves avoid danger