curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-13 03:54:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

better lang for buckets

Browse Source
This commit is contained in:
minjaesong
2024-09-14 22:50:27 +09:00
parent e8eae1e961
commit c42f776f81
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/mods/basegame/locales/en/dnt.json Normal file
View File

@@ -0,0 +1,3 @@
{
"NULSTR": ""
}

7
assets/mods/basegame/locales/en/items.json
View File

@@ -1,10 +1,9 @@
{ {
"ITEM_ALLOYING_FURNACE": "Alloying Furnace", "ITEM_ALLOYING_FURNACE": "Alloying Furnace",
"ITEM_BRICK_SINGULAR": "Brick", /* always singular */ "ITEM_BRICK_SINGULAR": "Brick", /* always singular */
"ITEM_BUCKET_IRON": "Iron Bucket", "ITEM_BUCKET_IRON": "Iron Bucket %1$s",
"ITEM_BUCKET_IRON_WITH": "Iron Bucket with %1$s", "ITEM_BUCKET_WOODEN": "Wooden Bucket %1$s",
"ITEM_BUCKET_WOODEN": "Wooden Bucket", "ITEM_BUCKET_TEMPLATE": "with %1$s",
"ITEM_BUCKET_WOODEN_WITH": "Wooden Bucket with %1$s",
"ITEM_CALENDAR": "Calendar", "ITEM_CALENDAR": "Calendar",
"ITEM_CHARCOAL": "Charcoal", "ITEM_CHARCOAL": "Charcoal",
"ITEM_CHERRY_BOMB": "Bomb", "ITEM_CHERRY_BOMB": "Bomb",

7
assets/mods/basegame/locales/koKR/items.json
View File

@@ -1,10 +1,9 @@
{ {
"ITEM_ALLOYING_FURNACE": "합금 화로", "ITEM_ALLOYING_FURNACE": "합금 화로",
"ITEM_BRICK_SINGULAR": "벽돌", /* always singular */ "ITEM_BRICK_SINGULAR": "벽돌", /* always singular */
"ITEM_BUCKET_IRON": "철 양동이", "ITEM_BUCKET_IRON": "%1$s 철 양동이",
"ITEM_BUCKET_IRON_WITH": "%1$s 담은 철 양동이", "ITEM_BUCKET_WOODEN": "%1$s 나무 양동이",
"ITEM_BUCKET_WOODEN": "나무 양동이", "ITEM_BUCKET_TEMPLATE": "%1$s 담은",
"ITEM_BUCKET_WOODEN_WITH": "%1$s 담은 나무 양동이",
"ITEM_CALENDAR": "달력", "ITEM_CALENDAR": "달력",
"ITEM_CHARCOAL": "목탄", "ITEM_CHARCOAL": "목탄",
"ITEM_CHERRY_BOMB": "폭탄", "ITEM_CHERRY_BOMB": "폭탄",

18
src/net/torvald/terrarum/langpack/Lang.kt
View File

@@ -92,7 +92,7 @@ object Lang {
*/ */
//println(json.entrySet()) //println(json.entrySet())
JsonFetcher.forEachSiblings(json) { key, value -> JsonFetcher.forEachSiblings(json) { key, value ->
langpack.put("${key}_$lang", value.asString()) langpack.put("${key}_$lang", value.asString().trim())
} }
} }
@@ -119,7 +119,7 @@ object Lang {
JsonFetcher.forEachSiblings(json.get("resources").get("data")) { _, entry -> JsonFetcher.forEachSiblings(json.get("resources").get("data")) { _, entry ->
langpack.put( langpack.put(
"${entry.getString("n")}_$lang", "${entry.getString("n")}_$lang",
entry.getString("s") entry.getString("s").trim()
) )
} }
@@ -154,7 +154,7 @@ object Lang {
sb.append(getstr(args[0])) sb.append(getstr(args[0]))
args.subList(1, args.size).forEach { args.subList(1, args.size).forEach {
val oldstr = sb.toString() val oldstr = sb.toString().trim()
sb.clear() sb.clear()
formatter.format(getstr(it), oldstr) formatter.format(getstr(it), oldstr)
} }
@@ -162,9 +162,9 @@ object Lang {
if (decodeCache[App.GAME_LOCALE] == null) { if (decodeCache[App.GAME_LOCALE] == null) {
decodeCache[App.GAME_LOCALE] = HashMap() decodeCache[App.GAME_LOCALE] = HashMap()
} }
decodeCache[App.GAME_LOCALE]!!["$key+$capitalise"] = sb.toString() decodeCache[App.GAME_LOCALE]!!["$key+$capitalise"] = sb.toString().trim()
return sb.toString() return sb.toString().trim()
} }
} }
@@ -175,9 +175,9 @@ object Lang {
arguments.forEachIndexed { index, it0 -> arguments.forEachIndexed { index, it0 ->
val it = if (capitalise) it0.toString().capitalize() else it0.toString() val it = if (capitalise) it0.toString().capitalize() else it0.toString()
raw = raw.replace("{${index}}", it) raw = raw.replace("{${index}}", it.trim())
} }
return raw return raw.trim()
} }
/** /**
@@ -200,7 +200,7 @@ object Lang {
capCache[locale] = HashMap<String, String>() capCache[locale] = HashMap<String, String>()
if (!capCache[locale]!!.containsKey(key)) { if (!capCache[locale]!!.containsKey(key)) {
capCache[locale]!![key] = TitlecaseConverter(ret, locale) capCache[locale]!![key] = TitlecaseConverter(ret, locale).trim()
} }
return capCache[locale]!![key]!! return capCache[locale]!![key]!!
@@ -251,7 +251,7 @@ object Lang {
ret = ret.replace(matched0, resolved) ret = ret.replace(matched0, resolved)
} }
return ret return ret.trim()
} }
private fun String.getEndTag() = this.split("_").last() private fun String.getEndTag() = this.split("_").last()

4
src/net/torvald/terrarum/modulebasegame/gameitems/ItemFluidStorage.kt
View File

@@ -39,9 +39,9 @@ open class ItemFluidStoragePrototype(originalID: ItemID, sheetX: Int, sheetY: In
@Transient private val fluid = if (sheetX == 0) null else "fluid@$module:$sheetX" @Transient private val fluid = if (sheetX == 0) null else "fluid@$module:$sheetX"
override var originalName = if (fluid != null) override var originalName = if (fluid != null)
"${FluidCodex[fluid].nameKey}>>=${keyInLang}_WITH" "${FluidCodex[fluid].nameKey}>>=ITEM_BUCKET_TEMPLATE>>=$keyInLang"
else else
keyInLang "NULSTR>>=$keyInLang"
init { init {
itemImage = CommonResourcePool.getAsItemSheet(sheetName).get(sheetX,sheetY) itemImage = CommonResourcePool.getAsItemSheet(sheetName).get(sheetX,sheetY)