Skip to content

Commit c7a05a9

Browse files
committed
language: add integrated language as fallback
1 parent f7464cc commit c7a05a9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/main/java/de/bixilon/minosoft/data/language/IntegratedLanguage.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Minosoft
3-
* Copyright (C) 2020-2023 Moritz Zwerger
3+
* Copyright (C) 2020-2026 Moritz Zwerger
44
*
55
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
66
*
@@ -27,7 +27,7 @@ object IntegratedLanguage {
2727

2828
fun load(name: String) {
2929
Log.log(LogMessageType.LOADING, LogLevels.VERBOSE) { "Loading language files (${name})" }
30-
val language = LanguageUtil.load(name, null, IntegratedAssets.DEFAULT, minosoft("language/"))
30+
val language = LanguageUtil.load(name, null, IntegratedAssets.DEFAULT, minosoft("language/"), integrated = false)
3131
LANGUAGE.translators[Namespaces.MINOSOFT] = language
3232
}
3333
}

src/main/java/de/bixilon/minosoft/data/language/LanguageUtil.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Minosoft
3-
* Copyright (C) 2020-2025 Moritz Zwerger
3+
* Copyright (C) 2020-2026 Moritz Zwerger
44
*
55
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
66
*
@@ -99,7 +99,7 @@ object LanguageUtil {
9999
}
100100

101101

102-
fun load(language: String, version: Version?, assets: AssetsManager, path: ResourceLocation = ResourceLocation.of("lang/")): Translator {
102+
fun load(language: String, version: Version?, assets: AssetsManager, path: ResourceLocation = ResourceLocation.of("lang/"), integrated: Boolean = true): Translator {
103103
val name = language.lowercase()
104104
val json = version != null && version.jsonLanguage
105105

@@ -114,6 +114,10 @@ object LanguageUtil {
114114
}
115115
loadLanguage(FALLBACK_LANGUAGE, assets, json, path)?.let { translators += it }
116116

117+
if (integrated) {
118+
translators += IntegratedLanguage.LANGUAGE
119+
}
120+
117121
if (translators.size == 1) {
118122
return translators.first()
119123
}

0 commit comments

Comments
 (0)