From 552ab5913ff530a403019c297ba95932f07e296c Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 20 Jul 2021 19:54:18 +0200
Subject: [PATCH] i18n: Run yarn i18n in submodules for each before overlaying

---
 merge_helpers.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/merge_helpers.sh b/merge_helpers.sh
index 791d1f6..d9562af 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -74,8 +74,6 @@ revert_i18n_changes() {
 
     git checkout upstream/master -- "$i18n_path"
 
-    $yarn i18n
-
     if [[ "$skip_commit" != [Yy]* ]]; then
         git commit -m "Automatic i18n reversion" || true
     fi
@@ -105,18 +103,24 @@ automatic_i18n_reversion() {
 }
 
 automatic_i18n_adjustment() {
-    node "$i18n_helper_path" "$SCHILDI_ROOT/matrix-react-sdk/$i18n_path" "$i18n_overlay_path/matrix-react-sdk"
+    # matrix-react-sdk
     pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/matrix-react-sdk/$i18n_path" "$i18n_overlay_path/matrix-react-sdk"
     apply_i18n_changes "$i18n_path"
     popd > /dev/null
 
-    node "$i18n_helper_path" "$SCHILDI_ROOT/element-web/$i18n_path" "$i18n_overlay_path/element-web"
+    # element-web
     pushd "$SCHILDI_ROOT/element-web" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/element-web/$i18n_path" "$i18n_overlay_path/element-web"
     apply_i18n_changes "$i18n_path"
     popd > /dev/null
 
-    node "$i18n_helper_path" "$SCHILDI_ROOT/element-desktop/$i18n_path" "$i18n_overlay_path/element-desktop"
+    # element-desktop
     pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
+    $yarn i18n
+    node "$i18n_helper_path" "$SCHILDI_ROOT/element-desktop/$i18n_path" "$i18n_overlay_path/element-desktop"
     apply_i18n_changes "$i18n_path"
     popd > /dev/null
 }