[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] /: i18n: Set parameters to xgettext from inside calligra_xgettext.sh
From:       Dag Andersen <danders () get2net ! dk>
Date:       2016-12-02 9:00:44
Message-ID: E1cCji0-000226-Tx () code ! kde ! org
[Download RAW message or body]

Git commit 29fcc24992ebe9e46cd4a9dddbd4157909e50747 by Dag Andersen.
Committed on 02/12/2016 at 09:00.
Pushed by danders into branch 'master'.

i18n: Set parameters to xgettext from inside calligra_xgettext.sh

M  +14   -0    calligra_xgettext.sh
M  +0    -8    tests/parameters.sh

https://commits.kde.org/calligra/29fcc24992ebe9e46cd4a9dddbd4157909e50747

diff --git a/calligra_xgettext.sh b/calligra_xgettext.sh
index d59351e..f63224d 100644
--- a/calligra_xgettext.sh
+++ b/calligra_xgettext.sh
@@ -7,6 +7,7 @@
 #     calligra_xgettext myapp.pot `find . -name \*.cpp -o -name \*.h`
 #
 function calligra_xgettext() {
+    echo -n "Creating $1 ... " 1>&2
     POTFILE="$podir/$1"
     shift
     if test -n "$*"; then
@@ -15,6 +16,10 @@ function calligra_xgettext() {
         calligra_xgettext_internal $* | tee "${POTFILE}" | tail -n1 | grep "^msgstr" > /dev/null \
             || rm -f "${POTFILE}" 2> /dev/null
     fi
+    if [ -e ${POTFILE} ]
+    then echo "done" 1>&2
+    else echo "failed" 1>&2
+    fi
 }
 
 function calligra_xgettext_internal() {
@@ -25,6 +30,15 @@ function calligra_xgettext_internal() {
     POT_MERGED="`mktemp $podir/_merged_XXXXXXXX.pot`"
 
     $XGETTEXT ${CXG_EXTRA_ARGS} ${SRC_FILES} -o "${POT_PART_NORMAL}" --force-po
+
+    XGETTEXT_FLAGS_CALLIGRA="\
+--copyright-holder=This_file_is_part_of_KDE \
+--msgid-bugs-address=http://bugs.kde.org \
+--from-code=UTF-8
+-C -k --kde \
+-kkundo2_i18n:1 -kkundo2_i18np:1,2 -kkundo2_i18nc:1c,2 -kkundo2_i18ncp:1c,2,3 \
+"
+
     $XGETTEXT_PROGRAM ${XGETTEXT_FLAGS_CALLIGRA} ${CXG_EXTRA_ARGS} ${SRC_FILES} -o "${POT_PART_QUNDOFORMAT}"
 
     if [ $(cat ${POT_PART_NORMAL} ${POT_PART_QUNDOFORMAT} | grep -c \(qtundo-format\)) != 0 ]; then
diff --git a/tests/parameters.sh b/tests/parameters.sh
index 2236ff3..3d1b47c 100644
--- a/tests/parameters.sh
+++ b/tests/parameters.sh
@@ -27,11 +27,3 @@ XGETTEXT_FLAGS_WWW="\
 -L PHP \
 -ki18n -ki18n_var -ki18n_noop \
 "
-# flags for kundo extraction
-XGETTEXT_FLAGS_CALLIGRA="\
---copyright-holder=This_file_is_part_of_KDE \
---msgid-bugs-address=http://bugs.kde.org \
---from-code=UTF-8
--C -k --kde \
--kkundo2_i18n:1 -kkundo2_i18np:1,2 -kkundo2_i18nc:1c,2 -kkundo2_i18ncp:1c,2,3 \
-"
[prev in list] [next in list] [prev in thread] [next in thread]