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

List:       kde-commits
Subject:    l10n-kde4/scripts
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2008-11-25 21:16:03
Message-ID: 1227647763.726127.23653.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 889046 by aacid:

qtonly is now only used to decide if the resulting po go to /qt/ dir or not
to use Qt extraction we have XGETTEXT_QT now


 M  +4 -6      extract-messages.sh  
 M  +1 -1      update_translations  


--- trunk/l10n-kde4/scripts/extract-messages.sh #889045:889046
@@ -24,16 +24,14 @@
 
    # using xgettext 0.15 or later
    ### TODO what --flags param should be used?
-   if test x"$QTONLY" = x"yes"; then
-     XGETTEXT_FLAGS="--from-code=UTF-8 -C --qt -ktr:1,1t -ktr:1,2c,2t \
-kQT_TRANSLATE_NOOP:1c,2,2t -kQT_TR_NOOP:1,1t -ktranslate:1c,2,2t \
                -ktranslate:2,3c,3t"
-   else
-     XGETTEXT_FLAGS="--copyright-holder=This_file_is_part_of_KDE --from-code=UTF-8 \
-C --kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \
-kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 \
                -kki18ncp:1c,2,3 --msgid-bugs-address=http://bugs.kde.org"
-   fi
+   XGETTEXT_FLAGS_QT="--from-code=UTF-8 -C --qt -ktr:1,1t -ktr:1,2c,2t \
-kQT_TRANSLATE_NOOP:1c,2,2t -kQT_TR_NOOP:1,1t -ktranslate:1c,2,2t \
-ktranslate:2,3c,3t" +   XGETTEXT_FLAGS="--copyright-holder=This_file_is_part_of_KDE \
--from-code=UTF-8 -C --kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 \
-ktr2i18n:1 -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 \
-kki18np:1,2 -kki18ncp:1c,2,3 --msgid-bugs-address=http://bugs.kde.org"  export \
XGETTEXT_FLAGS +   export XGETTEXT_FLAGS_QT
 
    if test -f Messages.sh; then
        # Note: Messages.sh is supposed to get the translators' placeholder by rc.cpp
-       podir=$podir srcdir=. XGETTEXT_PROGRAM="${XGETTEXT:-xgettext}" \
XGETTEXT="${XGETTEXT:-xgettext} $XGETTEXT_FLAGS" bash Messages.sh +       \
podir=$podir srcdir=. XGETTEXT_PROGRAM="${XGETTEXT:-xgettext}" \
XGETTEXT="${XGETTEXT:-xgettext} $XGETTEXT_FLAGS" XGETTEXT_QT="${XGETTEXT:-xgettext} \
$XGETTEXT_FLAGS_QT" bash Messages.sh  fi
    exit_code=$?
    if test "$exit_code" -ne 0; then
--- trunk/l10n-kde4/scripts/update_translations #889045:889046
@@ -142,7 +142,7 @@
       ls -d $mod/po
   
       (cd $mod && XGETTEXT=`which xgettext` \
-        EXTRACTRC="perl $extractrc" EXTRACTATTR="perl $extractattr" \
PREPARETIPS="perl $preparetips" REPACKPOT="perl $repackpot" PACKAGE=$mod \
QTONLY=$qtonly bash $BASEDIR/$transmod/scripts/extract-messages.sh) +        \
EXTRACTRC="perl $extractrc" EXTRACTATTR="perl $extractattr" PREPARETIPS="perl \
$preparetips" REPACKPOT="perl $repackpot" PACKAGE=$mod bash \
$BASEDIR/$transmod/scripts/extract-messages.sh)  rm -f $mod/messages.log
   
       (cd $mod &&


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