Author: cazfi
Date: Sun Mar 8 04:03:08 2015
New Revision: 28464
URL: http://svn.gna.org/viewcvs/freeciv?rev=28464&view=rev
Log:
Replaced "--escape" addition configure sed-magic by having it in Makevars
XGETTEXT_PARAMETERS
See patch #5874
Modified:
branches/S2_6/configure.ac
branches/S2_6/translations/freeciv/Makevars
branches/S2_6/translations/nations/Makevars
branches/S2_6/translations/ruledit/Makevars
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=28464&r1=28463&r2=28464&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Sun Mar 8 04:03:08 2015
@@ -1303,17 +1303,15 @@
dnl Most of the C comments copied to freeciv.pot are spurious;
dnl change to only copy those with prefix "TRANS:"
-dnl Also add --escape to the arguments to convert extended
-dnl characters to escape characters.
AC_CONFIG_COMMANDS([fc_default-4],[[for domain in $PODOMAINS ; do
if test -f translations/${domain}/Makefile ; then
- if grep 'add-comments="TRANS:" --escape' translations/${domain}/Makefile
>/dev/null 2>&1 ; then
+ if grep 'add-comments="TRANS:"' translations/${domain}/Makefile
>/dev/null 2>&1 ; then
# has already been modified
:
else
echo modifying translations/${domain}/Makefile add-comments/escape
mv -f translations/${domain}/Makefile
translations/${domain}/Makefile.tmp
- sed -e 's/add-comments=TRANSLATORS:/add-comments="TRANS:" --escape/'
translations/${domain}/Makefile.tmp > translations/${domain}/Makefile
+ sed -e 's/add-comments=TRANSLATORS:/add-comments="TRANS:"/'
translations/${domain}/Makefile.tmp > translations/${domain}/Makefile
rm translations/${domain}/Makefile.tmp
fi
fi
Modified: branches/S2_6/translations/freeciv/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/Makevars?rev=28464&r1=28463&r2=28464&view=diff
==============================================================================
--- branches/S2_6/translations/freeciv/Makevars (original)
+++ branches/S2_6/translations/freeciv/Makevars Sun Mar 8 04:03:08 2015
@@ -13,7 +13,7 @@
--keyword=N_ --flag=N_:1:pass-c-format \
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/nations/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/Makevars?rev=28464&r1=28463&r2=28464&view=diff
==============================================================================
--- branches/S2_6/translations/nations/Makevars (original)
+++ branches/S2_6/translations/nations/Makevars Sun Mar 8 04:03:08 2015
@@ -13,7 +13,7 @@
--keyword=N_ --flag=N_:1:pass-c-format \
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
Modified: branches/S2_6/translations/ruledit/Makevars
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/Makevars?rev=28464&r1=28463&r2=28464&view=diff
==============================================================================
--- branches/S2_6/translations/ruledit/Makevars (original)
+++ branches/S2_6/translations/ruledit/Makevars Sun Mar 8 04:03:08 2015
@@ -14,7 +14,7 @@
--keyword=--keyword=Q_ --keyword=PL_:1,2 \
--keyword=R__ \
--flag=error:3:c-format --flag=error_at_line:5:c-format \
- --language=C
+ --language=C --escape
# This is the copyright holder that gets inserted into the header of the
# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
