summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcarlosg <carlosg>2005-03-01 20:27:19 +0000
committercarlosg <carlosg>2005-03-01 20:27:19 +0000
commit46ef3eb17c36c733a3fd51cea0dfe5498a318428 (patch)
tree56291f26660a4ddf87b9cf489a1d10c8a8187d84
parentd403af75bf45f2ee4641d97f56868b2cf0a64061 (diff)
2005-03-01 Carlos Garnacho Parro <carlosg@gnome.org>STB_1_1_92
* general.pl.in: made bind_textdomain_codeset optional, big hack, but ATM it's better than requiring a package that distros don't ship at all...
-rw-r--r--ChangeLog3
-rw-r--r--general.pl.in5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 745282c..fcfe2ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2005-03-01 Carlos Garnacho Parro <carlosg@gnome.org>
* Release 1.1.92
+ * general.pl.in: made bind_textdomain_codeset optional, big hack, but
+ ATM it's better than requiring a package that distros don't ship at
+ all...
2005-03-01 Carlos Garnacho Parro <carlosg@gnome.org>
diff --git a/general.pl.in b/general.pl.in
index 0b72eeb..809c77a 100644
--- a/general.pl.in
+++ b/general.pl.in
@@ -47,7 +47,10 @@ if ($has_i18n)
# set up i18n stuff
&setlocale (LC_MESSAGES, "");
&bindtextdomain ("@GETTEXT_PACKAGE@", "@localedir@");
- &bind_textdomain_codeset ("@GETTEXT_PACKAGE@", "UTF-8");
+
+ # Big stupid hack, but it's the best I can do until
+ # distros switch to perl's gettext 1.04...
+ eval "&bind_textdomain_codeset (\"@GETTEXT_PACKAGE@\", \"UTF-8\")";
&textdomain ("@GETTEXT_PACKAGE@");
eval "sub _ { return gettext (shift); }";