Re: l10n/i18n issue in gvfs

[Luca Ferretti <elle uca libero it>]

Il giorno mar, 08/01/2008 alle 09.12 +0100, Alexander Larsson ha
scritto:
> I tried to understand it before, but i just couldn't. There is this sed
> call in the Makefile:
> 	    && (sed -e '/^#/d' 						\
> 		    -e "s/^\[.*\] +//" 					\
> 		    -e '/^[ 	]*$$/d' 				\
> 		    -e "s  *@	$$posrcprefix& \\\\@" < $(srcdir)/$  in	\
> 		| sed -e '$$s/\\$$//') > $ -t \
> 
> The way I read it that should strip out the [] part. But it just doesn't
> seem to work, and I was unable to figure out why.


I've a working solution, but I'm sure it's correct or the best one.

The idea is: if the sed rule is able to remove comment lines (^#), then
use a similar rule to remove the line with "[encoding: UTF-8]".

The fix (attached as patch) should be applied to _glib_ and is a simple:

Index: po/Makefile.in.in
===================================================================
--- po/Makefile.in.in	(revisione 6279)
+++ po/Makefile.in.in	(copia locale)
@@ -254,7 +254,7 @@
 	  fi; \
 	  rm -f $ -t $@ \
 	    && (sed -e '/^#/d' 						\
-		    -e "s/^\[.*\] +//" 					\
+		    -e "/^\[.*\]/d" 					\
 		    -e '/^[ 	]*$$/d' 				\
 		    -e "s  *@	$$posrcprefix& \\\\@" < $(srcdir)/$  in	\
 		| sed -e '$$s/\\$$//') > $ -t \
Index: m4macros/glib-gettext.m4
===================================================================
--- m4macros/glib-gettext.m4	(revisione 6279)
+++ m4macros/glib-gettext.m4	(copia locale)
@@ -379,7 +379,7 @@
      posrcprefix="../"
    fi
    rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+   sed -e "/^#/d" -e "/^\[.*\]/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
   ])

Note that sed rules in Makefile.in.in (the one in glib is the one that
all glib-gettextize modules will use) and in glib-gettext.m4 are not
exactly the same.

Now, applying this patch to glib, reverting changes in gvfs (re-add call
to glib-gettextize in autogen.sh, delete mkinstalldirs and
po/Makefile.in.in from svn), everything works file: you can delete and
recreate a working POTFILES and you can run intltool-update <LANG> with
no errors.

This is no more than a solution I found changing sed rules and checking
results: but I think the issue is related to rules currently available
in glib: we are seeing it in gvf 'cause it's the only GNOME module not
using intltool but providing UTF-8 strings.

I suggest contact glib developers (alex?), check sed rules. maybe
verifying the intltool behavior, fix the rule used to remove "[encoding:
UTF-8]" and release a new glib (stable and devel) version.

Waiting for this release, OK to use intltool in gvf? Just as workaround
solution: gvfs don't need intltool 'cause all translations come from
plain C source files (no .desktop, no .schemas, no .glade...)

Index: po/Makefile.in.in
===================================================================
--- po/Makefile.in.in	(revisione 6279)
+++ po/Makefile.in.in	(copia locale)
@@ -254,7 +254,7 @@
 	  fi; \
 	  rm -f $ -t $@ \
 	    && (sed -e '/^#/d' 						\
-		    -e "s/^\[.*\] +//" 					\
+		    -e "/^\[.*\]/d" 					\
 		    -e '/^[ 	]*$$/d' 				\
 		    -e "s  *@	$$posrcprefix& \\\\@" < $(srcdir)/$  in	\
 		| sed -e '$$s/\\$$//') > $ -t \
Index: m4macros/glib-gettext.m4
===================================================================
--- m4macros/glib-gettext.m4	(revisione 6279)
+++ m4macros/glib-gettext.m4	(copia locale)
@@ -379,7 +379,7 @@
      posrcprefix="../"
    fi
    rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+   sed -e "/^#/d" -e "/^\[.*\]/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
   ])