l10n/i18n issue in gvfs
|
View:
New views
19 Messages
—
Rating Filter:
Alert me
|
 |
l10n/i18n issue in gvfs
by Luca Ferretti
::
Rate this Message:
I've added an initial Italian translation for gvfs on svn (plus some
changes to configure.ac, please check) and I've also updated POTFILES.in in order to list all files with translatable messages (`intltool-update -m` is your friend), but now here is a problem. Running `intltool-update <LANG>` in order to update the .po file, I've this message: ERROR: xgettext failed to generate PO template file because there is non-ASCII string marked for translation. Please make sure that all strings marked for translation are in uniform encoding (say UTF-8), then *prepend* the following line to POTFILES.in and rerun intltool-update: [encoding: UTF-8] (note: non-ASCII strings should come from hal/*.c) So I've added the suggested line to POTFILES.in and re-run `intltool-update <LANG>`. This time no error message. Then I've started to recompile the code, but this time I've: Making all in po make[2]: Entering directory `/home/luca/svn/gnome2/gvfs/po' Makefile:146: *** target pattern contains no `%'. Stop. make[2]: Leaving directory `/home/luca/svn/gnome2/gvfs/po' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/luca/svn/gnome2/gvfs' make: *** [all] Error 2 It seems that the "[encoding: UTF-8]" line is an intltool only feature :-( So we should: A. remove all non-ASCII strings from source code to make gettext happy, or B. intltoolize (i.e. make gvfs depends on intltool) gvfs IF you choose option B, I can do it; meanwhile, I'll search non-ASCII strings in sources. PS about i18n/l10n in gvfs: what about mark for translation messages from gvfs-<program> programs (and maybe adding some beautiful explanation about feature and usage) too? _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Alexander Larsson
::
Rate this Message:
On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > Making all in po > make[2]: Entering directory `/home/luca/svn/gnome2/gvfs/po' > Makefile:146: *** target pattern contains no `%'. Stop. > make[2]: Leaving directory `/home/luca/svn/gnome2/gvfs/po' > make[1]: *** [all-recursive] Error 1 > make[1]: Leaving directory `/home/luca/svn/gnome2/gvfs' > make: *** [all] Error 2 > > It seems that the "[encoding: UTF-8]" line is an intltool only > feature :-( > > So we should: > A. remove all non-ASCII strings from source code to make gettext > happy, or > B. intltoolize (i.e. make gvfs depends on intltool) gvfs > > IF you choose option B, I can do it; meanwhile, I'll search non-ASCII > strings in sources. Offhand I can't think of any non-ascii translated messages in gvfs, but if you can find any that are not bugs, then we should go with B imho. > PS about i18n/l10n in gvfs: what about mark for translation messages > from gvfs-<program> programs (and maybe adding some beautiful > explanation about feature and usage) too? Sounds good to me. Wanna send in patches? _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Luca Ferretti
::
Rate this Message:
Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha scritto: > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > Making all in po > > make[2]: Entering directory `/home/luca/svn/gnome2/gvfs/po' > > Makefile:146: *** target pattern contains no `%'. Stop. > > make[2]: Leaving directory `/home/luca/svn/gnome2/gvfs/po' > > make[1]: *** [all-recursive] Error 1 > > make[1]: Leaving directory `/home/luca/svn/gnome2/gvfs' > > make: *** [all] Error 2 > > > > It seems that the "[encoding: UTF-8]" line is an intltool only > > feature :-( > > > > So we should: > > A. remove all non-ASCII strings from source code to make gettext > > happy, or > > B. intltoolize (i.e. make gvfs depends on intltool) gvfs > > > > IF you choose option B, I can do it; meanwhile, I'll search non-ASCII > > strings in sources. > > Offhand I can't think of any non-ascii translated messages in gvfs, but > if you can find any that are not bugs, then we should go with B imho. It seems that the issue is related with the +- sign for DVDs if ((hal_device_get_property_bool (d, "storage.cdrom.dvdr")) && (hal_device_get_property_bool (d, "storage.cdrom.dvdplusr"))) second = _("DVD\xc2\xb1R"); if (hal_device_get_property_bool (d, "storage.cdrom.dvdrw") && hal_device_get_property_bool (d, "storage.cdrom.dvdplusrw")) second = _("DVDxc2\xb1RW"); Note that the second one is missing a \ (xc2 instead \xc2) I'm going to implement solution B > > > PS about i18n/l10n in gvfs: what about mark for translation messages > > from gvfs-<program> programs (and maybe adding some beautiful > > explanation about feature and usage) too? > > Sounds good to me. Wanna send in patches? OK, I'll try to check _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Luca Ferretti
::
Rate this Message:
Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > scritto: > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > Note that the second one is missing a \ (xc2 instead \xc2) > > I'm going to implement solution B Here is the patch to use intltool framework. po/Makefile.in.in should be removed from svn. [gvfs-use-intltool.diff] Index: configure.ac =================================================================== --- configure.ac (revisione 1065) +++ configure.ac (copia locale) @@ -52,21 +52,15 @@ AC_SUBST(DBUS_SERVICE_DIR) dnl **************************** -dnl *** Checks for gettext *** +dnl *** Checks for intltool *** dnl **************************** +AC_PROG_INTLTOOL([0.31.0]) GETTEXT_PACKAGE=gvfs -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name]) -AC_SUBST(GETTEXT_PACKAGE) - -ALL_LINGUAS="it" - +AC_SUBST([GETTEXT_PACKAGE]) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[The gettext domain name]) AM_GLIB_GNU_GETTEXT -LIBS="$LIBS $INTLLIBS" - -AM_GLIB_DEFINE_LOCALEDIR(GVFS_LOCALEDIR) - dnl **************************** dnl *** Checks for ssh stuff *** dnl **************************** Index: hal/ghaldrive.c =================================================================== --- hal/ghaldrive.c (revisione 1065) +++ hal/ghaldrive.c (copia locale) @@ -156,7 +156,7 @@ second = _("DVD\xc2\xb1R"); if (hal_device_get_property_bool (d, "storage.cdrom.dvdrw") && hal_device_get_property_bool (d, "storage.cdrom.dvdplusrw")) - second = _("DVDxc2\xb1RW"); + second = _("DVD\xc2\xb1RW"); if (hal_device_get_property_bool (d, "storage.cdrom.hddvd")) second = _("HDDVD"); if (hal_device_get_property_bool (d, "storage.cdrom.hddvdr")) Index: autogen.sh =================================================================== --- autogen.sh (revisione 1065) +++ autogen.sh (copia locale) @@ -29,6 +29,12 @@ DIE=1 fi +(intltoolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have intltool installed to compile gvfs." + DIE=1 +} + (gtkdocize --version) < /dev/null > /dev/null 2>&1 || { echo echo "You must have gtk-doc installed to compile $PROJECT." @@ -99,6 +105,7 @@ touch README INSTALL libtoolize --force || exit $? +intltoolize --force --copy --automake gtkdocize || exit $? $ACLOCAL $ACLOCAL_FLAGS || exit $? Index: po/Makefile.in.in =================================================================== --- po/Makefile.in.in (revisione 1065) +++ po/Makefile.in.in (copia locale) @@ -1,272 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@...> -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. -# -# - Modified by Owen Taylor <otaylor@...> to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman <jacob@...> to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = /bin/sh -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datarootdir = @datarootdir@ -datadir = @datadir@ -libdir = @libdir@ -localedir = $(libdir)/locale -gnulocaledir = $(datadir)/locale -gettextsrcdir = $(datadir)/glib-2.0/gettext/po -subdir = po - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ - -CC = @CC@ -GENCAT = @GENCAT@ -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -XGETTEXT = @XGETTEXT@ -MSGMERGE = msgmerge - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl - -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - -SOURCES = -POFILES = @POFILES@ -GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ -$(POFILES) $(GMOFILES) $(SOURCES) - -POTFILES = \ - -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -INSTOBJEXT = @INSTOBJEXT@ - -.SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat - -.c.o: - $(COMPILE) $< - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ \ - --from-code=UTF-8 \ - --flag=g_strdup_printf:1:c-format \ - --flag=g_string_printf:2:c-format \ - --flag=g_string_append_printf:2:c-format \ - --flag=g_error_new:3:c-format \ - --flag=g_set_error:4:c-format \ - --flag=g_markup_printf_escaped:1:c-format \ - --flag=g_log:3:c-format \ - --flag=g_print:1:c-format \ - --flag=g_printerr:1:c-format \ - --flag=g_printf:1:c-format \ - --flag=g_fprintf:2:c-format \ - --flag=g_sprintf:2:c-format \ - --flag=g_snprintf:3:c-format \ - --flag=g_scanner_error:2:c-format \ - --flag=g_scanner_warn:2:c-format \ - --files-from=$(srcdir)/POTFILES.in \ - && test ! -f $(GETTEXT_PACKAGE).po \ - || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ - && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) - -install: install-exec install-data -install-exec: -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ - fi - @catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(gnulocaledir);; \ - *) destdir=$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ - fi; \ - fi; \ - done - if test "$(PACKAGE)" = "glib"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi - -# Define this as empty until I found a useful application. -installcheck: - -uninstall: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - done - if test "$(PACKAGE)" = "glib"; then \ - rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - fi - -check: all - -dvi info tags TAGS ID: - -mostlyclean: - rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp - rm -fr *.o - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f $(GMOFILES) - -distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) - dists="$(DISTFILES)"; \ - for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - cd $(srcdir); \ - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - echo "$$lang:"; \ - if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$cat failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -# POTFILES is created from POTFILES.in by stripping comments, empty lines -# and Intltool tags (enclosed in square brackets), and appending a full -# relative path to them -POTFILES: POTFILES.in - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ - posrcprefix="../"; \ - fi; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' \ - -e "s/^\[.*\] +//" \ - -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ - | sed -e '$$s/\\$$//') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) - -Makefile: Makefile.in.in ../config.status POTFILES - cd .. \ - && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Alexander Larsson
::
Rate this Message:
On Sat, 2007-12-22 at 12:34 +0100, Luca Ferretti wrote: > Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > > scritto: > > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > Note that the second one is missing a \ (xc2 instead \xc2) > > > > I'm going to implement solution B > > Here is the patch to use intltool framework. po/Makefile.in.in should be > removed from svn. Is this needed now? I made some changes in HEAD that should put --from-code=UTF-8 in the gettext call _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Luca Ferretti
::
Rate this Message:
Il giorno sab, 22/12/2007 alle 21.06 +0100, Alexander Larsson ha scritto: > On Sat, 2007-12-22 at 12:34 +0100, Luca Ferretti wrote: > > Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > > > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > > > scritto: > > > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > > > Note that the second one is missing a \ (xc2 instead \xc2) > > > > > > I'm going to implement solution B > > > > Here is the patch to use intltool framework. po/Makefile.in.in should be > > removed from svn. > > Is this needed now? I made some changes in HEAD that should put > --from-code=UTF-8 in the gettext call > Ehmm... did you forgot to commit? ;-) _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Alexander Larsson
::
Rate this Message:
On Sat, 2007-12-22 at 22:12 +0100, Luca Ferretti wrote: > Il giorno sab, 22/12/2007 alle 21.06 +0100, Alexander Larsson ha > scritto: > > On Sat, 2007-12-22 at 12:34 +0100, Luca Ferretti wrote: > > > Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > > > > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > > > > scritto: > > > > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > > > > > Note that the second one is missing a \ (xc2 instead \xc2) > > > > > > > > I'm going to implement solution B > > > > > > Here is the patch to use intltool framework. po/Makefile.in.in should be > > > removed from svn. > > > > Is this needed now? I made some changes in HEAD that should put > > --from-code=UTF-8 in the gettext call > > > > Ehmm... did you forgot to commit? ;-) No, but the change was in po/Makefile.in.in which changed from autogenerated by autogen.sh to being checked in to svn. Maybe you didn't get the latest version of it checked out? _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Luca Ferretti
::
Rate this Message:
Il giorno dom, 23/12/2007 alle 09.53 +0100, Alexander Larsson ha scritto: > On Sat, 2007-12-22 at 22:12 +0100, Luca Ferretti wrote: > > Il giorno sab, 22/12/2007 alle 21.06 +0100, Alexander Larsson ha > > scritto: > > > On Sat, 2007-12-22 at 12:34 +0100, Luca Ferretti wrote: > > > > Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > > > > > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > > > > > scritto: > > > > > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > > > > > > > Note that the second one is missing a \ (xc2 instead \xc2) > > > > > I'm going to implement solution B > > > > > > > > Here is the patch to use intltool framework. po/Makefile.in.in should be > > > > removed from svn. > > > > > > Is this needed now? I made some changes in HEAD that should put > > > --from-code=UTF-8 in the gettext call > > > > > > > Ehmm... did you forgot to commit? ;-) > > No, but the change was in po/Makefile.in.in which changed from > autogenerated by autogen.sh to being checked in to svn. Maybe you didn't > get the latest version of it checked out? > disappeared, but now I can't install due to missing gvfs/mkinstalldirs file. make[1]: Entering directory `/home/luca/svn/gnome2/gvfs/po' if test -r ".././mkinstalldirs"; then \ .././mkinstalldirs /opt/gnome2/share; \ else \ /bin/sh ../mkinstalldirs /opt/gnome2/share; \ fi /bin/sh: Can't open ../mkinstalldirs make[1]: *** [install-data-yes] Error 2 make[1]: Leaving directory `/home/luca/svn/gnome2/gvfs/po' make: *** [install-recursive] Error 1 Now that autogen.sh don't run glib-gettextize I suppose you have to add this file to repository (and eventually to dist). [gvfs-dvdplusminus.patch] Index: hal/ghaldrive.c =================================================================== --- hal/ghaldrive.c (revisione 1066) +++ hal/ghaldrive.c (copia locale) @@ -156,7 +156,7 @@ second = _("DVD\xc2\xb1R"); if (hal_device_get_property_bool (d, "storage.cdrom.dvdrw") && hal_device_get_property_bool (d, "storage.cdrom.dvdplusrw")) - second = _("DVDxc2\xb1RW"); + second = _("DVD\xc2\xb1RW"); if (hal_device_get_property_bool (d, "storage.cdrom.hddvd")) second = _("HDDVD"); if (hal_device_get_property_bool (d, "storage.cdrom.hddvdr")) _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Alexander Larsson
::
Rate this Message:
On Thu, 2007-12-27 at 16:46 +0100, Luca Ferretti wrote: > Il giorno dom, 23/12/2007 alle 09.53 +0100, Alexander Larsson ha > scritto: > > On Sat, 2007-12-22 at 22:12 +0100, Luca Ferretti wrote: > > > Il giorno sab, 22/12/2007 alle 21.06 +0100, Alexander Larsson ha > > > scritto: > > > > On Sat, 2007-12-22 at 12:34 +0100, Luca Ferretti wrote: > > > > > Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > > > > > > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > > > > > > scritto: > > > > > > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > > > > > > > > > Note that the second one is missing a \ (xc2 instead \xc2) > > This seems still unfixed. Patch attached Commited. Thanks. > On a fresh svn checkout it works, the previous error message is > disappeared, but now I can't install due to missing gvfs/mkinstalldirs > file. > Now that autogen.sh don't run glib-gettextize I suppose you have to add > this file to repository (and eventually to dist). I added that too. _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Luca Ferretti
::
Rate this Message:
Il giorno dom, 23/12/2007 alle 09.53 +0100, Alexander Larsson ha scritto: > On Sat, 2007-12-22 at 22:12 +0100, Luca Ferretti wrote: > > Il giorno sab, 22/12/2007 alle 21.06 +0100, Alexander Larsson ha > > scritto: > > > On Sat, 2007-12-22 at 12:34 +0100, Luca Ferretti wrote: > > > > Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > > > > > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > > > > > scritto: > > > > > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > > > > > > > Note that the second one is missing a \ (xc2 instead \xc2) > > > > > > > > > > I'm going to implement solution B > > > > > > > > Here is the patch to use intltool framework. po/Makefile.in.in should be > > > > removed from svn. > > > > > > Is this needed now? I made some changes in HEAD that should put > > > --from-code=UTF-8 in the gettext call > > > > > > > Ehmm... did you forgot to commit? ;-) > > No, but the change was in po/Makefile.in.in which changed from > autogenerated by autogen.sh to being checked in to svn. Maybe you didn't > get the latest version of it checked out? > Huston, we have a problem.... Alex, we have to make `intltool-update <LANG>` work too; it should be needed by l10n.gnome.org to update statistics and downloadable PO files and it's the standard and suggested way to manually update PO files from sources. But we need to put the infamous "[encoding: UTF-8]" string in POTFILES.in in order to run it. This string should be removed by the "POTFILES" rule in Makefile.in.in, but this seems to not work. Try this on current svn: 1. `cd po` 2. `intltool-update it` 3. error message: needed "[encoding: UTF-8]" 4. add this string in POTFILES.in 5. `make POTFILES` 6. `less POTFILES` Rows starting with [ should be removed (as well as comments starting with #) generating POTFILES from POTFILES.in Meybe there are some errors in sed rules. Could you check it? _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Alexander Larsson
::
Rate this Message:
On Mon, 2008-01-07 at 22:56 +0100, Luca Ferretti wrote: > Il giorno dom, 23/12/2007 alle 09.53 +0100, Alexander Larsson ha > scritto: > > On Sat, 2007-12-22 at 22:12 +0100, Luca Ferretti wrote: > > > Il giorno sab, 22/12/2007 alle 21.06 +0100, Alexander Larsson ha > > > scritto: > > > > On Sat, 2007-12-22 at 12:34 +0100, Luca Ferretti wrote: > > > > > Il giorno sab, 22/12/2007 alle 12.08 +0100, Luca Ferretti ha scritto: > > > > > > Il giorno mer, 19/12/2007 alle 09.58 +0100, Alexander Larsson ha > > > > > > scritto: > > > > > > > On Tue, 2007-12-18 at 16:53 +0100, Luca Ferretti wrote: > > > > > > > > > > > Note that the second one is missing a \ (xc2 instead \xc2) > > > > > > > > > > > > I'm going to implement solution B > > > > > > > > > > Here is the patch to use intltool framework. po/Makefile.in.in should be > > > > > removed from svn. > > > > > > > > Is this needed now? I made some changes in HEAD that should put > > > > --from-code=UTF-8 in the gettext call > > > > > > > > > > Ehmm... did you forgot to commit? ;-) > > > > No, but the change was in po/Makefile.in.in which changed from > > autogenerated by autogen.sh to being checked in to svn. Maybe you didn't > > get the latest version of it checked out? > > > > Huston, we have a problem.... > > Alex, we have to make `intltool-update <LANG>` work too; it should be > needed by l10n.gnome.org to update statistics and downloadable PO files > and it's the standard and suggested way to manually update PO files from > sources. > > But we need to put the infamous "[encoding: UTF-8]" string in > POTFILES.in in order to run it. This string should be removed by the > "POTFILES" rule in Makefile.in.in, but this seems to not work. > > Try this on current svn: > 1. `cd po` > 2. `intltool-update it` > 3. error message: needed "[encoding: UTF-8]" > 4. add this string in POTFILES.in > 5. `make POTFILES` > 6. `less POTFILES` > > Rows starting with [ should be removed (as well as comments starting > with #) generating POTFILES from POTFILES.in > > Meybe there are some errors in sed rules. Could you check it? 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. Help? Anyone? _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Thadeu Lima de Souza Cascardo-2
::
Rate this Message:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 On Tue, 08 Jan 2008 09:12:16 +0100 Alexander Larsson <alexl@...> wrote: > > On Mon, 2008-01-07 at 22:56 +0100, Luca Ferretti wrote: > > > > Huston, we have a problem.... > > > > Alex, we have to make `intltool-update <LANG>` work too; it should > > be needed by l10n.gnome.org to update statistics and downloadable > > PO files and it's the standard and suggested way to manually update > > PO files from sources. > > > > But we need to put the infamous "[encoding: UTF-8]" string in > > POTFILES.in in order to run it. This string should be removed by the > > "POTFILES" rule in Makefile.in.in, but this seems to not work. > > > > Try this on current svn: > > 1. `cd po` > > 2. `intltool-update it` > > 3. error message: needed "[encoding: UTF-8]" > > 4. add this string in POTFILES.in > > 5. `make POTFILES` > > 6. `less POTFILES` > > > > Rows starting with [ should be removed (as well as comments starting > > with #) generating POTFILES from POTFILES.in > > > > Meybe there are some errors in sed rules. Could you check it? > > 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. > > Help? Anyone? > > _______________________________________________ > gnome-vfs-list mailing list > gnome-vfs-list@... > http://mail.gnome.org/mailman/listinfo/gnome-vfs-list The code "s/^\[.*\] +//" should remove those lines like "[encoding: UTF-8] ". Notice the space after the closing bracket. Otherwise, the script should only be "s/^\[.*\]//" or perhaps "s/^\[.*\]$//". Regards, Thadeu Cascardo. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFHg34vyTpryRcqtS0RAtpbAKCa6J6XlC+MFPu3q2Ke9ijsvbApeACghh4c Klr/pXd1MEl40eazOZxY88U= =sxkv -----END PGP SIGNATURE----- _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs
by Luca Ferretti
::
Rate this Message:
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...) [glib-gettext-remove-encoding-line-from-POTFILES.diff] 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 ]) _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs [and glib]
by Alexander Larsson
::
Rate this Message:
On Tue, 2008-01-08 at 18:19 +0100, Luca Ferretti wrote: > 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: > - -e "s/^\[.*\] +//" \ > + -e "/^\[.*\]/d" \ I don't think that is quite right. A better rule is probably : 's/^\[[^]]*\] *//' as that strips any trailing newlines. Full patch attached. > 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. But does the --from-code=UTF-8 thing get added to the xgettext call? > 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. I'm not an expert on this gettext stuff, so I'm not sure if this is right. CC:in gtk-devel list for input. > 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...) Yeah. Can you hack that up? [glib-gettextize-brackets.patch] Index: po/Makefile.in.in =================================================================== --- po/Makefile.in.in (revision 6280) +++ po/Makefile.in.in (working copy) @@ -254,7 +254,7 @@ fi; \ rm -f $@-t $@ \ && (sed -e '/^#/d' \ - -e "s/^\[.*\] +//" \ + -e 's/^\[[^]]*\] *//' \ -e '/^[ ]*$$/d' \ -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ | sed -e '$$s/\\$$//') > $@-t \ Index: m4macros/glib-gettext.m4 =================================================================== --- m4macros/glib-gettext.m4 (revision 6280) +++ m4macros/glib-gettext.m4 (working copy) @@ -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 "s/^\[[^@:>@]*\] *//" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ < $srcdir/po/POTFILES.in > po/POTFILES ]) _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs [and glib]
by Luca Ferretti
::
Rate this Message:
Il giorno mer, 09/01/2008 alle 10.17 +0100, Alexander Larsson ha scritto: > > > > The fix (attached as patch) should be applied to _glib_ and is a > simple: > > > - -e "s/^\[.*\] +//" \ > > + -e "/^\[.*\]/d" \ > > I don't think that is quite right. A better rule is probably : > 's/^\[[^]]*\] *//' as that strips any trailing newlines. > Full patch attached. I'll test it. > > 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. > > But does the --from-code=UTF-8 thing get added to the xgettext call? Good question. I'll test this too. > > 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...) > > Yeah. Can you hack that up? > I'm doing just now: `make distcheck` says it's OK, so I'm going to commit. _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs [and glib]
by Luca Ferretti
::
Rate this Message:
Il giorno mer, 09/01/2008 alle 10.17 +0100, Alexander Larsson ha scritto: > > 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...) > > Yeah. Can you hack that up? > Here[1] is the svn commit log and here[2] the proof that now works fine for translators. [1] http://mail.gnome.org/archives/svn-commits-list/2008-January/msg01782.html [2] http://l10n.gnome.org/module/gvfs (it was empty before) _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs [and glib]
by Matthias Clasen-2
::
Rate this Message:
On Jan 9, 2008 4:17 AM, Alexander Larsson <alexl@...> wrote:
> > > 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...) > > Yeah. Can you hack that up? > Actually, I'd really rather not have an intltool dependency in glib. _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs [and glib]
by Alexander Larsson
::
Rate this Message:
On Wed, 2008-01-09 at 11:42 -0500, Matthias Clasen wrote: > On Jan 9, 2008 4:17 AM, Alexander Larsson <alexl@...> wrote: > > > > > > 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...) > > > > Yeah. Can you hack that up? > > > > Actually, I'd really rather not have an intltool dependency in glib. This is for gvfs only. _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
|
|
Re: l10n/i18n issue in gvfs [and glib]
by Matthias Clasen-2
::
Rate this Message:
On Jan 10, 2008 4:09 AM, Alexander Larsson <alexl@...> wrote:
> > > > > Actually, I'd really rather not have an intltool dependency in glib. > > This is for gvfs only. > > Ah, go ahead then. _______________________________________________ gnome-vfs-list mailing list gnome-vfs-list@... http://mail.gnome.org/mailman/listinfo/gnome-vfs-list |
| Free embeddable forum powered by Nabble | Forum Help |
