fix non latin1 post-install perl-gtk2 apps, seems like perl upgrading strings to utf8 is somewhat broken (dunno why), so now we bind the codeset or our textdomains to utf8 and tag the translated strings to utf8, when using gtk

1 files changed, 9 insertions, 2 deletions

diff --git a/perl-install/common.pm b/perl-install/common.pm
index 5fa23c479..339e0aa00 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -51,16 +51,23 @@ sub salt {
 sub makedev { ($_[0] << 8) | $_[1] }
 sub unmakedev { $_[0] >> 8, $_[0] & 0xff }
 
-sub translate {
+sub translate_real {
     my ($s) = @_;
     $s or return '';
     foreach ('libDrakX', @::textdomains) {
-	my $s2 = $::isInstall && eval { $::o->isa('interactive::gtk') } ? c::dgettext_utf8($_, $s) : c::dgettext($_, $s);
+	my $s2 = c::dgettext($_, $s);
 	return $s2 if $s ne $s2;
     }
     $s;
 }
 
+sub translate {
+    my $s = translate_real(@_);
+    $::need_utf8_i18n and c::set_tagged_utf8($s);
+    $s;
+}
+
+
 sub untranslate {
     my $s = shift || return;
     foreach (@_) { translate($_) eq $s and return $_ }