Merge branch 'feature/edit-sources' into debian/sid

[apt.git] / buildlib / apti18n.h.in

diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in
index 9bdd6bbca65a5a8beab2d09599b3fadaf115cb74..a9d48dd975c966fa720ced980ae401b7d4fb1fe3 100644 (file)
--- a/buildlib/apti18n.h.in
+++ b/buildlib/apti18n.h.in
@@ -1,22 +1,29 @@
 // -*- mode: cpp; mode: fold -*-
-// $Id: apti18n.h.in,v 1.4 2002/10/16 05:24:02 jgg Exp $
+// $Id: apti18n.h.in,v 1.6 2003/01/11 07:18:18 jgg Exp $
 /* Internationalization macros for apt. This header should be included last
    in each C file. */
 
 // Set by autoconf
 #undef USE_NLS
-#undef USE_INCLUDED_LIBINTL
 
-#if USE_NLS==yes && USE_INCLUDED_LIBINTL==no
+#ifdef USE_NLS
 // apt will use the gettext implementation of the C library
 # include <libintl.h>
-# ifdef DOMAIN
-#   define _(x) dgettext(DOMAIN,x)
+# ifdef APT_DOMAIN
+#   define _(x) dgettext(APT_DOMAIN,x)
+#   define P_(msg,plural,n) dngettext(APT_DOMAIN,msg,plural,n)
 # else
 #   define _(x) gettext(x)
+#   define P_(msg,plural,n) ngettext(msg,plural,n)
 # endif
+# define N_(x) x
 #else
 // apt will not use any gettext
 # define setlocale(a, b)
+# define textdomain(a)
+# define bindtextdomain(a, b)
 # define _(x) x
+# define P_(msg,plural,n) (n == 1 ? msg : plural)
+# define N_(x) x
+# define dgettext(d, m) m
 #endif