Skip to content

Commit c3f3466

Browse files
committed
reorder and update supported locales in LocaleUtils and LocaleUtilsTest
1 parent a411b65 commit c3f3466

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

app/src/main/kotlin/com/vrem/util/LocaleUtils.kt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ private val countriesLocales: SortedMap<String, Locale> =
2929
.toSortedMap()
3030

3131
val BULGARIAN: Locale = Locale.forLanguageTag("bg")
32-
3332
val CHINESE_SIMPLIFIED: Locale = Locale.forLanguageTag("zh-Hans")
34-
3533
val CHINESE_TRADITIONAL: Locale = Locale.forLanguageTag("zh-Hant")
3634
val DUTCH: Locale = Locale.forLanguageTag("nl")
3735
val ENGLISH: Locale = Locale.forLanguageTag("en")
@@ -42,34 +40,34 @@ val HUNGARIAN: Locale = Locale.forLanguageTag("hu")
4240
val ITALIAN: Locale = Locale.forLanguageTag("it")
4341
val JAPANESE: Locale = Locale.forLanguageTag("ja")
4442
val POLISH: Locale = Locale.forLanguageTag("pl")
45-
val PORTUGUESE_PORTUGAL: Locale = Locale.forLanguageTag("pt-PT")
4643
val PORTUGUESE_BRAZIL: Locale = Locale.forLanguageTag("pt-BR")
47-
val SPANISH: Locale = Locale.forLanguageTag("es")
44+
val PORTUGUESE_PORTUGAL: Locale = Locale.forLanguageTag("pt-PT")
4845
val RUSSIAN: Locale = Locale.forLanguageTag("ru")
46+
val SPANISH: Locale = Locale.forLanguageTag("es")
4947
val TURKISH: Locale = Locale.forLanguageTag("tr")
5048
val UKRAINIAN: Locale = Locale.forLanguageTag("uk")
5149

5250
val baseSupportedLocales: List<Locale> =
53-
setOf(
51+
listOf(
5452
BULGARIAN,
55-
DUTCH,
56-
GREEK,
57-
HUNGARIAN,
5853
CHINESE_SIMPLIFIED,
5954
CHINESE_TRADITIONAL,
55+
DUTCH,
6056
ENGLISH,
6157
FRENCH,
6258
GERMAN,
59+
GREEK,
60+
HUNGARIAN,
6361
ITALIAN,
6462
JAPANESE,
6563
POLISH,
6664
PORTUGUESE_BRAZIL,
6765
PORTUGUESE_PORTUGAL,
68-
SPANISH,
6966
RUSSIAN,
67+
SPANISH,
7068
TURKISH,
7169
UKRAINIAN,
72-
).toList()
70+
)
7371

7472
fun findByCountryCode(countryCode: String): Locale =
7573
availableLocales.firstOrNull { countryCode.uppercase(Locale.ROOT) == it.country }

app/src/test/kotlin/com/vrem/util/LocaleUtilsTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,21 +103,21 @@ class LocaleUtilsTest {
103103
val expected: Set<Locale> =
104104
setOf(
105105
BULGARIAN,
106-
DUTCH,
107-
GREEK,
108-
HUNGARIAN,
109106
CHINESE_SIMPLIFIED,
110107
CHINESE_TRADITIONAL,
108+
DUTCH,
111109
ENGLISH,
112110
FRENCH,
113111
GERMAN,
112+
GREEK,
113+
HUNGARIAN,
114114
ITALIAN,
115115
JAPANESE,
116116
POLISH,
117117
PORTUGUESE_BRAZIL,
118118
PORTUGUESE_PORTUGAL,
119-
SPANISH,
120119
RUSSIAN,
120+
SPANISH,
121121
TURKISH,
122122
UKRAINIAN,
123123
Locale.getDefault(),

0 commit comments

Comments
 (0)