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

asynch update and render (aka frameskip)

Browse Source
This commit is contained in:
minjaesong
2017-07-08 20:38:05 +09:00
parent 4120fa102d
commit b91ba9fc08
101 changed files with 575 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
package net.torvald.terrarum.langpack
import net.torvald.terrarum.utils.JsonFetcher
import net.torvald.terrarum.TerrarumGDX
import net.torvald.terrarum.Terrarum
import java.io.*
import java.util.*
@@ -108,12 +108,12 @@ object Lang {
fun fallback(): String = langpack["${key}_$FALLBACK_LANG_CODE"] ?: "$$key"
val ret = langpack["${key}_${TerrarumGDX.gameLocale}"]
val ret = langpack["${key}_${Terrarum.gameLocale}"]
val ret2 = if (ret.isNullOrEmpty()) fallback() else ret!!
// special treatment
if (key.startsWith("MENU_LABEL_PRESS_START_SYMBOL"))
return ret2.replace('>', TerrarumGDX.joypadLabelStart).capitalize()
return ret2.replace('>', Terrarum.joypadLabelStart).capitalize()
return ret2.capitalize()
}
@@ -125,7 +125,7 @@ object Lang {
fun pluralise(word: String, count: Int): String {
if (count < 2) return word
when (TerrarumGDX.gameLocale) {
when (Terrarum.gameLocale) {
"fr" -> {
if (Arrays.binarySearch(FRENCH_WORD_NORMAL_PLURAL, word) >= 0) {
return word + "s"