summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2008-02-08 19:22:55 +0000
committerAndreas Brachold <vdr07@deltab.de>2008-02-08 19:22:55 +0000
commite194290db05bf0d1c6b6b49106c2c28197141b6e (patch)
tree2b295c6c2a594e04a713a41fe11c20a6ddd7775d /lib
parenta6b5159e32aa2568d434d53028491092d5f3c097 (diff)
downloadxxv-e194290db05bf0d1c6b6b49106c2c28197141b6e.tar.gz
xxv-e194290db05bf0d1c6b6b49106c2c28197141b6e.tar.bz2
* REPORT: dump date with common format
* Fix typos
Diffstat (limited to 'lib')
-rw-r--r--lib/XXV/MODULES/AUTOTIMER.pm2
-rw-r--r--lib/XXV/MODULES/EPG.pm2
-rw-r--r--lib/XXV/MODULES/HTTPD.pm8
-rw-r--r--lib/XXV/MODULES/LOGREAD.pm2
-rw-r--r--lib/XXV/MODULES/MOVETIMER.pm2
-rw-r--r--lib/XXV/MODULES/RECORDS.pm2
-rw-r--r--lib/XXV/MODULES/REPORT.pm2
-rw-r--r--lib/XXV/MODULES/SHARE.pm2
-rw-r--r--lib/XXV/MODULES/VTX.pm4
-rw-r--r--lib/XXV/OUTPUT/NEWS/JABBER.pm10
-rw-r--r--lib/XXV/OUTPUT/NEWS/MAIL.pm8
-rw-r--r--lib/XXV/OUTPUT/NEWS/RSS.pm8
-rw-r--r--lib/XXV/OUTPUT/NEWS/VDR.pm10
13 files changed, 31 insertions, 31 deletions
diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm
index a74f487..297f8c8 100644
--- a/lib/XXV/MODULES/AUTOTIMER.pm
+++ b/lib/XXV/MODULES/AUTOTIMER.pm
@@ -222,7 +222,7 @@ ORDER BY
return {
message => sprintf(gettext('Autotimer has programmed %d new timer(s) since last report to %s'),
- (scalar @$erg - 1), scalar localtime($lastReportTime)),
+ (scalar @$erg - 1), datum($lastReportTime)),
table => $erg,
};
}
diff --git a/lib/XXV/MODULES/EPG.pm b/lib/XXV/MODULES/EPG.pm
index 2206370..a5b8d89 100644
--- a/lib/XXV/MODULES/EPG.pm
+++ b/lib/XXV/MODULES/EPG.pm
@@ -153,7 +153,7 @@ sub status {
return {
message => sprintf(gettext('EPG table contains %d entries and since the last login on %s %d new entries.'),
- $total, scalar localtime($lastReportTime), $newEntrys),
+ $total, datum($lastReportTime), $newEntrys),
};
}
diff --git a/lib/XXV/MODULES/HTTPD.pm b/lib/XXV/MODULES/HTTPD.pm
index b245878..e4b9377 100644
--- a/lib/XXV/MODULES/HTTPD.pm
+++ b/lib/XXV/MODULES/HTTPD.pm
@@ -161,7 +161,7 @@ sub init {
# globals
my $channels;
- $obj->{STATUS}->{'starttime'} = scalar localtime;
+ $obj->{STATUS}->{'starttime'} = time;
# make socket
my $socket = IO::Socket::INET->new(
@@ -434,10 +434,10 @@ sub ModulNotLoaded {
# ------------------
my $obj = shift || return error('No object defined!');
my $console = shift || return error('No console defined!');
- my $modul = shift || return error('No modul defined!');
+ my $module = shift || return error('No module defined!');
$console->statusmsg(500,
- ,sprintf(gettext("Modul '%s' is'nt loaded!"),$modul),
+ ,sprintf(gettext("Module '%s' is'nt loaded!"),$module),
,gettext("Internal Server Error"));
}
@@ -521,7 +521,7 @@ sub status {
return {
message => sprintf(gettext('Traffic on HTTPD socket since %s: transmitted: %s - received: %s - connections: %d.'),
- $obj->{STATUS}->{'starttime'},
+ datum($obj->{STATUS}->{'starttime'}),
convert($obj->{STATUS}->{'sendbytes'}),
convert($obj->{STATUS}->{'readbytes'}),
$obj->{STATUS}->{'connects'} ),
diff --git a/lib/XXV/MODULES/LOGREAD.pm b/lib/XXV/MODULES/LOGREAD.pm
index abd8629..f2d9157 100644
--- a/lib/XXV/MODULES/LOGREAD.pm
+++ b/lib/XXV/MODULES/LOGREAD.pm
@@ -155,7 +155,7 @@ sub logger {
type => $logname,
logfile => $logfile,
Size => convert($size),
- LastChanged => scalar localtime($mtime),
+ LastChanged => datum($mtime),
full => $params->{full},
color => $obj->{logfiles}->{$logname}->{display},
maxlet => $obj->{logfiles}->{$logname}->{maxlet},
diff --git a/lib/XXV/MODULES/MOVETIMER.pm b/lib/XXV/MODULES/MOVETIMER.pm
index e33c0b2..55df7c4 100644
--- a/lib/XXV/MODULES/MOVETIMER.pm
+++ b/lib/XXV/MODULES/MOVETIMER.pm
@@ -14,7 +14,7 @@ sub module {
Prereq => {
# 'Perl::Module' => 'Description',
},
- Description => gettext('This modul move timers between channels.'),
+ Description => gettext('This module move timers between channels.'),
Version => (split(/ /, '$Revision$'))[1],
Date => (split(/ /, '$Date$'))[1],
Author => 'Andreas Brachold',
diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm
index 0ab1d2f..bb515fb 100644
--- a/lib/XXV/MODULES/RECORDS.pm
+++ b/lib/XXV/MODULES/RECORDS.pm
@@ -2156,7 +2156,7 @@ ORDER BY
unshift(@$erg, $fields);
return {
message => sprintf(gettext('%d new recordings since last report time %s'),
- (scalar @$erg -1), scalar localtime($lastReportTime)),
+ (scalar @$erg -1), datum($lastReportTime)),
table => $erg,
};
}
diff --git a/lib/XXV/MODULES/REPORT.pm b/lib/XXV/MODULES/REPORT.pm
index c9797d9..39fd46b 100644
--- a/lib/XXV/MODULES/REPORT.pm
+++ b/lib/XXV/MODULES/REPORT.pm
@@ -33,7 +33,7 @@ sub module {
if($value eq 'y') {
my $module = main::getModule('EVENTS');
if(!$module or $module->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'EVENTS');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'EVENTS');
}
}
return $value;
diff --git a/lib/XXV/MODULES/SHARE.pm b/lib/XXV/MODULES/SHARE.pm
index fc209f9..22118b4 100644
--- a/lib/XXV/MODULES/SHARE.pm
+++ b/lib/XXV/MODULES/SHARE.pm
@@ -56,7 +56,7 @@ sub module {
if($value eq 'y') {
my $module = main::getModule('EVENTS');
unless($module or $module->{active} eq 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'EVENTS');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'EVENTS');
}
}
return $value;
diff --git a/lib/XXV/MODULES/VTX.pm b/lib/XXV/MODULES/VTX.pm
index af68b5f..15adcf6 100644
--- a/lib/XXV/MODULES/VTX.pm
+++ b/lib/XXV/MODULES/VTX.pm
@@ -105,7 +105,7 @@ sub findfirst {
my $console = shift || return error('No console defined!');
my $basedir = $self->{dir}
- || return $self->pagedump($console,gettext("Directory is for modul vtx not registered!"),"");
+ || return $self->pagedump($console,gettext("There none base directory is defined!"),"");
my $mod = main::getModule ('CHANNELS');
my $channels =[];
@@ -220,7 +220,7 @@ sub channel
# warn($dump);
# }
- $console->message(sprintf(gettext("Channel \'%s\' for modul vtx registered."),$channelname))
+ $console->message(sprintf(gettext("Channel \'%s\' selected."),$channelname))
if ($console->{TYP} ne 'HTML') ;
} else {
$self->pagedump($console,sprintf(gettext("No data found for \'%s\'!"),$channelname),"");
diff --git a/lib/XXV/OUTPUT/NEWS/JABBER.pm b/lib/XXV/OUTPUT/NEWS/JABBER.pm
index a0e4438..2090079 100644
--- a/lib/XXV/OUTPUT/NEWS/JABBER.pm
+++ b/lib/XXV/OUTPUT/NEWS/JABBER.pm
@@ -71,16 +71,16 @@ Then you must receive a message in your running jabber client.
check => sub {
my $value = shift;
my $erg = $obj->init
- or return undef, gettext("Can't initialize news modul!")
+ or return undef, gettext("Can't initialize news module!")
if($value eq 'y' and not exists $obj->{JCON});
if($value eq 'y') {
my $emodule = main::getModule('EVENTS');
if(!$emodule or $emodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'EVENTS');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'EVENTS');
}
my $rmodule = main::getModule('REPORT');
if(!$rmodule or $rmodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'REPORT');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'REPORT');
}
}
return $value;
@@ -179,8 +179,8 @@ sub new {
main::after(sub{
# The Initprocess
my $erg = $self->init
- or return error("Can't initialize news modul!");
- }, "NEWS::JABBER: Start initiate news modul ...")
+ or return error("Can't initialize news module!");
+ }, "NEWS::JABBER: Start initiate news module ...")
if($self->{active} eq 'y');
return $self;
diff --git a/lib/XXV/OUTPUT/NEWS/MAIL.pm b/lib/XXV/OUTPUT/NEWS/MAIL.pm
index f540d6a..07bdd07 100644
--- a/lib/XXV/OUTPUT/NEWS/MAIL.pm
+++ b/lib/XXV/OUTPUT/NEWS/MAIL.pm
@@ -35,17 +35,17 @@ sub module {
check => sub {
my $value = shift;
my $erg = $obj->init
- or return undef, gettext("Can't initialize news modul!")
+ or return undef, gettext("Can't initialize news module!")
if($value eq 'y' and not exists $obj->{INITE});
return $value;
if($value eq 'y') {
my $emodule = main::getModule('EVENTS');
if(!$emodule or $emodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'EVENTS');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'EVENTS');
}
my $rmodule = main::getModule('REPORT');
if(!$rmodule or $rmodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'REPORT');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'REPORT');
}
}
},
@@ -183,7 +183,7 @@ sub new {
# The Initprocess
my $erg = $self->init
- or return error("Can't initialize news modul!")
+ or return error("Can't initialize news module!")
if($self->{active} eq 'y');
$self->{TYP} = 'text/plain';
diff --git a/lib/XXV/OUTPUT/NEWS/RSS.pm b/lib/XXV/OUTPUT/NEWS/RSS.pm
index f9b5026..3cc4d2b 100644
--- a/lib/XXV/OUTPUT/NEWS/RSS.pm
+++ b/lib/XXV/OUTPUT/NEWS/RSS.pm
@@ -34,16 +34,16 @@ sub module {
check => sub {
my $value = shift;
my $erg = $obj->init
- or return undef, gettext("Can't initialize news modul!")
+ or return undef, gettext("Can't initialize news module!")
if($value eq 'y' and not exists $obj->{INITE});
if($value eq 'y') {
my $emodule = main::getModule('EVENTS');
if(!$emodule or $emodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'EVENTS');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'EVENTS');
}
my $rmodule = main::getModule('REPORT');
if(!$rmodule or $rmodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'REPORT');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'REPORT');
}
}
return $value;
@@ -112,7 +112,7 @@ sub new {
main::after(sub{
# The Initprocess
my $erg = $self->init
- or return error("Can't initialize news modul!");
+ or return error("Can't initialize news module!");
}, "NEWS::RSS: Start initiate rss feed ...")
if($self->{active} eq 'y');
diff --git a/lib/XXV/OUTPUT/NEWS/VDR.pm b/lib/XXV/OUTPUT/NEWS/VDR.pm
index 2ff1346..45d2cc7 100644
--- a/lib/XXV/OUTPUT/NEWS/VDR.pm
+++ b/lib/XXV/OUTPUT/NEWS/VDR.pm
@@ -31,16 +31,16 @@ sub module {
check => sub {
my $value = shift;
my $erg = $obj->init
- or return undef, gettext("Can't initialize news modul!")
+ or return undef, gettext("Can't initialize news module!")
if($value eq 'y' and not exists $obj->{INITE});
if($value eq 'y') {
my $emodule = main::getModule('EVENTS');
if(!$emodule or $emodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'EVENTS');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'EVENTS');
}
my $rmodule = main::getModule('REPORT');
if(!$rmodule or $rmodule->{active} ne 'y') {
- return undef, sprintf(gettext("Modul can't activated! This modul depends modul %s."),'REPORT');
+ return undef, sprintf(gettext("Module can't activated! This module depends module %s."),'REPORT');
}
}
return $value;
@@ -109,8 +109,8 @@ sub new {
main::after(sub{
# The Initprocess
my $erg = $self->init
- or return error("Can't initialize news modul!");
- }, "NEWS::VDR: Start initiate news modul ...")
+ or return error("Can't initialize news module!");
+ }, "NEWS::VDR: Start initiate news module ...")
if($self->{active} eq 'y');
return $self;