From 1757980da5288918a03c16f05526cd3ea7f26e12 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 28 Aug 2021 12:54:32 +0200
Subject: partial fix for problems raised by Alessio on the ML

---
 src/include/gnunet_common.h   | 12 ++++++------
 src/include/gnunet_util_lib.h |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 35389e63e..758a5133d 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -980,7 +980,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
     if (! (cond))                                     \
     {                                                 \
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,            \
-                  _ ("Assertion failed at %s:%d.\n"), \
+                  dgettext ("gnunet", "Assertion failed at %s:%d.\n"),   \
                   __FILE__,                           \
                   __LINE__);                          \
     }                                                 \
@@ -1002,7 +1002,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
     if (! (cond))                                                         \
     {                                                                     \
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,     \
-                  _ ("External protocol violation detected at %s:%d.\n"), \
+                  dgettext ("gnunet", "External protocol violation detected at %s:%d.\n"), \
                   __FILE__,                                               \
                   __LINE__);                                              \
     }                                                                     \
@@ -1019,7 +1019,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
   do                                                         \
   {                                                          \
     GNUNET_log (level,                                       \
-                _ ("`%s' failed at %s:%d with error: %s\n"), \
+                dgettext ("gnunet", "`%s' failed at %s:%d with error: %s\n"), \
                 cmd,                                         \
                 __FILE__,                                    \
                 __LINE__,                                    \
@@ -1038,7 +1038,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
   {                                                               \
     GNUNET_log_from (level,                                       \
                      component,                                   \
-                     _ ("`%s' failed at %s:%d with error: %s\n"), \
+                     dgettext ("gnunet", "`%s' failed at %s:%d with error: %s\n"), \
                      cmd,                                         \
                      __FILE__,                                    \
                      __LINE__,                                    \
@@ -1056,7 +1056,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
   do                                                                      \
   {                                                                       \
     GNUNET_log (level,                                                    \
-                _ ("`%s' failed on file `%s' at %s:%d with error: %s\n"), \
+                dgettext ("gnunet", "`%s' failed on file `%s' at %s:%d with error: %s\n"), \
                 cmd,                                                      \
                 filename,                                                 \
                 __FILE__,                                                 \
@@ -1076,7 +1076,7 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
   {                                                                            \
     GNUNET_log_from (level,                                                    \
                      component,                                                \
-                     _ ("`%s' failed on file `%s' at %s:%d with error: %s\n"), \
+                     dgettext ("gnunet", "`%s' failed on file `%s' at %s:%d with error: %s\n"), \
                      cmd,                                                      \
                      filename,                                                 \
                      __FILE__,                                                 \
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index 09e0b3ba8..cc4f3a01e 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -58,7 +58,8 @@ extern "C"
  * THIS release. Otherwise, you are violating the Affero GPL if you make
  * this service available to anyone but yourself.
  */
-#define GNUNET_AGPL_URL "https://git.gnunet.org/gnunet.git#v" PACKAGE_VERSION
+#define GNUNET_AGPL_URL "https://git.gnunet.org/gnunet.git/tag/?h=v" \
+  PACKAGE_VERSION
 
 
 #include "gnunet_crypto_lib.h"
-- 
cgit v1.2.3