From: Mischa POSLAWSKY Date: Mon, 3 Jan 2022 04:05:43 +0000 (+0100) Subject: word: change directory name of 3:2 thumbnails X-Git-Tag: v1.13~48 X-Git-Url: http://git.shiar.nl/sheet.git/commitdiff_plain/91810a36f31f93d25209e62f40aa24851aa33351 word: change directory name of 3:2 thumbnails Specific to convert options (identified by resulting shape), not language. --- diff --git a/tools/mkwordthumb b/tools/mkwordthumb index b4e883c..d79a002 100755 --- a/tools/mkwordthumb +++ b/tools/mkwordthumb @@ -17,6 +17,6 @@ while (my $row = $query->hash) { eval { my $meta = eval { JSON->new->decode($row->{image} // '{}') } or die ["Invalid JSON metadata in image column.", $@]; - $image->generate("data/word/en/$row->{id}.jpg", $meta->{convert}); + $image->generate("data/word/32/$row->{id}.jpg", $meta->{convert}); } or warn "$row->{id}: @{$@}"; } diff --git a/word.plp b/word.plp index 89da827..b96ebdb 100644 --- a/word.plp +++ b/word.plp @@ -82,7 +82,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 '%s', $img, $imgname; } return sprintf '%s', $hidden && !exists $get{v} && ' hidden', $name; diff --git a/word/edit.plp b/word/edit.plp index 7ba90fa..426fb5c 100644 --- a/word/edit.plp +++ b/word/edit.plp @@ -109,7 +109,7 @@ my %wordcol = ( return "data/word/org/$_[0]->{id}.jpg"; }}, convert => {-label => 'Convert options', -json => 'image', -multiple => 1, -src => sub { - return "data/word/en/$_[0]->{id}.jpg"; + return "data/word/32/$_[0]->{id}.jpg"; }}, story => {-label => 'Story', type => 'textarea', hidden => 'hidden'}, ); diff --git a/word/memory.js b/word/memory.js index 24feead..a6b1906 100644 --- a/word/memory.js +++ b/word/memory.js @@ -73,7 +73,7 @@ class WordMemory extends WordQuiz { cards.shuffle().forEach(word => { let ref = Math.abs(word); put(this.form, - 'figure>img[src=$]<', `/data/word/en/${ref}.jpg`, + 'figure>img[src=$]<', `/data/word/32/${ref}.jpg`, {onclick: e => this.turn(e), id: ref, className: word < 0 ? 'mirror' : ''} ); }); diff --git a/word/multichoice.js b/word/multichoice.js index 5908fdc..ca6843a 100644 --- a/word/multichoice.js +++ b/word/multichoice.js @@ -4,7 +4,7 @@ class WordMultiChoice extends WordQuiz { let word = this.words.shift(); if (!word[2]) return this.next(); let form = put(this.form, - '+img[src=$]+ul', `/data/word/en/${word[2]}.jpg`, + '+img[src=$]+ul', `/data/word/32/${word[2]}.jpg`, ); let answers = [word[0], this.words[0][0], this.words[1][0], this.words[2][0]] diff --git a/word/wijzer.js b/word/wijzer.js index b199be4..5f2a3bb 100644 --- a/word/wijzer.js +++ b/word/wijzer.js @@ -12,7 +12,7 @@ class WordWijzer extends WordQuiz { this.question.innerHTML = ''; put(this.question, '[data-id=$] img[src=$]', word[2], - `/data/word/en/${word[2]}.jpg` + `/data/word/32/${word[2]}.jpg` ); }