Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-04-14 14:08:26 +02:00
commit 62c786bf64

View file

@ -638,7 +638,7 @@ public class SearchPhrase {
public String getUnknownWordToSearch() { public String getUnknownWordToSearch() {
List<String> unknownSearchWords = getUnknownSearchWords(); List<String> unknownSearchWords = getUnknownSearchWords();
String wordToSearch = ""; String wordToSearch = getUnknownSearchWord();
if (unknownSearchWords.size() > 0) { if (unknownSearchWords.size() > 0) {
List<String> searchWords = new ArrayList<>(unknownSearchWords); List<String> searchWords = new ArrayList<>(unknownSearchWords);
searchWords.add(0, getUnknownSearchWord()); searchWords.add(0, getUnknownSearchWord());