Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/e215b9d7 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/e215b9d7 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/e215b9d7 Branch: refs/heads/master Commit: e215b9d7fb57be23c2978460519f9fda982caf03 Parents: 01163e2 8d5eaaa Author: tballison <[email protected]> Authored: Fri Oct 28 09:47:51 2016 -0400 Committer: tballison <[email protected]> Committed: Fri Oct 28 09:47:51 2016 -0400 ---------------------------------------------------------------------- .../tika/language/detect/LanguageResult.java | 6 +- .../tika/language/translate/Translator.java | 20 +- tika-parsers/pom.xml | 14 ++ .../language/translate/AbstractTranslator.java | 2 +- .../language/translate/GoogleTranslator.java | 5 - .../translate/JoshuaNetworkTranslator.java | 232 +++++++++++++++++++ .../language/translate/MosesTranslator.java | 2 + ...rg.apache.tika.language.translate.Translator | 3 +- .../translate/translator.google.properties | 6 +- .../translate/translator.joshua.properties | 22 ++ .../translate/translator.lingo24.properties | 5 - .../translate/translator.moses.properties | 5 - .../translate/JoshuaNetworkTranslatorTest.java | 41 ++++ .../translate/MicrosoftTranslatorTest.java | 1 - .../translate/YandexTranslatorTest.java | 2 - 15 files changed, 323 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
