File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
core/src/main/kotlin/io/github/rothes/esu/core/user Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -54,10 +54,10 @@ interface User {
5454 fun <V , R > localedOrNull (langMap : Map <String , V >, block : (V ) -> R ? ): R ? {
5555 val lang = language
5656 return langMap[lang]?.let (block)
57- // If this locale is not found, try the same language.
58- ? : lang?.split (' _' )?.get( 0 )?.let { language ->
57+ // If this locale is not found, try the same language.
58+ ? : lang?.substringBefore (' _' )?.let { language ->
5959 val lang = language + ' _'
60- langMap.entries.filter { it.key.startsWith(lang) }.firstNotNullOfOrNull { block(it.value) }
60+ langMap.entries.find { it.key.startsWith(lang) }?. let { block(it.value) }
6161 }
6262 // Still? Use the server default locale instead.
6363 ? : langMap[EsuConfig .get().locale]?.let (block)
You can’t perform that action at this time.
0 commit comments