diff options
| author | Dan Winship <danw@gnome.org> | 2014-11-13 10:29:37 -0500 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-11-13 17:18:42 -0500 |
| commit | 53f5e9afa466b0b1517cbac208ed01ab8f4b6274 (patch) | |
| tree | 405cdbb4148855694518c4916b865775bac9cf2e /libnm-glib | |
| parent | 3bfb163a74fb98698b03d8a605b0164869a2ed4a (diff) | |
| download | NetworkManager-53f5e9afa466b0b1517cbac208ed01ab8f4b6274.tar.gz | |
libnm*: fix library gettext usage
Libraries need to include <gi18n-lib.h>, not <gi18n.h>, so that _()
will get defined to "dgettext (GETTEXT_DOMAIN, string)" rather than
"gettext (string)" (which will use the program's default domain, which
works fine for programs in the NetworkManager tree, but not for
external users). Likewise, we need to call bindtextdomain() so that
gettext can find the translations if the library is installed in a
different prefix from the program using it (and
bind_textdomain_codeset(), so it will know the translations are in
UTF-8 even if the locale isn't).
(The fact that no one noticed this was broken before is because the
libraries didn't really start returning useful translated strings much
until 0.9.10, and none of the out-of-tree clients have been updated to
actually show those strings to users yet.)
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/nm-device.c | 2 | ||||
| -rw-r--r-- | libnm-glib/nm-remote-connection.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 88d9ce8a9e..53d2a69f74 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -23,7 +23,7 @@ #include <string.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <gudev/gudev.h> #include "NetworkManager.h" diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 4feba8b10e..3a70e81ed4 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -23,7 +23,7 @@ #include <string.h> #include <gio/gio.h> -#include <glib/gi18n.h> +#include <glib/gi18n-lib.h> #include <NetworkManager.h> #include <nm-utils.h> |