From ff6c84e485482cb8dcc9f714c8c5482dc0b6cada Mon Sep 17 00:00:00 2001
From: Daouda Lo <daouda@mandriva.com>
Date: Fri, 27 Jun 2003 07:16:17 +0000
Subject: - sanity checks

---
 Makefile       |   6 +++---
 userdrake.spec | Bin 2348 -> 2353 bytes
 userdrake2     |  26 ++++++++++++++++++++++++--
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 34099b8..c127179 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = $(shell awk '/define version/ { print $$3 }' $(NAME).spec)
 NAME = userdrake
-BINNAME = userdrake2
+BINNAME = userdrake
 SUBDIRS = po
 localedir = $(prefix)/usr/share/locale
 RPM=$(HOME)/rpm
@@ -18,8 +18,8 @@ clean:
 install: all
 	$(MAKE) -C po $@
 	install -d $(RPM_BUILD_ROOT){/etc/sysconfig,/usr/{sbin/,share/$(NAME)/pixmaps,share/icons/{mini,large}}}
-#	install -s -m755 $(BINNAME) $(RPM_BUILD_ROOT)/usr/sbin/
-	install -s -m755 $(BINNAME) $(RPM_BUILD_ROOT)/usr/sbin/userdrake
+	install -s -m755 $(BINNAME) $(RPM_BUILD_ROOT)/usr/sbin/
+#	install -s -m755 $(BINNAME) $(RPM_BUILD_ROOT)/usr/sbin/userdrake
 	install -m644 userdrake.prefs $(RPM_BUILD_ROOT)/etc/sysconfig/userdrake
 	install -m644 pixmaps/*.png $(RPM_BUILD_ROOT)/usr/share/$(NAME)/pixmaps
 	install -m644 icons/$(NAME)16.png $(RPM_BUILD_ROOT)/usr/share/icons/mini/$(NAME).png
diff --git a/userdrake.spec b/userdrake.spec
index c949eb3..5b82470 100644
Binary files a/userdrake.spec and b/userdrake.spec differ
diff --git a/userdrake2 b/userdrake2
index 10e3764..1752820 100755
--- a/userdrake2
+++ b/userdrake2
@@ -36,7 +36,29 @@ my $conffile = '/etc/sysconfig/userdrake';
 my $secfile = '/etc/sysconfig/msec';
 my $pixdir = '/usr/share/userdrake/pixmaps/';
 
-my $in = interactive->vnew('su', 'default');
+c::bind_textdomain_codeset('userdrake', 'UTF8');
+sub translate {
+    my ($s) = @_;
+    my $r = '';
+    if ($s) {
+        $r = c::dgettext('userdrake', $s);
+        $r eq $s and $r = Locale::gettext::iconv(c::dgettext('urpmi', $s), undef, "UTF-8");
+        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');
 
 my $us = {} ;
 $us->{VERSION} = 0.92;
@@ -792,7 +814,7 @@ sub NewDialog {
     gtkset_modal($dialog, 1);
 }
 sub About {
-    my $window_about = NewDialog(N("Userdrake2"));
+    my $window_about = NewDialog(N("Userdrake"));
     my $tree_model = Gtk2::TreeStore->new(Gtk2::GType->STRING, Gtk2::GType->STRING, Gtk2::GType->STRING);
     my $list = Gtk2::TreeView->new_with_model($tree_model);
     $list->can_focus(0);
-- 
cgit v1.2.1