diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-01-03 12:48:39 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-01-03 12:48:39 +0000 |
| commit | 9efa7689be46a88c6190ad62a1a37762e55a2308 (patch) | |
| tree | 172e106e903341ea280c1bbadc095f8d9d08fe50 /perl-install | |
| parent | 055b7f8d9de4ece8c6c40dd4029aacd69d6d4811 (diff) | |
| download | drakx-9efa7689be46a88c6190ad62a1a37762e55a2308.tar drakx-9efa7689be46a88c6190ad62a1a37762e55a2308.tar.gz drakx-9efa7689be46a88c6190ad62a1a37762e55a2308.tar.bz2 drakx-9efa7689be46a88c6190ad62a1a37762e55a2308.tar.xz drakx-9efa7689be46a88c6190ad62a1a37762e55a2308.zip | |
dgettext needs to have previous behaviour in standalone mode (fixes #736)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/c/stuff.xs.pl | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl index 6813ef2e3..f8bfed299 100644 --- a/perl-install/c/stuff.xs.pl +++ b/perl-install/c/stuff.xs.pl @@ -175,6 +175,31 @@ setMouseLive(display, type, emulate3buttons) } '; +if ($ENV{C_DRAKX}) { print ' +SV * +dgettext(domainname, msgid) + char * domainname + char * msgid + + CODE: + /* always convert to UTF8, because perl will fail to do it correctly + * during install (and it needs to be done for gtk2-perl) - presumably + * due to incorrect locales */ + RETVAL = iconv_(dgettext(domainname, msgid), nl_langinfo(CODESET), "UTF-8"); + SvUTF8_on(RETVAL); + + OUTPUT: + RETVAL + +' } else { print ' + +char * +dgettext(domainname, msgid) + char * domainname + char * msgid + +' } + print ' int @@ -240,19 +265,6 @@ bind_textdomain_codeset(domainname, codeset) char * domainname char * codeset -SV * -dgettext(domainname, msgid) - char * domainname - char * msgid - - CODE: - /* always convert to UTF8, because perl will fail to do it correctly during install (in gtk2-perl) */ - RETVAL = iconv_(dgettext(domainname, msgid), nl_langinfo(CODESET), "UTF-8"); - SvUTF8_on(RETVAL); - - OUTPUT: - RETVAL - int KTYP(x) int x |