From 9c3089c2b9c49411c2b9200f11cf5275a9462177 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 22 Aug 2020 10:51:45 +0200 Subject: [PATCH] Revert back to updated correct_strings.sh --- correct_strings.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/correct_strings.sh b/correct_strings.sh index 579abb5b6a..8990221bf7 100755 --- a/correct_strings.sh +++ b/correct_strings.sh @@ -2,14 +2,18 @@ mydir="$(dirname "$(realpath "$0")")" +# Element -> SchildiChat find "$mydir/vector/src/main/res" -name strings.xml -exec \ sed -i 's|Element|SchildiChat|g' '{}' \; +# Restore Element where it makes sense find "$mydir/vector/src/main/res" -name strings.xml -exec \ - sed -i 's|SchildiChat Web|Element Web|g' '{}' \; + sed -i 's/SchildiChat \(Web\|iOS\|Desktop\)/Element \1/g' '{}' \; find "$mydir/vector/src/main/res" -name strings.xml -exec \ - sed -i 's|SchildiChat iOS|Element iOS|g' '{}' \; + sed -i 's|SchildiChat Matrix Services|Element Matrix Services|g' '{}' \; find "$mydir/vector/src/main/res" -name strings.xml -exec \ sed -i 's|\("use_latest_riot">.*\)SchildiChat\(.*\)|\1Element\2|g' '{}' \; +find "$mydir/vector/src/main/res" -name strings.xml -exec \ + sed -i 's|\("use_other_session_content_description">.*\)SchildiChat\(.*SchildiChat.*\)|\1SchildiChat/Element\2|' '{}' \; # Requires manual intervention for correct grammar sed -i 's|!nnen|wolpertinger|g' "$mydir/vector/src/main/res/values-de/strings.xml"