From 5dd8ca2958996f7b7ee637279281320009534ca9 Mon Sep 17 00:00:00 2001 From: Ryan Leach Date: Mon, 25 Jan 2016 16:54:48 +1030 Subject: [PATCH] v1.0.3 Fixed plugin ignoring override language --- build.gradle | 2 +- .../java/au/id/rleach/translate/TranslateWithBing.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 246b3a8..d5b1325 100644 --- 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 index 28fa64d..3a5a74c 100644 --- 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 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 message = chat.getMessage(); if(message.isPresent())