aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-01-02 06:17:17 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-01-02 06:17:17 +0800
commit2cfc6279efd0619f066ecf32b2bb43e3a6c6202a (patch)
tree3f8f7c137ae6ab055c76a892d9a4e716be731f7d
parent4dcc79f096ab923a74fb1bcb3ffa13c5981b358c (diff)
downloadgsoc2013-evolution-2cfc6279efd0619f066ecf32b2bb43e3a6c6202a.tar
gsoc2013-evolution-2cfc6279efd0619f066ecf32b2bb43e3a6c6202a.tar.gz
gsoc2013-evolution-2cfc6279efd0619f066ecf32b2bb43e3a6c6202a.tar.bz2
gsoc2013-evolution-2cfc6279efd0619f066ecf32b2bb43e3a6c6202a.tar.lz
gsoc2013-evolution-2cfc6279efd0619f066ecf32b2bb43e3a6c6202a.tar.xz
gsoc2013-evolution-2cfc6279efd0619f066ecf32b2bb43e3a6c6202a.tar.zst
gsoc2013-evolution-2cfc6279efd0619f066ecf32b2bb43e3a6c6202a.zip
Use the translated the EConfigItem label when building the UI.
2009-01-01 Matthew Barnes <mbarnes@redhat.com> * e-util/e-config.c (ec_rebuild): Use the translated the EConfigItem label when building the UI. svn path=/branches/gnome-2-24/; revision=36962
-rw-r--r--e-util/ChangeLog5
-rw-r--r--e-util/e-config.c15
2 files changed, 15 insertions, 5 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 79cb2e1f03..89e3b8bcae 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-01 Matthew Barnes <mbarnes@redhat.com>
+
+ * e-config.c (ec_rebuild):
+ Use the translated the EConfigItem label when building the UI.
+
2008-12-22 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #564860
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 03a553feb2..4530d7a78b 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -28,6 +28,7 @@
#include <stdlib.h>
#include <gtk/gtk.h>
+#include <glib/gi18n.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page-standard.h>
@@ -422,10 +423,14 @@ ec_rebuild(EConfig *emp)
for (wn = (struct _widget_node *)p->widgets.head;wn->next;wn=wn->next) {
struct _EConfigItem *item = wn->item;
+ const gchar *translated_label = NULL;
GtkWidget *w;
d(printf(" '%s'\n", item->path));
+ if (item->label != NULL)
+ translated_label = gettext (item->label);
+
/* If the last section doesn't contain anything, hide it */
if (sectionnode != NULL
&& sectionnode->frame != NULL
@@ -524,7 +529,7 @@ ec_rebuild(EConfig *emp)
} else {
page = gnome_druid_page_edge_new(item->type == E_CONFIG_PAGE_START?GNOME_EDGE_START:GNOME_EDGE_FINISH);
gtk_widget_show(page);
- gnome_druid_page_edge_set_title((GnomeDruidPageEdge *)page, item->label);
+ gnome_druid_page_edge_set_title((GnomeDruidPageEdge *)page, translated_label);
gnome_druid_insert_page((GnomeDruid *)druid, pagenode?(GnomeDruidPage *)pagenode->frame:NULL, (GnomeDruidPage *)page);
}
if (item->type == E_CONFIG_PAGE_FINISH) {
@@ -579,13 +584,13 @@ ec_rebuild(EConfig *emp)
if (emp->type == E_CONFIG_DRUID) {
w = gnome_druid_page_standard_new();
gtk_widget_show(w);
- gnome_druid_page_standard_set_title((GnomeDruidPageStandard *)w, item->label);
+ gnome_druid_page_standard_set_title((GnomeDruidPageStandard *)w, translated_label);
gnome_druid_insert_page((GnomeDruid *)druid, pagenode?(GnomeDruidPage *)pagenode->frame:NULL, (GnomeDruidPage *)w);
wn->frame = w;
page = ((GnomeDruidPageStandard *)w)->vbox;
connect = TRUE;
} else {
- w = gtk_label_new_with_mnemonic (item->label);
+ w = gtk_label_new_with_mnemonic (translated_label);
gtk_widget_show(w);
page = gtk_vbox_new(FALSE, 12);
gtk_container_set_border_width((GtkContainer *)page, 12);
@@ -653,8 +658,8 @@ ec_rebuild(EConfig *emp)
wn->frame = NULL;
}
- if (item->label) {
- char *txt = g_strdup_printf("<span weight=\"bold\">%s</span>", item->label);
+ if (translated_label != NULL) {
+ char *txt = g_strdup_printf("<span weight=\"bold\">%s</span>", translated_label);
label = g_object_new(gtk_label_get_type(),
"label", txt,