From 44a89bb1d112369b257f6084be7fdc312787da99 Mon Sep 17 00:00:00 2001 From: Syer10 Date: Tue, 13 Jul 2021 14:24:05 -0400 Subject: [PATCH] Handle newlines better in the strings.xml --- .../kotlin/ca/gosyer/data/translation/XmlResourceBundle.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/ca/gosyer/data/translation/XmlResourceBundle.kt b/src/main/kotlin/ca/gosyer/data/translation/XmlResourceBundle.kt index 5b69d775..81d5a48c 100644 --- a/src/main/kotlin/ca/gosyer/data/translation/XmlResourceBundle.kt +++ b/src/main/kotlin/ca/gosyer/data/translation/XmlResourceBundle.kt @@ -49,15 +49,17 @@ class XmlResourceBundle internal constructor(internal val lookup: ConcurrentHash return XmlResourceBundle(ConcurrentHashMap(lookup + other.lookup)) } + private fun String.replaceAndroid() = replace("\\n", "%n") + fun getStringA(key: String): String { - return Formatter().format(getString(key)) + return Formatter().format(getString(key).replaceAndroid()) .let { formatter -> formatter.toString().also { formatter.close() } } } fun getString(key: String, vararg replacements: Any?): String { - return Formatter().format(getString(key), *replacements) + return Formatter().format(getString(key).replaceAndroid(), *replacements) .let { formatter -> formatter.toString().also { formatter.close() } }