wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

3.8.4-patch1

Browse source 
Fixed regexes broken for Android by #2538
This commit is contained in:
Yair Morgenstern 2020-04-30 15:57:08 +03:00
parent ba2e6d26e5
commit cc206494df
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -33,8 +33,8 @@ allprojects {
version = '1.0.1'
ext {
appName = "Unciv"
appCodeNumber = 421
appVersion = "3.8.4"
appCodeNumber = 422
appVersion = "3.8.4-patch1"
gdxVersion = '1.9.10'
roboVMVersion = '2.3.1'

18
core/src/com/unciv/models/translations/Translations.kt
View file

@ -143,17 +143,19 @@ class Translations : LinkedHashMap<String, TranslationEntry>(){
}
// we don't need to allocate different memory for these every time we .tr() - or recompile them.
// We don't need to allocate different memory for these every time we .tr() - or recompile them.
// Please note: The extra \] and \} are NOT removable, despite what Android Studio might recommend -
// they are necessary for Android Java 6 phones to parse the regex properly!
// Expect a literal [ followed by a captured () group and a literal ].
// The group may contain any number of any character except ] - pattern [^]]
val squareBraceRegex = Regex("""\[([^]]*)]""")
// Expect a literal [ followed by a captured () group and a literal ].
// The group may contain any number of any character except ] - pattern [^]]
val squareBraceRegex = Regex("""\[([^]]*)\]""")
// Just look for either [ or ]
val eitherSquareBraceRegex = Regex("""\[|]""")
// Just look for either [ or ]
val eitherSquareBraceRegex = Regex("""\[|\]""")
// Analogous as above: Expect a {} pair with any chars but } in between and capture that
val curlyBraceRegex = Regex("""\{([^}]*)}""")
// Analogous as above: Expect a {} pair with any chars but } in between and capture that
val curlyBraceRegex = Regex("""\{([^}]*)\}""")
fun String.tr(): String {