Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-01-14 11:07:23 +01:00
commit c8256d75eb
3 changed files with 3 additions and 2 deletions

View file

@ -26,7 +26,7 @@ public abstract class MapRenderingTypes {
private static final Log log = PlatformUtil.getLog(MapRenderingTypes.class);
public static final String[] langs = new String[] { "af", "als", "ar", "az", "be", "bg", "bn", "bpy", "br", "bs", "ca", "ceb", "cs", "cy", "da", "de", "el", "eo", "es", "et", "eu", "fa", "fi", "fr", "fy", "ga", "gl", "he", "hi", "hsb",
"hr", "ht", "hu", "hy", "id", "is", "it", "ja", "ka", "ko", "ku", "la", "lb", "lt", "lv", "mk", "ml", "mr", "ms", "nds", "new", "nl", "nn", "no", "nv", "os", "pl", "pms", "pt", "ro", "ru", "sc", "sh", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "vi", "vo", "zh" };
"hr", "ht", "hu", "hy", "id", "is", "it", "ja", "ka", "ko", "ku", "la", "lb", "lo", "lt", "lv", "mk", "ml", "mr", "ms", "nds", "new", "nl", "nn", "no", "nv", "os", "pl", "pms", "pt", "ro", "ru", "sc", "sh", "sk", "sl", "sq", "sr", "sv", "sw", "ta", "te", "th", "tl", "tr", "uk", "vi", "vo", "zh" };
public final static byte RESTRICTION_NO_RIGHT_TURN = 1;

View file

@ -562,7 +562,7 @@ public class SearchCoreFactory {
if (p.hasObjectType(ObjectType.POI_TYPE)) {
return -1;
}
if (p.getUnknownSearchWordLength() > 3 || p.getRadiusLevel() > 1) {
if (p.getUnknownSearchWordLength() >= 3 || p.getRadiusLevel() > 1) {
return SEARCH_AMENITY_BY_NAME_API_PRIORITY_IF_3_CHAR;
}
return -1;

View file

@ -825,6 +825,7 @@
<string name="lang_ta">Tamil</string>
<string name="lang_ml">Malayalam</string>
<string name="lang_lb">Luxembourgish</string>
<string name="lang_lo">Lao</string>
<string name="lang_os">Ossetian</string>
<string name="lang_eo">Esperanto</string>
<string name="lang_es_us">Spanish (American)</string>