Merge pull request #840 from ybw0014/fix/locale-language-range

LordIdra · web-flow · commit 7626d000a84d · 2026-06-16T17:39:37.000+01:00
fix: use standard bcp 47 code from Locale to construct LanguageRange
diff --git a/rebar/src/main/kotlin/io/github/pylonmc/rebar/i18n/RebarTranslator.kt b/rebar/src/main/kotlin/io/github/pylonmc/rebar/i18n/RebarTranslator.kt
@@ -125,7 +125,7 @@ class RebarTranslator private constructor(private val addon: RebarAddon) : Trans
             val lookupList = LocaleUtils.localeLookupList(locale)
             lookupList.reversed()
                 .mapIndexed { index, value ->
-                    Locale.LanguageRange(value.toString().replace('_', '-'), (index + 1.0) / lookupList.size)
+                    Locale.LanguageRange(value.toLanguageTag(), (index + 1.0) / lookupList.size)
                 }
                 .sortedByDescending { it.weight }
         }

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ class RebarTranslator private constructor(private val addon: RebarAddon) : Trans`
`125`	`125`	`val lookupList = LocaleUtils.localeLookupList(locale)`
`126`	`126`	`lookupList.reversed()`
`127`	`127`	`.mapIndexed { index, value ->`
`128`		`- Locale.LanguageRange(value.toString().replace('_', '-'), (index + 1.0) / lookupList.size)`
	`128`	`+ Locale.LanguageRange(value.toLanguageTag(), (index + 1.0) / lookupList.size)`
`129`	`129`	`}`
`130`	`130`	`.sortedByDescending { it.weight }`
`131`	`131`	`}`