summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rwxr-xr-xepg2html24
3 files changed, 23 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 670f4e35..ab20c125 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2826,6 +2826,8 @@ Alex Lasnier <alex@fepg.org>
Dimitar Petrovski <dimeptr@gmail.com>
for translating OSD texts to the Macedonian language
+ for pointing out a missing character set in the header of HTML pages generated by
+ the epg2html script
Eric Valette <eric.valette@free.fr>
for adding handling of EnhancedAC3DescriptorTag
diff --git a/HISTORY b/HISTORY
index f1955142..6349e3f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7697,3 +7697,5 @@ Video Disk Recorder Revision History
- Added a note about the new default sort order of recordings to the release notes of
version 1.7.29 and the UPDATE-2.0.0 file (pointed out by Wolfgang Rohdewald).
- Fixed a faulty UTF-8 character in cs_CZ.po.
+- Added the system's character set to the page header in the epg2html script (pointed
+ out by Dimitar Petrovski).
diff --git a/epg2html b/epg2html
index 8b9e7b1f..5062e70f 100755
--- a/epg2html
+++ b/epg2html
@@ -12,9 +12,11 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: epg2html 2.1 2011/12/04 14:17:35 kls Exp $
+# $Id: epg2html 2.2 2013/03/04 12:13:11 kls Exp $
@Index = ();
+($Charset = $ENV{LANG}) =~ s/^[^.]*\.?(.*)/$1/;
+$Charset = "utf-8" unless $Charset || $ENV{LANG} == 'C';
sub GetDay
{
@@ -79,10 +81,16 @@ while (<>) {
}
push(@Schedule, "</table>\n") if (@Schedule);
open(PAGE, ">$Page") or die "$Page: $!\n";
- print PAGE "<html>\n<head><title>$Channel</title><head>\n<body>\n";
+ print PAGE "<html>\n";
+ print PAGE "<head>\n";
+ print PAGE "<title>$Channel</title>\n";
+ print PAGE "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=$Charset\">\n";
+ print PAGE "</head>\n";
+ print PAGE "<body>\n";
print PAGE "<h1>$Channel</h1>\n";
print PAGE @Schedule;
- print PAGE "</body>\n</html>\n";
+ print PAGE "</body>\n";
+ print PAGE "</html>\n";
close(PAGE);
last;
}
@@ -91,7 +99,13 @@ while (<>) {
}
open(INDEX, ">index.htm") or die "index.htm: $!\n";
-print INDEX "<html>\n<head><title>EPG Index</title><head>\n<body>\n";
+print INDEX "<html>\n";
+print INDEX "<head>\n";
+print INDEX "<title>EPG Index</title>\n";
+print INDEX "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=$Charset\">\n";
+print INDEX "</head>\n";
+print INDEX "<body>\n";
print INDEX sort { lc($a) cmp lc($b) } @Index;
-print INDEX "</body>\n</html>\n";
+print INDEX "</body>\n";
+print INDEX "</html>\n";
close(INDEX);