stop reinventing the wheel by duplicating it and reuse existent

infrastructure

1 files changed, 2 insertions, 17 deletions

diff --git a/userdrake b/userdrake
index 4b913fb..4b292da 100755
--- a/userdrake
+++ b/userdrake
@@ -26,6 +26,8 @@ use standalone;
 
 use common;
 use any;
+# i18n: IMPORTANT: to get correct namespace (userdrake instead of libDrakX)
+BEGIN { unshift @::textdomains, 'userdrake' }
 use ugtk2 qw(:all);
 use interactive;
 use POSIX qw(mktime ceil);
@@ -36,23 +38,6 @@ my $conffile = '/etc/sysconfig/userdrake';
 my $secfile = '/etc/sysconfig/msec';
 my $pixdir = '/usr/share/userdrake/pixmaps/';
 
-c::bind_textdomain_codeset('userdrake', 'UTF8');
-sub translate {
-    my ($s) = @_;
-    my $r = $s ? c::dgettext('userdrake', $s) : '';
-    c::set_tagged_utf8($r);
-    $r;
-}
-sub sprintf_fixutf8 {
-    my $need_upgrade;
-    $need_upgrade |= to_bool(c::is_tagged_utf8($_)) + 1 foreach @_;
-    if ($need_upgrade == 3) { c::upgrade_utf8($_) foreach @_ };
-    sprintf shift, @_;
-}
-sub N {
-    my $s = shift @_; my $t = translate($s);
-    sprintf_fixutf8 $t, @_;
-}
 
 my $in = interactive->vnew('su');