From 4d70434db549461d1391db27a165f36be5a39378 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 3 Jul 2009 10:48:26 -0700 Subject: [PATCH] Relocate the locale directory. Based on commit 31e674bbb in master, but stable refers to locale_dir from different files. Thanks to Michel Boaventura for reporting the problem. --- src/ui/gui/psppire.c | 4 ++-- src/ui/terminal/main.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c index 974d18b7..a7b22037 100644 --- a/src/ui/gui/psppire.c +++ b/src/ui/gui/psppire.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2005, 2006 Free Software Foundation + Copyright (C) 2004, 2005, 2006, 2009 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -79,7 +79,7 @@ initialize (void) So unset the bits we want to control ourselves */ setlocale (LC_NUMERIC, "C"); - bindtextdomain (PACKAGE, locale_dir); + bindtextdomain (PACKAGE, relocate (locale_dir)); glade_init (); diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index b8cabb3a..8acbdc2d 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -54,6 +54,7 @@ #include "fatal-signal.h" #include "progname.h" +#include "relocatable.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -150,7 +151,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 */ } -- 2.30.2