From: minima <minima>
Date: Tue, 8 Jan 2002 15:25:56 +0000 (+0000)
Subject: make the character handling better for spanish?
X-Git-Tag: R_1_50~102
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=517695ec47b0ab768da54c7b0830de9ed0dd4914;p=spider.git

make the character handling better for spanish?
fix set/lan on italian and dutch
---

diff --git a/Changes b/Changes
index 553827b6..e1685aaf 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 08Jan02=======================================================================
 1. altered sh/qrz to point to the new server
+2. alter the character set handling a bit to make it better for spanish
 06Jan02=======================================================================
 1. fix leading space removal from messages input from the keyboard
 2. make some mods to allow perl 5.7.2 to run
diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index 8db35b9d..17e96176 100644
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -518,7 +518,7 @@ sub store
 			my $line;
 			$ref->{size} = 0;
 			foreach $line (@{$lines}) {
-				$line =~ s/[\x00-\x08\x0a-\x1f\xf0-\xff]/./g;
+				$line =~ s/[\x00-\x08\x0a-\x1f\x80-\x9f]/./g;
 				$ref->{size} += (length $line) + 1;
 				print $fh "$line\n";
 			}
diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 6cf35b2b..0942c69a 100644
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -346,7 +346,7 @@ sub is_callsign
 # check that a PC protocol field is valid text
 sub is_pctext
 {
-	return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\xf0-\xff]/;
+	return undef if $_[0] =~ /[\x00-\x08\x0a-\x1f\x80-\x9f]/;
 	return $_[0];
 }
 
diff --git a/perl/Messages b/perl/Messages
index 128415cb..6a2b4fb5 100644
--- a/perl/Messages
+++ b/perl/Messages
@@ -127,7 +127,7 @@ package DXM;
 				isow => '$_[0] is isolated; unset/isolate $_[0] first',
 				l1 => 'Sorry $_[0], you are already logged on on another channel',
 				l2 => 'Hello $_[0], this is $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::build',
-				lang => 'Language is now $_[0]',
+				lang => 'Language is now English',
 				lange1 => 'set/language <lang> where <lang> is one of ($_[0])',
 				lange2 => 'failed to set language on $_[0]', 
 				lh1 => '$main::data/hop_table.pl doesn\'t exist',
@@ -329,6 +329,7 @@ package DXM;
 				isoc => '$_[0] gecreerd en geisoleerd (Isolated)',
 				l1 => 'Sorry $_[0], u bent reeds op een ander kanaal ingelogt',
 				l2 => 'Hallo $_[0], dit is $main::mycall in $main::myqth met DXSpider V$main::version',
+				lang => 'De taal zijn nu Nederlandse',
 				lh1 => '$main::data/hop_table.pl bestaat niet',
 				loce1 => 'Geef uw coordinaten met, set/location <latitude longitude>',
 				loce2 => 'Herken \"$_[0]\" niet als Lat/Long (vb 52 20 N 0 16 E)',
@@ -496,7 +497,7 @@ package DXM;
 				isow => '$_[0] está en modo aislado; unset/isolate $_[0] primero',
 				l1 => 'Lo siento $_[0], ya estás conectado en otro canal',
 				l2 => 'Hola $_[0], esta es $main::mycall en $main::myqth usando DXSpider V$main::version',
-				lang => 'El idioma es ahora $_[0]pañol',
+				lang => 'El idioma es ahora Español',
 				lange1 => 'set/language <idioma> donde <idioma> es uno entre ($_[0])',
 				lange2 => 'fallo al seleccionar idioma en $_[0]',
 				lh1 => '$main::data/hop_table.pl no existe',
@@ -762,7 +763,7 @@ package DXM;
 				isow => '$_[0] ist isoliert; unset/isolate $_[0] zuerst',
 				l1 => 'Sorry $_[0], Du bist bereit auf einem anderen Kanal eingeloggt',
 				l2 => 'Moin $_[0], hier ist $main::mycall in $main::myqth\nrunning DXSpider V$main::version build $main::build',
-				lang => 'Sprache ist jetzt $_[0]',
+				lang => 'Sprache ist jetzt Deutch',
 				lange1 => 'set/language <lang> wobei <lang> ist eine von ($_[0])',
 				lange2 => 'Fehler beim setzen der Sprache auf $_[0]',
 				lh1 => '$main::data/hop_table.pl existiert nicht',
@@ -1023,7 +1024,7 @@ package DXM;
 				isow => '$_[0] e\' isolato; unset/isolate $_[0] prima',
 				l1 => 'Spiacente $_[0], sei già collegato sun un altro canale',
 				l2 => 'Benvenuto $_[0] sul Cluster $main::mycall a $main::myqth\nsoftware in uso DXSpider V$main::version build $main::build',
-				lang => 'La lingua selezionata e\' adesso $_[0]',
+				lang => 'La lingua selezionata e\' adesso Italiano',
 				lange1 => 'set/language <lingua> dove <lingua> e\' una tra ($_[0])',
 				lange2 => 'impostazione lingua fallita per $_[0]', 
 				lh1 => '$main::data/hop_table.pl non esiste',
diff --git a/perl/console.pl b/perl/console.pl
index ceeaa945..205d52f3 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -243,7 +243,7 @@ sub rec_socket
 	if (defined $msg) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
 		
-		$line =~ s/[\x00-\x06\x08\x0a-\x19\x1b-\x1f\x80-\x9f\xf0-\xff]/./g;         # immutable CSI sequence + control characters
+		$line =~ s/[\x00-\x06\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
 		if ($sort && $sort eq 'D') {
 			$line = " " unless length($line);
 			addtotop($line);