lots of i18n fixes

svn path=/trunk/; revision=6143

15 files changed, 103 insertions, 46 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index a5568df3ff..ff710109bc 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,21 @@
+2000-10-24  Dan Winship  <danw@helixcode.com>
+
+	* Makefile.am (libfilter-i18n.h): Build a fake header file with
+	the titles from the xml files, for translation purposes.
+
+	* filter-rule.c (get_rule_part_widget): Call _() on the rule's
+	title.
+
+	* filter-option.c (get_widget): Call _() on the option's title.
+
+	* filter.glade: Turn on translatable strings.
+
+	* libfilter-i18n.h, filter.glade.h: Translatable string files.
+
+	* add #include <config.h> to a bunch of C files so that _()
+	actually does anything. Undo some UTF8 frobs since we're now
+	dealing in localized strings.
+
 2000-10-23  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* filter-filter.c (less_parts): Set the remove button insensitive
diff --git a/filter/Makefile.am b/filter/Makefile.am
index bf17f89614..3f8e3ed165 100644
--- a/filter/Makefile.am
+++ b/filter/Makefile.am
@@ -69,9 +69,17 @@ libfilter_la_SOURCES =				\
 	vfolder-rule.c				\
 	vfolder-rule.h
 
+libfilter_la_DEPENDENCIES = libfilter-i18n.h
+
 EXTRA_DIST = filtertypes.xml vfoldertypes.xml \
-	filter.glade
+	filter.glade filter.glade.h libfilter-i18n.h
 
 # basic rules.
 filterdir = $(datadir)/evolution
 filter_DATA = filtertypes.xml vfoldertypes.xml
+
+libfilter-i18n.h: filtertypes.xml vfoldertypes.xml
+	echo "/* Automatically generated. Do not edit. */" > $@;	      \
+	cat $(srcdir)/filtertypes.xml $(srcdir)/vfoldertypes.xml |	      \
+		sed -n -e 's:.*<title>\(.*\)</title>:char *s = N_("\1");:p' | \
+		sort -u >> $@
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index 776fd740ac..83af757657 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 #include <glade/glade.h>
 
@@ -401,7 +401,7 @@ filter_editor_construct (struct _FilterContext *f)
         d = glade_xml_get_widget (gui, "edit_filter");
 	gtk_object_set_data_full (GTK_OBJECT (d), "data", data, g_free);
 	
-	gtk_window_set_title (GTK_WINDOW (d), "Edit Filters");
+	gtk_window_set_title (GTK_WINDOW (d), _("Edit Filters"));
 	for (i = 0; i < BUTTON_LAST; i++) {
 		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
 		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data);
diff --git a/filter/filter-filter.c b/filter/filter-filter.c
index 145f5f6d92..88c8c76a02 100644
--- a/filter/filter-filter.c
+++ b/filter/filter-filter.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 #include <gnome-xml/xmlmemory.h>
 
@@ -285,7 +285,6 @@ get_rule_part_widget (FilterContext *f, FilterPart *newpart, FilterRule *fr)
 	GtkWidget *p;
 	int index = 0, current = 0;
 	struct _part_data *data;
-	gchar *s;
 	
 	data = g_malloc0 (sizeof (*data));
 	data->fr = fr;
@@ -300,9 +299,7 @@ get_rule_part_widget (FilterContext *f, FilterPart *newpart, FilterRule *fr)
 	
 	menu = gtk_menu_new ();
 	while ((part = filter_context_next_action (f, part))) {
-		s = e_utf8_to_gtk_string (menu, part->title);
-		item = gtk_menu_item_new_with_label (s);
-		g_free (s);
+		item = gtk_menu_item_new_with_label (_(part->title));
 		
 		gtk_object_set_data (GTK_OBJECT (item), "part", part);
 		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
index 1682415009..209bb2e295 100644
--- a/filter/filter-folder.c
+++ b/filter/filter-folder.c
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 
 #define SHELL
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 5c8cba208b..28b7f88850 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 #include <gnome-xml/xmlmemory.h>
 
@@ -239,14 +239,11 @@ static GtkWidget *get_widget(FilterElement *fe)
 	GList *l = fo->options;
 	struct _filter_option *op;
 	int index = 0, current=0;
-	gchar *s;
 
 	menu = (GtkMenu *)gtk_menu_new();
 	while (l) {
 		op = l->data;
-		s = e_utf8_to_gtk_string ((GtkWidget *) menu, op->title);
-		item = (GtkMenuItem *)gtk_menu_item_new_with_label(s);
-		g_free (s);
+		item = (GtkMenuItem *)gtk_menu_item_new_with_label(_(op->title));
 		gtk_object_set_data((GtkObject *)item, "option", op);
 		gtk_signal_connect((GtkObject *)item, "activate", option_activate, fo);
 		gtk_menu_append(menu, (GtkWidget *)item);
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 5f478d3888..e5ae231b7c 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 
 #include <gnome-xml/xmlmemory.h>
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 4a1573e4c9..37afe15518 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 #include <gnome-xml/xmlmemory.h>
 
@@ -376,7 +376,6 @@ get_rule_part_widget (RuleContext *f, FilterPart *newpart, FilterRule *fr)
 	GtkWidget *p;
 	int index = 0, current = 0;
 	struct _part_data *data;
-	gchar *s;
 	
 	data = g_malloc0 (sizeof (*data));
 	data->fr = fr;
@@ -395,9 +394,7 @@ get_rule_part_widget (RuleContext *f, FilterPart *newpart, FilterRule *fr)
 	menu = gtk_menu_new ();
 	/* sigh, this is a little ugly */
 	while ((part = rule_context_next_part (f, part))) {
-		s = e_utf8_to_gtk_string (menu, part->title);
-		item = gtk_menu_item_new_with_label (s);
-		g_free (s);
+		item = gtk_menu_item_new_with_label (_(part->title));
 		gtk_object_set_data (GTK_OBJECT (item), "part", part);
 		gtk_signal_connect (GTK_OBJECT (item), "activate", option_activate, data);
 		gtk_menu_append (GTK_MENU (menu), item);
@@ -503,7 +500,6 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 	GtkObject *hadj, *vadj;
 	GList *l;
 	FilterPart *part;
-	char *string;
 	struct _rule_data *data;
 	
 	/* this stuff should probably be a table, but the
@@ -515,7 +511,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 	
 	if (!fr->name) {
 		fr->name = g_strdup (_("Untitled"));
-		e_utf8_gtk_entry_set_text (GTK_ENTRY (name), fr->name);
+		gtk_entry_set_text (GTK_ENTRY (name), fr->name);
 		gtk_editable_select_region (GTK_EDITABLE (name), 0, -1);
 		gtk_widget_grab_focus (GTK_WIDGET (name));
 	} else {
@@ -549,16 +545,12 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 	
 	menu = gtk_menu_new ();
 	
-	string = e_utf8_to_gtk_string (menu, _("if all criteria are met"));
-	item = gtk_menu_item_new_with_label (string);
-	g_free (string);
+	item = gtk_menu_item_new_with_label (_("if all criteria are met"));
 	gtk_signal_connect (GTK_OBJECT (item), "activate", match_all, fr);
 	gtk_menu_append (GTK_MENU (menu), item);
 	gtk_widget_show (item);
 	
-	string = e_utf8_to_gtk_string (menu, _("if any criteria are met"));
-	item = gtk_menu_item_new_with_label (string);
-	g_free (string);
+	item = gtk_menu_item_new_with_label (_("if any criteria are met"));
 	gtk_signal_connect (GTK_OBJECT (item), "activate", match_any, fr);
 	gtk_menu_append (GTK_MENU (menu), item);
 	gtk_widget_show (item);
diff --git a/filter/filter.glade b/filter/filter.glade
index f7206a41c5..1445ed7be8 100644
--- a/filter/filter.glade
+++ b/filter/filter.glade
@@ -10,6 +10,8 @@
   <language>C</language>
   <gnome_support>True</gnome_support>
   <gettext_support>True</gettext_support>
+  <output_translatable_strings>True</output_translatable_strings>
+  <translatable_strings_file>filter.glade.h</translatable_strings_file>
 </project>
 
 <widget>
@@ -163,7 +165,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Add</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -172,7 +173,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Edit</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -181,7 +181,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Delete</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -190,7 +189,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -199,7 +197,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 	  </widget>
 	</widget>
@@ -345,7 +342,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Add</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -354,7 +350,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Edit</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -363,7 +358,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Delete</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -372,7 +366,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_UP</stock_button>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -381,7 +374,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <stock_button>GNOME_STOCK_BUTTON_DOWN</stock_button>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 	  </widget>
 	</widget>
@@ -534,7 +526,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Add</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -543,7 +534,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Remove</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 	  </widget>
 	</widget>
@@ -696,7 +686,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Add</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
 	    <widget>
@@ -705,7 +694,6 @@ Outgoing
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
 	      <label>Remove</label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 	  </widget>
 	</widget>
diff --git a/filter/filter.glade.h b/filter/filter.glade.h
new file mode 100644
index 0000000000..bcd3ae40d0
--- /dev/null
+++ b/filter/filter.glade.h
@@ -0,0 +1,25 @@
+/*
+ * Translatable strings file generated by Glade.
+ * Add this file to your project's POTFILES.in.
+ * DO NOT compile it as part of your application.
+ */
+
+gchar *s = N_("Edit Filters");
+gchar *s = N_("Incoming\n"
+              "Outgoing\n"
+              "");
+gchar *s = N_("Filter Rules");
+gchar *s = N_("Add");
+gchar *s = N_("Edit");
+gchar *s = N_("Delete");
+gchar *s = N_("Edit VFolders");
+gchar *s = N_("Virtual Folders");
+gchar *s = N_("Add");
+gchar *s = N_("Edit");
+gchar *s = N_("Delete");
+gchar *s = N_("vFolder Sources");
+gchar *s = N_("Add");
+gchar *s = N_("Remove");
+gchar *s = N_("vFolder Sources");
+gchar *s = N_("Add");
+gchar *s = N_("Remove");
diff --git a/filter/libfilter-i18n.h b/filter/libfilter-i18n.h
new file mode 100644
index 0000000000..25391215ad
--- /dev/null
+++ b/filter/libfilter-i18n.h
@@ -0,0 +1,32 @@
+/* Automatically generated. Do not edit. */
+char *s = N_("Assign Colour");
+char *s = N_("Assign Score");
+char *s = N_("Copy to Folder");
+char *s = N_("Date received");
+char *s = N_("Date sent");
+char *s = N_("Delete");
+char *s = N_("Expression");
+char *s = N_("Forward to Address");
+char *s = N_("Message Body");
+char *s = N_("Message was received");
+char *s = N_("Message was sent");
+char *s = N_("Move to Folder");
+char *s = N_("Priority");
+char *s = N_("Recipients");
+char *s = N_("Sender");
+char *s = N_("Source");
+char *s = N_("Specific header");
+char *s = N_("Stop Processing");
+char *s = N_("Subject");
+char *s = N_("after");
+char *s = N_("before");
+char *s = N_("contains");
+char *s = N_("does not contain");
+char *s = N_("is greater than");
+char *s = N_("is less than");
+char *s = N_("is not");
+char *s = N_("is");
+char *s = N_("on or after");
+char *s = N_("on or before");
+char *s = N_("was after");
+char *s = N_("was before");
diff --git a/filter/score-editor.c b/filter/score-editor.c
index 77031d6e77..57dbb434f3 100644
--- a/filter/score-editor.c
+++ b/filter/score-editor.c
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 #include <glade/glade.h>
 
diff --git a/filter/score-rule.c b/filter/score-rule.c
index 7ad73a8df3..f34f46081d 100644
--- a/filter/score-rule.c
+++ b/filter/score-rule.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 
 #include "score-rule.h"
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index 33f292bd18..0f17005e6e 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 #include <glade/glade.h>
 
diff --git a/filter/vfolder-rule.c b/filter/vfolder-rule.c
index 2bb54ff30f..322e3eabb7 100644
--- a/filter/vfolder-rule.c
+++ b/filter/vfolder-rule.c
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <config.h>
 #include <gnome.h>
 #include <glade/glade.h>