[GNUnet-SVN] r8074 - in GNUnet/src: applications/fs/ecrs applications/fs/tools applications/stats include

[gnunet]

Author: holindho
Date: 2009-01-01 01:33:41 -0700 (Thu, 01 Jan 2009)
New Revision: 8074

Modified:
   GNUnet/src/applications/fs/ecrs/parser.c
   GNUnet/src/applications/fs/tools/gnunet-directory.c
   GNUnet/src/applications/fs/tools/gnunet-insert.c
   GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
   GNUnet/src/applications/fs/tools/gnunet-search.c
   GNUnet/src/applications/stats/gnunet-stats.c
   GNUnet/src/include/platform.h
Log:
help intlemu


Modified: GNUnet/src/applications/fs/ecrs/parser.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/parser.c    2008-12-31 06:53:07 UTC (rev 
8073)
+++ GNUnet/src/applications/fs/ecrs/parser.c    2009-01-01 08:33:41 UTC (rev 
8074)
@@ -136,7 +136,7 @@
     {
       type--;
       typename = EXTRACTOR_getKeywordTypeAsString (type);
-      typename_i18n = dgettext ("libextractor", typename);
+      typename_i18n = dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, typename);
       if ((strlen (tmp) >= strlen (typename) + 1) &&
           (tmp[strlen (typename)] == ':') &&
           (0 == strncmp (typename, tmp, strlen (typename))))

Modified: GNUnet/src/applications/fs/tools/gnunet-directory.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-directory.c 2008-12-31 06:53:07 UTC 
(rev 8073)
+++ GNUnet/src/applications/fs/tools/gnunet-directory.c 2009-01-01 08:33:41 UTC 
(rev 8074)
@@ -46,7 +46,7 @@
 itemPrinter (EXTRACTOR_KeywordType type, const char *data, void *closure)
 {
   printf ("\t%20s: %s\n",
-          dgettext ("libextractor",
+          dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
                     EXTRACTOR_getKeywordTypeAsString (type)), data);
   return GNUNET_OK;
 }

Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c    2008-12-31 06:53:07 UTC 
(rev 8073)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c    2009-01-01 08:33:41 UTC 
(rev 8074)
@@ -140,9 +140,10 @@
       fn = fullName;
       while (NULL != strstr (fn, DIR_SEPARATOR_STR))
         fn = 1 + strstr (fn, DIR_SEPARATOR_STR);
-      printf ("%s - %s\n", dgettext ("libextractor", "filename"), fn);
       printf ("%s - %s\n",
-              dgettext ("libextractor", "mimetype"),
+              dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, "filename"), fn);
+      printf ("%s - %s\n",
+              dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN, "mimetype"),
               "application/gnunet-directory");
       GNUNET_disk_directory_scan (NULL, fullName, &listKeywords, cls);
     }

Modified: GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2008-12-31 06:53:07 UTC 
(rev 8073)
+++ GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2009-01-01 08:33:41 UTC 
(rev 8074)
@@ -114,7 +114,7 @@
 itemPrinter (EXTRACTOR_KeywordType type, const char *data, void *closure)
 {
   printf ("\t%20s: %s\n",
-          dgettext ("libextractor",
+          dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
                     EXTRACTOR_getKeywordTypeAsString (type)), data);
   return GNUNET_OK;
 }

Modified: GNUnet/src/applications/fs/tools/gnunet-search.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-search.c    2008-12-31 06:53:07 UTC 
(rev 8073)
+++ GNUnet/src/applications/fs/tools/gnunet-search.c    2009-01-01 08:33:41 UTC 
(rev 8074)
@@ -51,7 +51,7 @@
 itemPrinter (EXTRACTOR_KeywordType type, const char *data, void *closure)
 {
   printf ("\t%20s: %s\n",
-          dgettext ("libextractor",
+          dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
                     EXTRACTOR_getKeywordTypeAsString (type)), data);
   return GNUNET_OK;
 }

Modified: GNUnet/src/applications/stats/gnunet-stats.c
===================================================================
--- GNUnet/src/applications/stats/gnunet-stats.c        2008-12-31 06:53:07 UTC 
(rev 8073)
+++ GNUnet/src/applications/stats/gnunet-stats.c        2009-01-01 08:33:41 UTC 
(rev 8074)
@@ -45,7 +45,7 @@
 printStatistics (const char *name, unsigned long long value, void *cls)
 {
   FILE *stream = cls;
-  FPRINTF (stream, "%-60s: %16llu\n", dgettext ("GNUnet", name), value);
+  FPRINTF (stream, "%-60s: %16llu\n", _(name), value);
   return GNUNET_OK;
 }
 

Modified: GNUnet/src/include/platform.h
===================================================================
--- GNUnet/src/include/platform.h       2008-12-31 06:53:07 UTC (rev 8073)
+++ GNUnet/src/include/platform.h       2009-01-01 08:33:41 UTC (rev 8074)
@@ -171,9 +171,11 @@
  * GNU gettext support macro.
  */
 #define _(String) dgettext("GNUnet",String)
+#define LIBEXTRACTOR_GETTEXT_DOMAIN "libextractor"
 #else
 #include "libintlemu.h"
 #define _(String) dgettext("org.gnunet.GNUnet",String)
+#define LIBEXTRACTOR_GETTEXT_DOMAIN "org.gnunet.libextractor"
 #endif
 
 #ifdef CYGWIN