Merge lp:~kelemeng/indicator-printers/bug1279605 into lp:indicator-printers/14.04

[Gabor Kelemen]

Add proper i18n support. Fixes LP:1279605

[Lars Karlitski (larsu)]

Thanks a lot!

Any reason you didn't use AM_GLIB_DEFINE_LOCALEDIR in configure.ac?

[Gabor Kelemen (kelemeng)]

Uh, no, I didn't know about that, just copied from indicator-sound. Should I change it?

[Lars Karlitski (larsu)]

Nah, not important enough. Thanks again!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~kelemeng/indicator-printers/bug1279605/+merge/206073/+edit-commit-message

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2012-04-04 20:05:17 +0000
+++ configure.ac	2014-02-13 01:52:55 +0000
@@ -11,10 +11,23 @@
 AM_SILENT_RULES([yes])
 AC_CONFIG_MACRO_DIR([m4])
 
+AC_DEFUN([AC_DEFINE_PATH], [
+	test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+	test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+	ac_define_path=`eval echo [$]$2`
+	ac_define_path=`eval echo [$]ac_define_path`
+	$1="$ac_define_path"
+	AC_SUBST($1)
+	ifelse($3, ,
+		AC_DEFINE_UNQUOTED($1, "$ac_define_path"),
+		AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
+])
+
 IT_PROG_INTLTOOL([0.35.0])
 GETTEXT_PACKAGE=indicator-printers
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
 AM_GLIB_GNU_GETTEXT
 
 AC_CONFIG_HEADER(config.h)

=== modified file 'src/indicator-printers-service.c'
--- src/indicator-printers-service.c	2012-09-07 15:03:59 +0000
+++ src/indicator-printers-service.c	2014-02-13 01:52:55 +0000
@@ -21,6 +21,7 @@
 #include <gtk/gtk.h>
 #include <cups/cups.h>
 #include "dbus-names.h"
+#include "config.h"
 
 #include "cups-notifier.h"
 #include "indicator-printers-menu.h"
@@ -146,6 +147,12 @@
 
 int main (int argc, char *argv[])
 {
+    /* Init i18n */
+    setlocale (LC_ALL, "");
+    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    textdomain (GETTEXT_PACKAGE);
+
     IndicatorService *service;
     DbusmenuServer *menuserver;
     CupsNotifier *cups_notifier;