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 b4e883cde9266c1347d0a08618bc185306578bf3..d79a0029cf7c9359ba194638611aedf33d4eff2c 100755 (executable)
--- 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 89da82747b572f04be9f49482567a36be0a4dc51..b96ebdbbf632d884e6a7ae85e1b39fdbe00aa0ad 100644 (file)
--- a/word.plp
+++ b/word.plp
@@ -82,7 +82,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;

diff --git a/word/edit.plp b/word/edit.plp
index 7ba90faa47eb4473f0b50f07726f8b35fcc8565c..426fb5c281e577f9fbe9d0a458f345df9f341d7c 100644 (file)
--- 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 24feead78cbfd4d66f3eb79728bce412638e18d4..a6b19061fee1e42dbbc6f9df3e7ffc94c80e1f8d 100644 (file)
--- 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 5908fdcbec9f3a2a69967bf1d9111bb4e98e193e..ca6843af1e992be47e3e8777b006f8fda121c177 100644 (file)
--- 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 b199be4ef28d42249cd86a3a568024bfc2d33de0..5f2a3bba9ad40ec5a4253ce6310dd8ec269caefb 100644 (file)
--- 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`
                );
        }