[network-manager-netbook] Internationalize.
- From: Tambet Ingo <tambeti src gnome org>
- To: svn-commits-list gnome org
- Subject: [network-manager-netbook] Internationalize.
- Date: Fri, 19 Jun 2009 09:27:48 -0400 (EDT)
commit 26466a4ed4cfd3cab057da10e7f0fefbd7353740
Author: Tambet Ingo <tambet gmail com>
Date: Fri Jun 19 15:51:00 2009 +0300
Internationalize.
.gitignore | 7 +++++--
Makefile.am | 9 +++++++--
autogen.sh | 1 +
configure.in | 8 ++++++++
po/POTFILES.in | 11 +++++++++++
src/nbtk-gtk-light-switch.c | 11 ++++++-----
src/nmn-item.c | 26 ++++++++++++++++++--------
7 files changed, 56 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7b471a..fa75c89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
.deps
.libs
Makefile
-Makefile.in
+Makefile.in*
aclocal.m4
autom4te.cache
compile
@@ -16,11 +16,14 @@ config.status
config.sub
configure
depcomp
+intltool-*
install-sh
libtool
ltmain.sh
missing
+POTFILES
+po/*.gmo
src/marshallers/nma-marshal.[ch]
src/network-manager-netbook
-stamp-h1
+stamp-*
TAGS
diff --git a/Makefile.am b/Makefile.am
index a8a9c11..0cb9a74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,13 @@
-SUBDIRS = icons src
+SUBDIRS = icons src po
autostartdir = $(sysconfdir)/xdg/autostart
autostart_DATA = network-manager-netbook.desktop
EXTRA_DIST = \
- $(autostart_DATA)
+ $(autostart_DATA) \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in
+
+DISTCLEANFILES = intltool-extract intltool-merge intltool-update
diff --git a/autogen.sh b/autogen.sh
index 6874f76..3840e4f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,6 +15,7 @@ PKG_NAME=network-manager-netbook
(cd $srcdir;
autoreconf --install --symlink &&
+ intltoolize --force --copy --automake &&
autoreconf &&
./configure --enable-maintainer-mode $@
)
diff --git a/configure.in b/configure.in
index 8c9dcc8..ae78808 100644
--- a/configure.in
+++ b/configure.in
@@ -12,6 +12,13 @@ AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_PROG_LIBTOOL
+dnl translation support
+GETTEXT_PACKAGE=network-manager-netbook
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+IT_PROG_INTLTOOL([0.35.0])
+AM_GLIB_GNU_GETTEXT
+
PKG_CHECK_MODULES(NMN, dbus-glib-1 >= 0.75 gtk+-2.0 gconf-2.0 gnome-keyring-1 libnm-util libnm_glib mobile-broadband-provider-info)
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
@@ -23,6 +30,7 @@ icons/Makefile
icons/22/Makefile
icons/32/Makefile
icons/48/Makefile
+po/Makefile.in
src/marshallers/Makefile
src/gconf-helpers/Makefile
src/wireless-security/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..8f327fa
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,11 @@
+src/nbtk-gtk-light-switch.c
+src/nmn-item.c
+src/network-manager-netbook.ui
+src/nmn-mobile-providers.c
+src/wireless-dialog.c
+src/wireless-security.ui
+src/wireless-security/eap-method-peap.c
+src/wireless-security/eap-method-tls.c
+src/wireless-security/eap-method-ttls.c
+src/wireless-security/eap-method.c
+src/wireless-security/wireless-security.c
diff --git a/src/nbtk-gtk-light-switch.c b/src/nbtk-gtk-light-switch.c
index b15fd2c..0d45418 100644
--- a/src/nbtk-gtk-light-switch.c
+++ b/src/nbtk-gtk-light-switch.c
@@ -16,9 +16,10 @@
* Boston, MA 02111-1307, USA.
*
*/
-
#include "nbtk-gtk-light-switch.h"
+#include <glib/gi18n.h>
+
G_DEFINE_TYPE (NbtkGtkLightSwitch, nbtk_gtk_light_switch, GTK_TYPE_DRAWING_AREA)
#define NBTK_GTK_LIGHT_SWITCH_GET_PRIVATE(o) \
@@ -157,7 +158,7 @@ draw (GtkWidget *lightswitch,
g_object_unref (context);
pango_layout_set_font_description (layout,
style->font_desc);
- pango_layout_set_text (layout, "On", -1);
+ pango_layout_set_text (layout, _ ("On"), -1);
pango_layout_get_size (layout,
&label_width,
&label_height);
@@ -168,7 +169,7 @@ draw (GtkWidget *lightswitch,
- (label_height / PANGO_SCALE)) / 2,
layout);
/* Draw the second label; "Off" */
- pango_layout_set_text (layout, "Off", -1);
+ pango_layout_set_text (layout, _ ("Off"), -1);
pango_layout_get_size (layout,
&label_width,
&label_height);
@@ -216,9 +217,9 @@ nbtk_gtk_light_switch_style_set (GtkWidget *lightswitch,
gint on_width, on_height;
layout = gtk_widget_create_pango_layout (GTK_WIDGET (lightswitch), NULL);
- pango_layout_set_text (layout, "Off", -1);
+ pango_layout_set_text (layout, _ ("Off"), -1);
pango_layout_get_pixel_size (layout, &off_width, &off_height);
- pango_layout_set_text (layout, "On", -1);
+ pango_layout_set_text (layout, _ ("On"), -1);
pango_layout_get_pixel_size (layout, &on_width, &on_height);
g_object_unref (layout);
diff --git a/src/nmn-item.c b/src/nmn-item.c
index e9edcca..2a2f7cc 100644
--- a/src/nmn-item.c
+++ b/src/nmn-item.c
@@ -1,5 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#include <glib/gi18n.h>
#include "nmn-item.h"
#include "nmn-icon-cache.h"
@@ -84,23 +85,32 @@ nmn_item_set_status (NmnItem *item,
priv = NMN_ITEM_GET_PRIVATE (item);
if (priv->status != status) {
+ const char *status_msg;
+ char *str;
+
priv->status = status;
switch (status) {
case NMN_ITEM_STATUS_DISCONNECTED:
- gtk_label_set_markup (priv->status_label, "<big><b>Disconnected</b></big>");
- gtk_button_set_label (priv->connect, "Connect");
+ status_msg = _("Disconnected");
+ gtk_button_set_label (priv->connect, _("Connect"));
break;
case NMN_ITEM_STATUS_CONNECTING:
- gtk_label_set_markup (priv->status_label, "<big><b>Connecting...</b></big>");
- gtk_button_set_label (priv->connect, "Disconnect");
+ status_msg = _("Connecting...");
+ gtk_button_set_label (priv->connect, _("Disconnect"));
break;
case NMN_ITEM_STATUS_CONNECTED:
- gtk_label_set_markup (priv->status_label, "<big><b>Connected</b></big>");
- gtk_button_set_label (priv->connect, "Disconnect");
+ status_msg = _("Connected");
+ gtk_button_set_label (priv->connect, _("Disconnect"));
break;
+ default:
+ g_assert_not_reached ();
}
+ str = g_strconcat ("<big><b>", status_msg, "</b></big>", NULL);
+ gtk_label_set_markup (priv->status_label, str);
+ g_free (str);
+
nmn_item_set_status_visible (item, TRUE);
}
}
@@ -330,12 +340,12 @@ nmn_item_init (NmnItem *item)
gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
priv->security = GTK_LABEL (w);
- w = gtk_expander_new ("Advanced");
+ w = gtk_expander_new (_("Advanced"));
gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
priv->advanced = w;
g_signal_connect (w, "notify::expanded", G_CALLBACK (advanced_expanded), item);
- w = gtk_button_new_with_label ("Connect");
+ w = gtk_button_new_with_label (_("Connect"));
gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
priv->connect = GTK_BUTTON (w);
g_signal_connect (w, "clicked", G_CALLBACK (connect_clicked), item);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]