From 76b629db325192c2e0255cfb4ccbf67fbe2fad95 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 11 Jul 2024 19:08:42 +0200 Subject: [PATCH] disable --no-wrap option --- install/po_gen_installer.sh | 5 ++--- po_gen.sh | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/install/po_gen_installer.sh b/install/po_gen_installer.sh index ff9f816fb..fa188f3c7 100755 --- a/install/po_gen_installer.sh +++ b/install/po_gen_installer.sh @@ -39,8 +39,7 @@ FOLDERS="install" find $FOLDERS -name "*.php" > PHPFILESLIST # Run the xgettext command with various options. Do not change these options to keep the POT/PO files consistent in Wavelog -xgettext --no-wrap \ - -F \ +xgettext -F \ -o $POT_FILE \ --from-code=UTF-8 \ --keyword=__ \ @@ -65,7 +64,7 @@ head -n 3 "$POT_FILE" > POT_HEADER # Now we can merge the POT file (PO template) into each found PO file for po in $(find $FOLDERS -name "*.po"); do - msgmerge --no-wrap --update -vv --backup=none --no-fuzzy-matching "$po" $POT_FILE; + msgmerge --update -vv --backup=none --no-fuzzy-matching "$po" $POT_FILE; # Replace the first three lines of the PO file with the POT file header sed -i '1,3d' "$po" cat POT_HEADER "$po" > temp.po && mv temp.po "$po" diff --git a/po_gen.sh b/po_gen.sh index ff78a7532..5e99a81a2 100755 --- a/po_gen.sh +++ b/po_gen.sh @@ -39,8 +39,7 @@ FOLDERS="application assets src system" find $FOLDERS -name "*.php" > PHPFILESLIST # Run the xgettext command with various options. Do not change these options to keep the POT/PO files consistent in Wavelog -xgettext --no-wrap \ - -F \ +xgettext -F \ -o $POT_FILE \ --from-code=UTF-8 \ --keyword=__ \ @@ -65,7 +64,7 @@ head -n 3 "$POT_FILE" > POT_HEADER # Now we can merge the POT file (PO template) into each found PO file for po in $(find $FOLDERS -name "*.po"); do - msgmerge --no-wrap --update -vv --backup=none --no-fuzzy-matching "$po" $POT_FILE; + msgmerge --update -vv --backup=none --no-fuzzy-matching "$po" $POT_FILE; # Replace the first three lines of the PO file with the POT file header sed -i '1,3d' "$po" cat POT_HEADER "$po" > temp.po && mv temp.po "$po"