X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e3a5ffc7fe48b267b3482dd646e617dc7f18dc88..140051e24ff5a74421e8b437cdc12ca8570995cd:/word.plp

diff --git a/word.plp b/word.plp
index aed42fd..977545f 100644
--- a/word.plp
+++ b/word.plp
@@ -1,19 +1,20 @@
 <(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
 	if (-e $page) {
+		$wordlistbase .= ".$lang";
 		Include $page;
 		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',
@@ -23,7 +24,7 @@ Html({
 		language
 	'],
 	data => [$wordlist],
-	raw => (exists $get{q} && <<'EOT')
+	raw => exists $get{q} ? <<'EOT' : undef,
 <style>
 .gallery figure {
 	grid-row: span 1 !important;
@@ -43,13 +44,6 @@ Html({
 	font-size: 175% !important;
 }
 </style>
-EOT
-		. <<'EOT',
-<style>
-body {
-	margin: 8px 1px;
-}
-</style>
 EOT
 });
 
@@ -81,7 +75,7 @@ sub showimg {
 	$name = "<q>$name</q>" if $name =~ s/\?$//;
 	$name = "<figcaption>$name</figcaption>";
 
-	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 src="/%s" alt="%s" />', $img, $imgname;
 	}
 	return sprintf '<figure%s>%s</figure>', $hidden && !exists $get{v} && ' hidden', $name;