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

List:       kde-core-devel
Subject:    [PATCH] Fix automatic conversion from the old charset placeholder
From:       Nicolas Goutte <nicolasg () snafu ! de>
Date:       2004-09-16 23:54:09
Message-ID: 200409170154.09982.nicolasg () snafu ! de
[Download RAW message or body]

The attached patch fixes a problem in the file kde-common/admin/cvs.sh 

Modern gettext programs need that a valid charset is declared in the files or 
they refuse to work. However due to the $ sign that is too much in the 
script, the existing .pot file that has still the old charset placeholder is 
not converted to declare using UTF-8, so the following message merge fails.

Please commit this in CVS HEAD, KDE_3_3_BRANCH and KOFFICE_1_3_BRANCH
(I have not enough karma for the admin directory. Sorry!)

Have a nice day!

["cvs_sh.diff" (text/x-diff)]

Index: cvs.sh
===================================================================
RCS file: /home/kde/kde-common/admin/cvs.sh,v
retrieving revision 1.132
diff -u -p -r1.132 cvs.sh
--- cvs.sh	13 Sep 2004 23:15:08 -0000	1.132
+++ cvs.sh	16 Sep 2004 23:43:42 -0000
@@ -605,7 +605,7 @@ for i in `ls -1 po/*.pot 2>/dev/null | s
    egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > \
temp.pot  if test -f po.backup/$i && test -n "`diff temp.pot po.backup/$i`"; then
 	echo "will update $i"
-        sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: \
text/plain; charset=UTF-8\\n",' po.backup/$backup_$i > po/$i.new && mv po/$i.new \
po.backup/backup_$i +        sed -e 's,^"Content-Type: text/plain; \
charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' \
po.backup/backup_$i > po/$i.new && mv po/$i.new po.backup/backup_$i  msgmerge -q \
po.backup/backup_$i po/$i > temp.pot  mv temp.pot po/$i
   else



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