X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXM.pm;h=5a3b22e3b086415804cde6ab1c317e9fae16bed8;hb=a0cf638d2ec10e9f464bb749cf1b70fd105baf9f;hp=80b2fbc7bf8398b3ba8bffbe3f8fa281359ef7c4;hpb=07ea293f3919d2da76220b5fbc55b734008ed44c;p=spider.git

diff --git a/perl/DXM.pm b/perl/DXM.pm
index 80b2fbc7..5a3b22e3 100644
--- a/perl/DXM.pm
+++ b/perl/DXM.pm
@@ -16,42 +16,40 @@
 
 package DXM;
 
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(msg);
+use DXVars;
+use Carp;
 
-%msgs = (
-  addr => 'Address set to: $_[0]',
-  anns => 'Announce flag set on $_[0]',
-  annu => 'Announce flag unset on $_[0]',
-  conother => 'Sorry $_[0] you are connected on another port',
-  concluster => 'Sorry $_[0] you are already connected elsewhere on the cluster',
-  dxs => 'DX Spots flag set on $_[0]',
-  dxu => 'DX Spots flag unset on $_[0]',
-  e1 => 'Invalid command',
-  e2 => 'Error: $_[0]',
-  e3 => '$_[0]: $_[1] not found',
-  email => 'E-mail address set to: $_[0]',
-  heres => 'Here set on $_[0]',
-  hereu => 'Here unset on $_[0]',
-  homebbs => 'Home BBS set to: $_[0]',
-  homenode => 'Home Node set to: $_[0]',
-  l1 => 'Sorry $_[0], you are already logged on on another channel',
-  l2 => 'Hello $_[0], this is $main::mycall located in $main::myqth',
-  m2 => '$_[0] Information: $_[1]',
-  pr => '$_[0] de $main::mycall $main::cldate $main::ztime >',
-  prx => '$main::$mycall >',
-  talks => 'Talk flag set on $_[0]',
-  talku => 'Talk flag unset on $_[0]',
-  wwvs => 'WWV flag set on $_[0]',
-  wwvu => 'WWV flag unset on $_[0]',
-);
+my $localfn = "$main::root/local/Messages";
+my $fn = "$main::root/perl/Messages";
 
 sub msg
 {
-  my $self = shift;
-  my $s = $msgs{$self};
-  return "unknown message '$self'" if !defined $s;
-  return  eval qq("$s");
+	my $lang = shift;
+	my $m = shift;
+	my $ref = $msgs{$lang};
+	my $s = $ref->{$m} if $ref;
+	return "unknown message '$m' in lang '$lang'" if !defined $s;
+	my $ans = eval qq{ "$s" };
+	confess $@ if $@;
+	return $ans;
+}
+
+sub load
+{
+	my $ref = shift;
+	if (-e $localfn) {
+		do $localfn;
+		return ($@) if $@ && ref $ref;
+		confess $@ if $@;
+		return ();
+	}
+	do $fn;
+	return ($@) if $@ && ref $ref;
+	confess $@ if $@;
+	return ();
+}
+
+sub init
+{
+	load();
 }
-