Skip to content

Commit 107facd

Browse files
committed
fix order of script in language tag
1 parent 8baf811 commit 107facd

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

library/src/main/java/de/westnordost/osmfeatures/IDLocalizedFeatureCollection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ private static String getLocalizationFilename(Locale locale)
119119
String script = locale.getScript();
120120

121121
StringBuilder builder = new StringBuilder(lang);
122-
if (!country.isEmpty()) builder.append("-").append(country);
123122
if (!script.isEmpty()) builder.append("-").append(script);
123+
if (!country.isEmpty()) builder.append("-").append(country);
124124
builder.append(".json");
125125
return builder.toString();
126126
}

library/src/test/java/de/westnordost/osmfeatures/IDLocalizedFeatureCollectionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ public class IDLocalizedFeatureCollectionTest
9696
{
9797
@Override public boolean exists(String name)
9898
{
99-
return Arrays.asList("presets.json", "de-AT.json", "de.json", "de-Cyrl.json", "de-AT-Cyrl.json").contains(name);
99+
return Arrays.asList("presets.json", "de-AT.json", "de.json", "de-Cyrl.json", "de-Cyrl-AT.json").contains(name);
100100
}
101101

102102
@Override public InputStream open(String name) throws IOException
103103
{
104104
if (name.equals("presets.json")) return getStream("some_presets_min.json");
105105
if (name.equals("de-AT.json")) return getStream("localizations_de-AT.json");
106106
if (name.equals("de.json")) return getStream("localizations_de.json");
107-
if (name.equals("de-AT-Cyrl.json")) return getStream("localizations_de-AT-Cyrl.json");
107+
if (name.equals("de-Cyrl-AT.json")) return getStream("localizations_de-Cyrl-AT.json");
108108
if (name.equals("de-Cyrl.json")) return getStream("localizations_de-Cyrl.json");
109109
throw new IOException("File not found");
110110
}

0 commit comments

Comments
 (0)