X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=60189ff76eb6e983c0958af83916a4bd1fe57469;hb=16ca75fe99859fdec9f214a0fb9c1a3ef58c8442;hp=64aa005612627bbc223b155abc5075e8c32e9186;hpb=d3ceb500f824c3765b424e69c69cf3eb85117d15;p=pspp-builds.git

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 64aa0056..60189ff7 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -24,6 +24,7 @@
 #include <libintl.h>
 #include <iconv.h>
 #include <errno.h>
+#include <relocatable.h>
 #include "assertion.h"
 #include "hmapx.h"
 #include "hash-functions.h"
@@ -56,6 +57,7 @@ create_iconv (const char* tocode, const char* fromcode)
   size_t hash;
   struct hmapx_node *node;
   struct converter *converter;
+  assert (fromcode);
 
   hash = hash_string (tocode, hash_string (fromcode, 0));
   HMAPX_FOR_EACH_WITH_HASH (converter, node, hash, &map)
@@ -196,7 +198,7 @@ i18n_init (void)
 #if HAVE_LC_PAPER
   setlocale (LC_PAPER, "");
 #endif
-  bindtextdomain (PACKAGE, locale_dir);
+  bindtextdomain (PACKAGE, relocate(locale_dir));
   textdomain (PACKAGE);
 #endif /* ENABLE_NLS */