GNOME.org
 

[evolution-patches] [Fwd: [GTKHtml]Fix unlocalized string in html-editor]

Hi, 

Please help me.
--- Begin Message --- 
Hi, guys,

Please help to review this patch. 

There are 3 problem to fix:
1. Missed AC_CONFIG for GETTEXT_PACKAGE in configure.in
2. Missed domain param with glade_xml_new()
3. Missed domain member in GtkStockItem definition.

Regards,

-- 
Yong Sun <Yong Sun sun com>
Sun (China) ERI

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/ChangeLog,v
retrieving revision 1.236.2.6
diff -u -p -r1.236.2.6 ChangeLog
--- ChangeLog	24 Oct 2003 14:38:55 -0000	1.236.2.6
+++ ChangeLog	19 Jan 2004 06:27:59 -0000
@@ -1,3 +1,7 @@
+2004-01-19  Yong Sun <Yong Sun sun com>
+
+	* configure.in: add macro AC_DEFINE_UNQUOTED for GETTEXT_PACKAGE
+
 2003-10-24  Radek Doulik  <rodo ximian com>
 
 	* applied Adrian Bunk's patch which fixes gal required version,
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/configure.in,v
retrieving revision 1.216.2.9
diff -u -p -r1.216.2.9 configure.in
--- configure.in	24 Oct 2003 14:38:55 -0000	1.216.2.9
+++ configure.in	19 Jan 2004 06:27:59 -0000
@@ -20,6 +20,7 @@ dnl so we have to hard code it instead.
 dnl GETTEXT_PACKAGE=${GTKHTML_RELEASE_STRING}
 GETTEXT_PACKAGE=gtkhtml-3.0
 AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
 
 GNOME_EXPLICIT_TRANSLATION_DOMAIN=${GTKHTML_RELEASE_STRING}
 AC_DEFINE_UNQUOTED(GNOME_EXPLICIT_TRANSLATION_DOMAIN, "${GNOME_EXPLICIT_TRANSLATION_DOMAIN}", [Gnome Explicit Translation Domain])
Index: components/html-editor/ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.410.2.12
diff -u -p -r1.410.2.12 ChangeLog
--- components/html-editor/ChangeLog	10 Dec 2003 03:35:55 -0000	1.410.2.12
+++ components/html-editor/ChangeLog	19 Jan 2004 06:28:06 -0000
@@ -1,3 +1,10 @@
+2004-01-19  Yong Sun <Yong Sun sun com>
+
+	* cell.c image.c rule.c table.c template.c: add domain param in
+	glade_xml_new()
+	
+	* properties.c link.c: add domain member in GtkStockItem
+
 2003-12-02  Charles Zhang  <charles zhang sun com>
 
 	* replace.c (ask_dialog_new): new button with mnemonics.
Index: components/html-editor/cell.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/cell.c,v
retrieving revision 1.31.6.1
diff -u -p -r1.31.6.1 cell.c
--- components/html-editor/cell.c	12 Sep 2003 13:51:47 -0000	1.31.6.1
+++ components/html-editor/cell.c	19 Jan 2004 06:28:09 -0000
@@ -414,7 +414,7 @@ cell_widget (GtkHTMLEditCellProperties *
 	GtkWidget *cell_page;
 	GladeXML *xml;
 
-	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "cell_page", NULL);
+	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "cell_page", GETTEXT_PACKAGE);
 	if (!xml)
 		g_error (_("Could not load glade file."));
 
Index: components/html-editor/image.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/image.c,v
retrieving revision 1.51.6.2
diff -u -p -r1.51.6.2 image.c
--- components/html-editor/image.c	29 Jul 2003 15:49:16 -0000	1.51.6.2
+++ components/html-editor/image.c	19 Jan 2004 06:28:11 -0000
@@ -540,7 +540,7 @@ image_widget (GtkHTMLEditImageProperties
 	GladeXML *xml;
 	GtkWidget *frame_template;
 
-	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "image_page", NULL);
+	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "image_page", GETTEXT_PACKAGE);
 	if (!xml)
 		g_error (_("Could not load glade file."));
 
Index: components/html-editor/link.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/link.c,v
retrieving revision 1.29
diff -u -p -r1.29 link.c
--- components/html-editor/link.c	12 May 2003 20:46:48 -0000	1.29
+++ components/html-editor/link.c	19 Jan 2004 06:28:13 -0000
@@ -82,7 +82,7 @@ static gboolean stock_test_url_added = F
 #define GTKHTML_STOCK_TEST_URL "gtkhtml-stock-test-url"
 static GtkStockItem test_url_items [] =
 {
-	{ GTKHTML_STOCK_TEST_URL, N_("Test URL..."), 0, 0, NULL }
+	{ GTKHTML_STOCK_TEST_URL, N_("Test URL..."), 0, 0, GETTEXT_PACKAGE }
 };
 
 static GtkWidget *
Index: components/html-editor/properties.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/properties.c,v
retrieving revision 1.29
diff -u -p -r1.29 properties.c
--- components/html-editor/properties.c	12 May 2003 20:46:48 -0000	1.29
+++ components/html-editor/properties.c	19 Jan 2004 06:28:16 -0000
@@ -118,7 +118,7 @@ static gboolean stock_insert_added = FAL
 #define GTKHTML_STOCK_INSERT "gtkhtml-stock-insert"
 static GtkStockItem insert_items [] =
 {
-	{ GTKHTML_STOCK_INSERT, N_("Insert"), 0, 0, NULL }
+	{ GTKHTML_STOCK_INSERT, N_("Insert"), 0, 0, GETTEXT_PACKAGE }
 };
 
 GtkHTMLEditPropertiesDialog *
Index: components/html-editor/table.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/table.c,v
retrieving revision 1.43
diff -u -p -r1.43 table.c
--- components/html-editor/table.c	12 May 2003 20:46:48 -0000	1.43
+++ components/html-editor/table.c	19 Jan 2004 06:28:21 -0000
@@ -525,7 +525,7 @@ table_widget (GtkHTMLEditTableProperties
 	GtkWidget *table_page;
 	GladeXML *xml;
 
-	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "table_page", NULL);
+	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "table_page", GETTEXT_PACKAGE);
 	if (!xml)
 		g_error (_("Could not load glade file."));
 
@@ -609,7 +609,7 @@ table_insert_widget (GtkHTMLEditTablePro
 	GladeXML *xml;
 
 	d->insert = TRUE;
-	xml       = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "table_insert_page", NULL);
+	xml       = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "table_insert_page", GETTEXT_PACKAGE);
 	if (!xml)
 		g_error (_("Could not load glade file."));
 
Index: components/html-editor/template.c
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/template.c,v
retrieving revision 1.15.6.1
diff -u -p -r1.15.6.1 template.c
--- components/html-editor/template.c	12 Sep 2003 13:51:47 -0000	1.15.6.1
+++ components/html-editor/template.c	19 Jan 2004 06:28:22 -0000
@@ -267,7 +267,7 @@ template_widget (GtkHTMLEditTemplateProp
 	GtkWidget *template_page, *frame;
 	GladeXML *xml;
 
-	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "vbox_template", NULL);
+	xml = glade_xml_new (GLADE_DATADIR "/gtkhtml-editor-properties.glade", "vbox_template", GETTEXT_PACKAGE);
 	if (!xml)
 		g_error (_("Could not load glade file."));

--- End Message ---
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]