GNOME.org
 

Re: Proposing Tracker for inclusion into GNOME 2.18

Il giorno gio, 19/10/2006 alle 03.10 +0100, Jamie McCracken ha scritto:
> Hi,
> 
> We have just released a new stable version of tracker (0.5.0) which can 
> be found here:
> 
> http://www.gnome.org/~jamiemcc/tracker/tracker-0.5.0.tar.bz2
> 
> I would like to propose this for inclusion into Gnome 2.18 as its now 
> been well tested and should be stable enough.


A GNOME module without l10n support??!!?? Unbelievable.  :-)

OK, here is a patch to add l10n support to tracker. Please note that:

      * the current gettext translation domain is gnome-utils-2.0. This
        is bad, tracker should not share translations with gnome utils
        and should use an own translation domanin
      * the proposed patch will use the new po/LINGUAS method to list
        available locales. This will force tracker to depend on intltool
        >= 0.35
      * there are some sparse N_() and _() added in
        tracker-search-tool.c
      * there are some files that shouldn't be on cvs:
        tracker/po/Makefile.in.in and tracker/aclocal.m4 (the last one
        should be autogenerated at autogen time). Also there are some
        missing stuff in .cvsignore
      * of course the patch don't include po/LINGUAS and po/ChangeLog
        files

I can commit this on cvs in a day or two, if you like.

Cheers, Luca.


PS please note the "vbox = gtk_hbox_new (FALSE, 2);" in
src/tracker-search-tool/tracker-search-tool.c
While it's strange use "vbox" as name for a hbox, this should be (TRUE,
2) to have Previous and Next buttons at the same size. The same size for
buttons is an HIG request for dialogs.
Can I fix those issues too?


? Makefile.in
? autom4te.cache
? config.guess
? config.sub
? configure
? depcomp
? install-sh
? intltool-extract
? intltool-extract.in
? intltool-merge
? intltool-merge.in
? intltool-update
? intltool-update.in
? ltmain.sh
? missing
? mkinstalldirs
? po
? data/Makefile.in
? data/tracker.service
? data/languages/Makefile.in
? filters/Makefile.in
? filters/application/Makefile.in
? filters/text/Makefile.in
? src/Makefile.in
? src/libstemmer/Makefile.in
? src/libtracker/Makefile.in
? src/text-filters/Makefile.in
? src/text-filters/html_converter/Makefile.in
? src/text-filters/ooo_converter/Makefile.in
? src/tracker-extract/Makefile.in
? src/tracker-search-tool/Makefile.in
? src/trackerd/Makefile.in
? src/trackerd/config.h.in
? thumbnailers/Makefile.in
? thumbnailers/application/Makefile.in
? thumbnailers/image/Makefile.in
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/tracker/Makefile.am,v
retrieving revision 1.4
diff -n -u -r1.4 Makefile.am
--- Makefile.am	22 Oct 2006 17:53:02 -0000	1.4
+++ Makefile.am	24 Oct 2006 16:12:49 -0000
@@ -1,4 +1,4 @@
-SUBDIRS = data src filters thumbnailers
+SUBDIRS = data src filters thumbnailers po
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = tracker.pc
Index: configure.in
===================================================================
RCS file: /cvs/gnome/tracker/configure.in,v
retrieving revision 1.28
diff -n -u -r1.28 configure.in
--- configure.in	19 Oct 2006 01:30:17 -0000	1.28
+++ configure.in	24 Oct 2006 16:12:49 -0000
@@ -345,16 +345,15 @@
 #  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
 
 
-GETTEXT_PACKAGE=gnome-utils-2.0
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [Define the gettext
-package to use])
+GETTEXT_PACKAGE=tracker
 AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
+                   [the gettext translation domain])
+
 AM_GLIB_GNU_GETTEXT
+GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
 
-# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
-# this is the directory where the *.{mo,gmo} files are installed
-gnomeutilslocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(gnomeutilslocaledir)
+IT_PROG_INTLTOOL([0.35.0])
 
 
 fi
@@ -474,6 +473,7 @@
 	src/trackerd/Makefile
 	src/libtracker/Makefile
 	src/tracker-search-tool/Makefile
+	po/Makefile.in
 ])
 
 
Index: src/tracker-search-tool/tracker-search-tool.c
===================================================================
RCS file: /cvs/gnome/tracker/src/tracker-search-tool/tracker-search-tool.c,v
retrieving revision 1.4
diff -n -u -r1.4 tracker-search-tool.c
--- src/tracker-search-tool/tracker-search-tool.c	23 Oct 2006 00:15:36 -0000	1.4
+++ src/tracker-search-tool/tracker-search-tool.c	24 Oct 2006 16:12:50 -0000
@@ -89,13 +89,13 @@
 };
 
 static service_info_t services[8] = {
-   { "Files",             "system-file-manager",      SERVICE_FILES         },
-   { "Development Files", "applications-development", SERVICE_DEVELOPMENT_FILES },
-   { "Documents",         "x-office-document",        SERVICE_DOCUMENTS     },
-   { "Images",            "image",         	      SERVICE_IMAGES        },
-   { "Music",             "audio-x-generic",          SERVICE_MUSIC         },
-   { "Text Files",        "text-x-generic",           SERVICE_TEXT_FILES    },
-   { "Videos",            "video-x-generic",          SERVICE_VIDEOS        },
+   { N_("Files"),             "system-file-manager",      SERVICE_FILES         },
+   { N_("Development Files"), "applications-development", SERVICE_DEVELOPMENT_FILES },
+   { N_("Documents"),         "x-office-document",        SERVICE_DOCUMENTS     },
+   { N_("Images"),            "image",         	      SERVICE_IMAGES        },
+   { N_("Music"),             "audio-x-generic",          SERVICE_MUSIC         },
+   { N_("Text Files"),        "text-x-generic",           SERVICE_TEXT_FILES    },
+   { N_("Videos"),            "video-x-generic",          SERVICE_VIDEOS        },
    { NULL,                NULL,                       -1                    }
 };
 
@@ -245,7 +245,7 @@
                                          GTK_ICON_LOOKUP_USE_BUILTIN,
                                          &error);
 	   	gtk_list_store_append (store, &iter);
-	   	gtk_list_store_set (store, &iter, 0, pixbuf, 1, service->service, 2, service->service_type, -1);
+	   	gtk_list_store_set (store, &iter, 0, pixbuf, 1, _(service->service), 2, service->service_type, -1);
    	}
 
    	gtk_combo_box_set_active (combo, 0);
@@ -2142,7 +2142,7 @@
 	vbox = gtk_hbox_new (FALSE, 2);
 	gtk_box_pack_start (GTK_BOX (container), vbox, FALSE, FALSE, 0);
 
-	widget = gtk_button_new_with_mnemonic ("_Next");
+	widget = gtk_button_new_with_mnemonic (_("_Next"));
 	image = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image (GTK_BUTTON (widget), image);
 	gsearch->forward_button = widget;
@@ -2150,7 +2150,7 @@
 	                  G_CALLBACK (click_find_cb), (gpointer) gsearch);
 	gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE, 2);
 
-	widget = gtk_button_new_with_mnemonic ("_Previous");
+	widget = gtk_button_new_with_mnemonic (_("_Previous"));
 	image = gtk_image_new_from_stock (GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image (GTK_BUTTON (widget), image);
 	gsearch->back_button = widget;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]