summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2010-09-26 08:50:30 +0000
committerPetter Reinholdtsen <pere@hungry.com>2010-09-26 08:50:30 +0000
commitd6528843904cf83cb2bd5ef0316d43ef9a1406f9 (patch)
tree95bfd043a2998f013dd0c3adc8bb38f98b8ae6c7
parent7e1f9f5f89e27e3d914f59bf99ca07f1f2ce92d8 (diff)
Bytt ut kolon med komma mellom sted og dato for å få mer korrekt norsk
presentasjon. Fjern unødvendig kolon etter navn på fordragsholder.
-rwxr-xr-xtools/gen_frikanalen_video.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/gen_frikanalen_video.pl b/tools/gen_frikanalen_video.pl
index 1dff7fb..fdf6556 100755
--- a/tools/gen_frikanalen_video.pl
+++ b/tools/gen_frikanalen_video.pl
@@ -154,7 +154,7 @@ sub create_startposter_png {
my $name = shift;
my $title_lines = break_title($meta->{'title'});
my $bgfile = shift;
- my $f = "convert $bgfile -pointsize 72 -fill white -gravity NorthWest -draw \"text 450,167 \'$meta->{'presenter'}:\'\" -pointsize 60 -draw \"text 450,300 \'$title_lines->[0]\'\" -draw \"text 450,380 \'$title_lines->[1]\'\" -draw \"text 450,460 \'$title_lines->[2]\'\" -draw \"text 450,540 \'$title_lines->[3]\'\" -pointsize 36 -pointsize 36 -draw \"text 52,790 \'$meta->{'url'}\'\" -draw \"text 750,640 \'$meta->{'place'}: $meta->{'date'}\'\" $name";
+ my $f = "convert $bgfile -pointsize 72 -fill white -gravity NorthWest -draw \"text 450,167 \'$meta->{'presenter'}\'\" -pointsize 60 -draw \"text 450,300 \'$title_lines->[0]\'\" -draw \"text 450,380 \'$title_lines->[1]\'\" -draw \"text 450,460 \'$title_lines->[2]\'\" -draw \"text 450,540 \'$title_lines->[3]\'\" -pointsize 36 -pointsize 36 -draw \"text 52,790 \'$meta->{'url'}\'\" -draw \"text 750,640 \'$meta->{'place'}, $meta->{'date'}\'\" $name";
if ( !runcmd($f) ) { die "Failed to execute system command in" . (caller(0))[3] ."\n"; }
}
@@ -192,7 +192,7 @@ sub create_endposter_png {
}
my $name = shift;
my $bgfile = shift;
- my $f = "convert $bgfile -pointsize $text_size -fill white -gravity NorthWest $cmd_body -pointsize 36 -draw \"text 52,790 \'$meta->{'url'}\'\" -draw \"text 750,640 \'$meta->{'place'}: $meta->{'date'}\'\" $name";
+ my $f = "convert $bgfile -pointsize $text_size -fill white -gravity NorthWest $cmd_body -pointsize 36 -draw \"text 52,790 \'$meta->{'url'}\'\" -draw \"text 750,640 \'$meta->{'place'}, $meta->{'date'}\'\" $name";
if ( !runcmd($f) ) { die "Failed to execute system command in" . (caller(0))[3] ."\n"; }
}