>From 9227f9a919084f937fd29856935016e0ee9e754e Mon Sep 17 00:00:00 2001 From: Didier Roche <didro...@ubuntu.com> Date: Thu, 29 Jan 2015 16:12:58 +0100 Subject: [PATCH 4/9] Add gettext support
--- configure.ac | 1 + src/shared/util.c | 8 ++++++++ src/shared/util.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/configure.ac b/configure.ac index 277addb..9a2235b 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ AS_IF([test -z "$INTLTOOL_POLICY_RULE"], [ GETTEXT_PACKAGE=systemd AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [systemd]) AC_PROG_MKDIR_P AC_PROG_LN_S diff --git a/src/shared/util.c b/src/shared/util.c index ba035ca..deb9839 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -25,6 +25,8 @@ #include <errno.h> #include <stdlib.h> #include <signal.h> +#include <libintl.h> +#include <locale.h> #include <stdio.h> #include <syslog.h> #include <sched.h> @@ -74,6 +76,7 @@ #include <sys/auxv.h> #endif +#include "config.h" #include "macro.h" #include "util.h" #include "ioprio.h" @@ -5782,6 +5785,11 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, return NULL; } +void init_gettext(void) { + setlocale(LC_ALL, ""); + textdomain(GETTEXT_PACKAGE); +} + bool is_locale_utf8(void) { const char *set; static int cached_answer = -1; diff --git a/src/shared/util.h b/src/shared/util.h index a83b588..45cb094 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -737,6 +737,8 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, int (*compar) (const void *, const void *, void *), void *arg); +#define _(String) gettext (String) +void init_gettext(void); bool is_locale_utf8(void); typedef enum DrawSpecialChar { -- 2.1.4
_______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel