1 files changed, 23 insertions, 25 deletions

diff --git a/src/lib/nls.c b/src/lib/nls.c
index cc6f0e5f..ca57ce32 100644
--- a/src/lib/nls.c
+++ b/src/lib/nls.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2010, 2011 GNUnet e.V.
+     Copyright (C) 2010, 2011, 2021 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -17,7 +17,6 @@
      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
      Boston, MA 02110-1301, USA.
 */
-
 /**
  * @file src/lib/nls.c
  * @brief natural language support
@@ -30,24 +29,32 @@
 #endif
 
 
-/**
- * Initialize GNU gettext for message translation.
- */
 void
 GNUNET_GTK_setup_nls ()
 {
 #if ENABLE_NLS
+  struct GNUNET_OS_ProjectData *mypd;
+  struct GNUNET_OS_ProjectData *pd;
   char *path;
 
+  pd = GNUNET_OS_project_data_get ();
   setlocale (LC_ALL, "");
   GNUNET_asprintf (&path,
                    "%s/%s/locale/",
                    GNUNET_GTK_get_data_dir (),
                    PACKAGE_NAME);
-  bindtextdomain ("gnunet-gtk", path);
-  textdomain ("gnunet-gtk");
-  bind_textdomain_codeset ("GNUnet", "UTF-8");
-  bind_textdomain_codeset ("gnunet-gtk", "UTF-8");
+  bindtextdomain ("gnunet-gtk",
+                  path);
+  if (NULL != pd->gettext_path)
+    bindtextdomain (pd->gettext_domain,
+                    pd->gettext_path);
+  textdomain (pd->gettext_domain);
+  bind_textdomain_codeset ("GNUnet",
+                           "UTF-8");
+  bind_textdomain_codeset ("gnunet-gtk",
+                           "UTF-8");
+  bind_textdomain_codeset (pd->gettext_domain,
+                           "UTF-8");
   GNUNET_free (path);
 #else
   fprintf (
@@ -71,20 +78,12 @@ get_filename_charset (const gchar **filename_charset)
   gboolean is_utf8;
 
   is_utf8 = g_get_filename_charsets (&charsets);
-
   if (filename_charset)
     *filename_charset = charsets[0];
-
   return is_utf8;
 }
 
 
-/**
- * Convert a string from the current locale to UTF-8.
- *
- * @param str_loc string in current locale
- * @return string in UTF-8, NULL if str_loc was NULL
- */
 char *
 GNUNET_GTK_from_loc_to_utf8 (const char *str_loc)
 {
@@ -99,7 +98,9 @@ GNUNET_GTK_from_loc_to_utf8 (const char *str_loc)
   if (is_UTF8)
     str_utf8 = GNUNET_strdup (str_loc);
   else
-    str_utf8 = GNUNET_STRINGS_to_utf8 (str_loc, strlen (str_loc), loc_charset);
+    str_utf8 = GNUNET_STRINGS_to_utf8 (str_loc,
+                                       strlen (str_loc),
+                                       loc_charset);
   return str_utf8;
 }
 
@@ -125,18 +126,14 @@ from_filename_to_utf8 (gchar *filename)
     str_utf8 = GNUNET_strdup (filename);
   else
     str_utf8 =
-      GNUNET_STRINGS_to_utf8 (filename, strlen (filename), filename_charset);
+      GNUNET_STRINGS_to_utf8 (filename,
+                              strlen (filename),
+                              filename_charset);
 
   return str_utf8;
 }
 
 
-/**
- * Returns filename form filechooser, encoded in UTF-8.
- *
- * @param fc file chooser to inspect
- * @return selected filename as UTF-8, NULL on errors
- */
 char *
 GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser *fc)
 {
@@ -150,4 +147,5 @@ GNUNET_GTK_filechooser_get_filename_utf8 (GtkFileChooser *fc)
   return filename_utf8;
 }
 
+
 /* end of nls.c */