[libgsf] gsf: activate translations.



commit e0981f74f3f59e5b381748fe7417ae40bc70a6b6
Author: Morten Welinder <terra gnome org>
Date:   Fri Feb 28 20:23:24 2014 -0500

    gsf: activate translations.

 ChangeLog         |    5 +++++
 NEWS              |    7 ++++++-
 tools/Makefile.am |    2 +-
 tools/gsf.c       |    4 +---
 4 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6d32324..2ecf1d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Morten Welinder  <terra gnome org>
+
+       * tools/gsf.c (main): Activate translations.  Patch from
+       Juhani Numminen <juhaninumminen0 gmail com>
+
 2014-01-04  Morten Welinder <terra gnome org>
 
        * configure.ac: Post-release bump.
diff --git a/NEWS b/NEWS
index f4d3cbe..4a63e54 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 libgsf 1.14.30
 
+Juhani Numminen:
+       * Activate translations for gsf.  [#725409]
+
+Morten:
+       * Fix invalid g_free for Windows.
+
 --------------------------------------------------------------------------
 libgsf 1.14.29
 
@@ -9,7 +15,6 @@ Allin Cottrell:
 Morten:
        * Fix translation issue and leak.  [#706937]
        * Fix fuzzed ods file crash.  [#720458]
-       * Fix invalid g_free for Windows.
 
 --------------------------------------------------------------------------
 libgsf 1.14.28
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9ab6852..fc8e3cc 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir) $(LIBGSF_CFLAGS) \
        $(Z_CPPFLAGS) \
-       -DGSFLOCALEDIR=\"$(datadir)/locale\"
+       -DGSFLOCALEDIR=\"$(localedir)\"
 LDADD = $(top_builddir)/gsf/libgsf-1.la $(LIBGSF_LIBS)
 
 bin_PROGRAMS = gsf gsf-vba-dump
diff --git a/tools/gsf.c b/tools/gsf.c
index 553997a..a852aae 100644
--- a/tools/gsf.c
+++ b/tools/gsf.c
@@ -495,11 +495,9 @@ main (int argc, char **argv)
        g_set_prgname (me);
        gsf_init ();
 
-#if 0
-       bindtextdomain (GETTEXT_PACKAGE, gnm_locale_dir ());
+       bindtextdomain (GETTEXT_PACKAGE, GSFLOCALEDIR);
        textdomain (GETTEXT_PACKAGE);
        setlocale (LC_ALL, "");
-#endif
 
        usage = _("SUBCOMMAND ARCHIVE...");
        ocontext = g_option_context_new (usage);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]