mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-12 00:39:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Guard against '><' causing translation recursion

Browse Source
This commit is contained in:
Yair Morgenstern
2023-05-31 15:21:49 +03:00
parent ebf6189c1c
commit b851abc7fd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/models/translations/Translations.kt
View File

@ -299,7 +299,9 @@ object TranslationActiveModsCache {
*/ */
fun String.tr(hideIcons:Boolean = false): String { fun String.tr(hideIcons:Boolean = false): String {
val language:String = UncivGame.Current.settings.language val language:String = UncivGame.Current.settings.language
if (contains('<') && contains('>')) { // Conditionals!
// '<' and '>' checks for quick 'no' answer, regex to ensure that no one accidentally put '><' and ruined things
if (contains('<') && contains('>') && pointyBraceRegex.containsMatchIn(this)) { // Conditionals!
/** /**
* So conditionals can contain placeholders, such as <vs [unitFilter] units>, which themselves * So conditionals can contain placeholders, such as <vs [unitFilter] units>, which themselves
* can contain multiple filters, such as <vs [{Military} {Water}] units>. * can contain multiple filters, such as <vs [{Military} {Water}] units>.