mirror of
https://gitlab.com/mishakmak/pam-fprint-grosshack.git
synced 2026-04-08 20:03:34 +02:00
Add i18n support
This will be needed to get better error messages to users of the D-Bus API. We use glib's builtin gettext support. No strings marked as translatable yet, we'll need to mark those user-visible strings carefully and review them.
This commit is contained in:
committed by
Daniel Drake
parent
6cbb079619
commit
3ad569b66a
@ -1,4 +1,4 @@
|
|||||||
AUTOMAKE_OPTIONS = dist-bzip2
|
AUTOMAKE_OPTIONS = dist-bzip2
|
||||||
SUBDIRS = src data tests
|
SUBDIRS = src data tests po
|
||||||
EXTRA_DIST = TODO
|
EXTRA_DIST = TODO
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
aclocal || exit 1
|
aclocal || exit 1
|
||||||
|
autoheader || exit 1
|
||||||
|
glib-gettextize -f -c || exit 1
|
||||||
autoconf || exit 1
|
autoconf || exit 1
|
||||||
automake -a -c || exit 1
|
automake -a -c || exit 1
|
||||||
./configure $*
|
./configure $*
|
||||||
|
|||||||
@ -1,11 +1,17 @@
|
|||||||
AC_INIT([fprintd], [0.1])
|
AC_INIT([fprintd], [0.1])
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
AC_CONFIG_SRCDIR([src/main.c])
|
AC_CONFIG_SRCDIR([src/main.c])
|
||||||
|
AC_CONFIG_HEADERS([config.h])
|
||||||
|
|
||||||
AC_PREREQ([2.50])
|
AC_PREREQ([2.50])
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
|
|
||||||
|
GETTEXT_PACKAGE=fprintd
|
||||||
|
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
|
||||||
|
AC_SUBST(GETTEXT_PACKAGE)
|
||||||
|
AM_GLIB_GNU_GETTEXT
|
||||||
|
|
||||||
PKG_CHECK_MODULES(FPRINT, [libfprint > 0.1.0])
|
PKG_CHECK_MODULES(FPRINT, [libfprint > 0.1.0])
|
||||||
AC_SUBST(FPRINT_LIBS)
|
AC_SUBST(FPRINT_LIBS)
|
||||||
AC_SUBST(FPRINT_CFLAGS)
|
AC_SUBST(FPRINT_CFLAGS)
|
||||||
|
|||||||
1
po/POTFILES.in
Normal file
1
po/POTFILES.in
Normal file
@ -0,0 +1 @@
|
|||||||
|
src/main.c
|
||||||
@ -8,7 +8,7 @@ libexec_PROGRAMS = fprintd
|
|||||||
|
|
||||||
fprintd_SOURCES = main.c manager.c device.c file_storage.c
|
fprintd_SOURCES = main.c manager.c device.c file_storage.c
|
||||||
fprintd_LDADD = $(GLIB_LIBS) $(DBUS_GLIB_LIBS) $(FPRINT_LIBS)
|
fprintd_LDADD = $(GLIB_LIBS) $(DBUS_GLIB_LIBS) $(FPRINT_LIBS)
|
||||||
fprintd_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) $(FPRINT_CFLAGS)
|
fprintd_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) $(FPRINT_CFLAGS) -DLOCALEDIR=\""$(datadir)/locale"\"
|
||||||
|
|
||||||
manager-dbus-glue.h: manager.xml
|
manager-dbus-glue.h: manager.xml
|
||||||
dbus-binding-tool --prefix=fprint_manager --mode=glib-server $< --output=$@
|
dbus-binding-tool --prefix=fprint_manager --mode=glib-server $< --output=$@
|
||||||
|
|||||||
@ -17,11 +17,14 @@
|
|||||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include <poll.h>
|
#include <poll.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <dbus/dbus-glib-bindings.h>
|
#include <dbus/dbus-glib-bindings.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
#include <glib/gi18n.h>
|
||||||
#include <libfprint/fprint.h>
|
#include <libfprint/fprint.h>
|
||||||
#include <glib-object.h>
|
#include <glib-object.h>
|
||||||
|
|
||||||
@ -205,6 +208,10 @@ int main(int argc, char **argv)
|
|||||||
guint32 request_name_ret;
|
guint32 request_name_ret;
|
||||||
int r = 0;
|
int r = 0;
|
||||||
|
|
||||||
|
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
|
||||||
|
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||||
|
textdomain (GETTEXT_PACKAGE);
|
||||||
|
|
||||||
r = fp_init();
|
r = fp_init();
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
g_error("fprint init failed with error %d\n", r);
|
g_error("fprint init failed with error %d\n", r);
|
||||||
|
|||||||
Reference in New Issue
Block a user