Skip to content

Commit 82735b0

Browse files
committed
feat: support searching localized name
1 parent a4c5f1b commit 82735b0

7 files changed

Lines changed: 14 additions & 11 deletions

File tree

src/main/kotlin/icu/takeneko/appwebterminal/support/http/routing/AEServiceRouting.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ fun Application.configureAEServiceRouting() {
194194
val treeSearcher = TreeSearcher<MEStack>(Searcher.Logic.CONTAIN, pinIn)
195195
meStacks.forEach {
196196
val localName = it.what.displayName.toLocalizedString(lang).lowercase()
197-
logger.info(localName)
198197
treeSearcher.put(localName, it)
199198
}
200199
treeSearcher.search(search.lowercase())

src/main/kotlin/icu/takeneko/appwebterminal/util/FormattingUtil.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ fun Component.toLocalizedString(lang: String): String {
3434
}
3535

3636
is TranslatableContents -> {
37+
3738
val key = contents.key
3839
val args = contents.args.map {
3940
if (it is Component) {
4041
return@map it.toLocalizedString(lang)
4142
}
42-
return@map it
43+
return@map it.toString()
4344
}
4445
I18nUtil.translate(lang, key, *args.toTypedArray())
4546
}

src/main/kotlin/icu/takeneko/appwebterminal/util/I18nUtil.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package icu.takeneko.appwebterminal.util
33
import java.util.IllegalFormatException
44

55
object I18nUtil {
6-
val languageProviders = listOf<(String, String) -> String>(
6+
val languageProviders = listOf<(String, String) -> String?>(
77
{ lang, key -> KubejsI18nSupport.get(lang, key) },
88
{ lang, key -> MinecraftI18nSupport.get(lang, key) },
99
{ lang, key -> ServerI18nSupport.get(lang, key) }
@@ -12,7 +12,8 @@ object I18nUtil {
1212
fun get(language: String, key: String): String {
1313
val content = languageProviders.asSequence()
1414
.map { it(language, key) }
15-
.find { it.isNotEmpty() }
15+
.filterNotNull()
16+
.firstOrNull()
1617
return content ?: key
1718
}
1819

@@ -25,7 +26,7 @@ object I18nUtil {
2526
key
2627
}
2728
} else {
28-
key
29+
content
2930
}
3031
}
3132
}

src/main/kotlin/icu/takeneko/appwebterminal/util/KubejsI18nSupport.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ object KubejsI18nSupport {
3333
}
3434
}
3535

36-
fun get(language: String, key: String): String {
37-
return languages.get(language, key) ?: ""
36+
fun get(language: String, key: String): String? {
37+
return languages.get(language, key)
3838
}
3939
}

src/main/kotlin/icu/takeneko/appwebterminal/util/LanguageInstance.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,6 @@ class LanguageInstance(
4141
operator fun contains(key: String) = key in translations
4242

4343
fun getOrDefault(key: String, default: String = key) = translations[key] ?: default
44+
45+
fun get(key: String) = translations[key]
4446
}

src/main/kotlin/icu/takeneko/appwebterminal/util/MinecraftI18nSupport.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ object MinecraftI18nSupport {
2929
}
3030
}
3131

32-
fun get(language: String, key: String): String {
32+
fun get(language: String, key: String): String? {
3333
requestLanguage(language)
34-
return translations.get(language, key) ?: ""
34+
return translations.get(language, key)
3535
}
3636
}

src/main/kotlin/icu/takeneko/appwebterminal/util/ServerI18nSupport.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object ServerI18nSupport {
1717
return key in getInstance(language)
1818
}
1919

20-
fun get(language: String, key: String): String {
21-
return getInstance(language).getOrDefault(key, "")
20+
fun get(language: String, key: String): String? {
21+
return getInstance(language).get(key)
2222
}
2323
}

0 commit comments

Comments
 (0)