Merge lp:~dobey/ubuntuone-client/fix-translations into lp:ubuntuone-client

[dobey]

Use the dgettext call for translating the SSO description

This can be tested by installing the language-pack-gnome-tr-base package, and then doing the following, inside the branch:

./autogen.sh --enable-debug --enable-gtk-doc && make ubuntuone/clientdefs.py
PYTHONPATH=. LANG=tr_TK.UTF-8 python -c "from ubuntuone.clientdefs import DESCRIPTION; print DESCRIPTION"

You can also use this same test against trunk or the installed packages, to see that it fails with them, by running the command without setting PYTHONPATH=. in another directory.

[Rick McBride (rmcbride)]

This works. Thanks for the excellent test example.

review: Approve

[Natalia Bidart (nataliabidart)]

Works indeed, thanks!

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-authentication.c'
--- libsyncdaemon/syncdaemon-authentication.c	2010-10-05 13:52:09 +0000
+++ libsyncdaemon/syncdaemon-authentication.c	2010-12-07 19:09:04 +0000
@@ -258,7 +258,7 @@
 	dbus_g_proxy_call_no_reply (auth->priv->proxy, "login_or_register_to_get_credentials",
 				    G_TYPE_STRING, SSO_APP_NAME,
 				    G_TYPE_STRING, SSO_TC_URL,
-				    G_TYPE_STRING, _("Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process will allow you to create a new account, if you do not yet have one."),
+				    G_TYPE_STRING, Q_("Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process will allow you to create a new account, if you do not yet have one."),
 				    G_TYPE_INT64, 0, /* FIXME */
 				    G_TYPE_INVALID,
 				    G_TYPE_INVALID);
 
=== modified file 'ubuntuone/clientdefs.py.in'
--- ubuntuone/clientdefs.py.in	2010-10-07 16:04:50 +0000
+++ ubuntuone/clientdefs.py.in	2010-12-07 19:09:04 +0000
@@ -24,8 +24,7 @@
 import gettext
 
 
-_ = gettext.gettext
-
+Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
 # pylint: disable-msg=C0301
 VERSION = "@VERSION@"
@@ -36,4 +35,4 @@
 APP_NAME = "@SSO_APP_NAME@"
 TC_URL = "@SSO_TC_URL@"
 PING_URL = "@SSO_PING_URL@"
-DESCRIPTION = _("Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process will allow you to create a new account, if you do not yet have one.")
+DESCRIPTION = Q_("Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process will allow you to create a new account, if you do not yet have one.")