X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/139cfe4ebde273208f91d401a2938330faf41c06..ebbfbfbb295d4268eba729b0cee0b85679a04e3f:/word.plp?ds=sidebyside
diff --git a/word.plp b/word.plp
index 9ea54e8..5571299 100644
--- a/word.plp
+++ b/word.plp
@@ -1,29 +1,41 @@
<(common.inc.plp)><:
our $lang = $get{lang} || 'en';
-our $wordlistbase = "data/wordlist.$lang";
+our $wordlistbase = "data/wordlist";
if ($Request and $Request =~ m{\A([^/]+)}) {
- my $page = "word/$1.plp";
- utf8::downgrade($page); # unicode filename breaks contents encoding
+ my $name = $1;
+ my $page = "word/$name.plp";
if (-e $page) {
+ utf8::downgrade($page); # unicode filename breaks contents encoding
Include $page;
- exit;
}
+ else {
+ Html({
+ raw => join("\n", map qq(),
+ 'put.min.js', 'quiz.js', "$name.js",
+ ),
+ lang => $lang,
+ });
+ say '
Words
';
+ say '';
+ say "";
+ }
+ exit;
}
-my $wordlist = "$wordlistbase.inc.pl";
-my $limit = $get{v} // (exists $get{v} ? 4 : 3);
+my $limit = $get{v} // (exists $get{v} ? 5 : 3);
Html({
title => 'words cheat sheet',
version => '1.0',
+ lang => $lang,
description => "Visual words",
keywords => [qw'
language
'],
- data => [$wordlist],
- raw => (exists $get{q} && <<'EOT')
+ data => ["$wordlistbase.inc.pl"],
+ raw => exists $get{q} ? <<'EOT' : undef,
-EOT
- . <<'EOT',
-
EOT
});
@@ -68,12 +73,11 @@ Zie ook dieren.
<:
-my $table = do $wordlist or die $@ // $!;
+my $table = Data($wordlistbase);
sub showimg {
my ($id, $name) = @_;
my ($imgname) = $name =~ m{^([^/]+)};
- $name =~ s/\w{4} [^aoeuiyc\W] [rl]?+ \K (?= [^aoeuiy\W] [rl]? [aoeuiy] \w)//gx;
($name, my @morenames) = split m{/}, $name;
$name =~ s{\( ([^/]+) \)}{$1}x;
$name .= " ($_)" for @morenames;
@@ -81,7 +85,7 @@ sub showimg {
$name = "$name
" if $name =~ s/\?$//;
$name = "$name";
- if ($id and -e (my $img = "data/word/en/$id.jpg")) {
+ if ($id and -e (my $img = "data/word/32/$id.jpg")) {
$name .= sprintf '', $img, $imgname;
}
return sprintf '', $hidden && !exists $get{v} && ' hidden', $name;
@@ -122,7 +126,10 @@ if (exists $get{q}) {
$table = {};
printimgs(@rows);
}
+elsif ($Request and $Request =~ /^\d+$/) {
+ printimgs([$Request]);
+}
else {
- printimgs($Request || $table->{''}->[0]);
+ printimgs($table->{''}->[0]);
}
say '';