v1.0.3 Fixed plugin ignoring override language

RTLSponge · Jan 25, 2016 · 5dd8ca2 · 5dd8ca2
1 parent e6040be
commit 5dd8ca2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'java'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 group 'au.id.rleach'
-version '1.0.2'
+version '1.0.3'
 
 sourceCompatibility = 1.8
 

diff --git a/src/main/java/au/id/rleach/translate/TranslateWithBing.java b/src/main/java/au/id/rleach/translate/TranslateWithBing.java
@@ -43,7 +43,7 @@
 import java.util.*;
 
 
-@Plugin(id="TranslateWithBing", name="TranslateWithBing", version="1.0.2")
+@Plugin(id="TranslateWithBing", name="TranslateWithBing", version="1.0.3")
 public class TranslateWithBing {
 
     @Inject
@@ -176,7 +176,13 @@ public void chatEvent(MessageChannelEvent.Chat chat, @First Player player){
                                  .map(p -> (Player) p)
                                  .iterator();
         ImmutableListMultimap<Language, Player> multiMap = Multimaps.index(x, p -> {
-            return l2l.map.getOrDefault(p.getLocale(), Language.AUTO_DETECT);
+            String dataLang = p.get(TranslateKeys.Language).orElse("");
+            if(dataLang.isEmpty()){
+                return l2l.map.getOrDefault(p.getLocale(), Language.AUTO_DETECT);
+            } else {
+                return Language.fromString(dataLang);
+            }
+
         });
         Optional<Text> message = chat.getMessage();
         if(message.isPresent())