Update of /cvsroot/libexif/libmnote/libmnote/canon
In directory sc8-pr-cvs1:/tmp/cvs-serv20519/libmnote/canon
Modified Files:
Makefile.am mnote-canon-tag.c
Log Message:
i18n factorization
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/canon/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am 15 Nov 2002 19:54:48 -0000 1.2
+++ Makefile.am 3 Dec 2002 09:04:31 -0000 1.3
@@ -1,7 +1,8 @@
-INCLUDES = \
+INCLUDES= \
-DLIBMNOTE_LOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir) \
- -I$(top_srcdir)/intl \
+ -I$(top_srcdir)/intl \
+ -I$(top_srcdir)/libmnote \
$(LIBEXIF_CFLAGS)
noinst_LTLIBRARIES = libmnote-canon.la
Index: mnote-canon-tag.c
===================================================================
RCS file: /cvsroot/libexif/libmnote/libmnote/canon/mnote-canon-tag.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mnote-canon-tag.c 29 Nov 2002 16:12:31 -0000 1.2
+++ mnote-canon-tag.c 3 Dec 2002 09:04:31 -0000 1.3
@@ -19,29 +19,11 @@
*/
#include "config.h"
+#include "i18n.h"
#include "mnote-canon-tag.h"
#include <stdlib.h>
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# undef _
-# define _(String) dgettext (PACKAGE, String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
-#else
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define _(String) (String)
-# define N_(String) (String)
-#endif
-
static struct {
MNoteCanonTag tag;
const char *name;
@@ -80,7 +62,7 @@
unsigned int i;
- bindtextdomain (PACKAGE, LIBMNOTE_LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
for (i = 0; table[i].title; i++)
if (table[i].tag == tag)
@@ -96,7 +78,7 @@
unsigned int i;
- bindtextdomain (PACKAGE, LIBMNOTE_LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, LIBMNOTE_LOCALEDIR);
for (i = 0; table[i].description; i++)
if (table[i].tag == tag)
|
