made i18n UTF8 compliant

1 files changed, 24 insertions, 11 deletions

diff --git a/logdrake b/logdrake
index 8c613c93..79a947b1 100755
--- a/logdrake
+++ b/logdrake
@@ -27,25 +27,35 @@
 #}
 
 
+use POSIX;
+use Gtk;
 use lib qw(/usr/lib/libDrakX);
 use interactive;
 use standalone;
 use any;
+use Config;
+init Gtk;
 use my_gtk qw(:helpers :wrappers);
 
-# for i18n
-use POSIX;
-use Locale::GetText;
-setlocale (LC_ALL, "");
-Locale::GetText::textdomain ("DrakConf");
-import Locale::GetText I_;
-
 use MDK::Common;
 
-use Gtk;
-use Config;
-init Gtk;
 
+#-------------------------------------------------------------
+# i18n routines
+# IMPORTANT: next two routines have to be redefined here to
+#         get correct namespace (drakconf instead of libDrakX)
+#         (This version is now UTF8 compliant - Sg 2001-08-18)
+#-------------------------------------------------------------
+
+sub _ {
+    my $s = shift @_; my $t = translate($s);
+    sprintf $t, @_;
+}
+
+sub translate {
+    my ($s) = @_;
+    $s ? c::dgettext('drakconf', $s) : '';
+}
 
 $::isInstall and die "Not supported during install.\n";
 
@@ -228,7 +238,7 @@ sub parse_file {
   my $i=0;
   gtkadd(my $win_pb = (gtkset_modal new Gtk::Window(), 1),
 	 gtkpack(new Gtk::VBox(5,0), 
-		 _("please wait, parsing file: "). $files{$_}{desc},
+		 " " . _("please wait, parsing file: %s", $files{$_}{desc}) . " ",
 		 my $pbar = new Gtk::ProgressBar()
 		)
 	);
@@ -384,6 +394,9 @@ sub destroy_window {
 
 # log
 # $Log$
+# Revision 1.20  2001/08/18 19:46:35  siegel
+# made i18n UTF8 compliant
+#
 # Revision 1.19  2001/08/13 09:57:55  yduret
 # added a timeout to watch file
 #