rpms/xscreensaver/devel xscreensaver-5.00-text-locale.patch, NONE, 1.1

Mamoru Tasaka (mtasaka) fedora-extras-commits at redhat.com
Wed Jun 7 16:31:15 UTC 2006


Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14903

Added Files:
	xscreensaver-5.00-text-locale.patch 
Log Message:
* Wed Jun  7 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-6
- Another fixes of config files for ifsmap as reported to jwz 
  livejournal page.
- Update Japanese translation.
- Locale fix for xscreensaver-text.


xscreensaver-5.00-text-locale.patch:

--- NEW FILE xscreensaver-5.00-text-locale.patch ---
--- xscreensaver-5.00/driver/xscreensaver-text.locale	2006-04-15 11:29:49.000000000 +0900
+++ xscreensaver-5.00/driver/xscreensaver-text	2006-06-07 03:36:14.000000000 +0900
@@ -390,7 +390,46 @@
     }
 
     print "\n";
-    safe_system ("date", "+%c");
+
+    {
+	my @LANG_CHECK = ("ja", "ko", "zh", "C");
+	
+	my $LC_ALL = $ENV{'LC_ALL'};
+	my $LC_TIME = $ENV{'LC_TIME'};
+	my $LANG = $ENV{'LANG'};
+	
+	my $i = 0;
+
+	until ($LANG_CHECK[$i] eq "C"){
+	    my $CUR_LANG = $LANG_CHECK[$i];
+	    if ($LC_ALL){
+		if (index($LC_ALL, $CUR_LANG) eq 0) {
+		    $ENV{'LC_ALL'} = "C";
+		}
+	    }
+	    if ($LC_TIME){
+		if (index($LC_TIME, $CUR_LANG) eq 0){
+		    $ENV{'LC_TIME'} = "C";
+		}
+	    }
+	    elsif ($LANG){
+		if (index($LANG, $CUR_LANG) eq 0){
+		    $ENV{'LC_TIME'} = "C";
+		}
+	    }
+	    $i = $i + 1;
+	}
+
+	safe_system ("date", "+%c");
+
+	if ($LC_ALL){
+	    $ENV{'LC_ALL'} = $LC_ALL;
+	}
+	if ($LC_TIME){
+	    $ENV{'LC_TIME'} = $LC_TIME;
+	}
+    }
+
     print "\n";
     my $ut = `uptime`;
     $ut =~ s/^[ \d:]*(am|pm)?//i;




More information about the fedora-extras-commits mailing list