Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-04-13 19:44:51 +02:00
commit 29b38d534f

View file

@ -639,7 +639,7 @@ public class SearchPhrase {
List<String> unknownSearchWords = getUnknownSearchWords(); List<String> unknownSearchWords = getUnknownSearchWords();
String wordToSearch = ""; String wordToSearch = "";
if (getUnknownSearchWordLength() > 1) { if (unknownSearchWords.size() > 0) {
List<String> searchWords = new ArrayList<>(unknownSearchWords); List<String> searchWords = new ArrayList<>(unknownSearchWords);
searchWords.add(0, getUnknownSearchWord()); searchWords.add(0, getUnknownSearchWord());
Collections.sort(searchWords, new Comparator<String>() { Collections.sort(searchWords, new Comparator<String>() {