Merge branch 'master' into shortened-causative-form

yomidevs · Aug 29, 2024 · c84fb28 · c84fb28
2 parents a504f5b + 8509bcb
commit c84fb28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
@@ -1299,7 +1299,7 @@ export class Backend {
         let apiKey = options.anki.apiKey;
         if (apiKey === '') { apiKey = null; }
         this._anki.server = options.anki.server;
-        this._anki.enabled = options.anki.enable && enabled;
+        this._anki.enabled = options.anki.enable;
         this._anki.apiKey = apiKey;
 
         this._mecab.setEnabled(options.parsing.enableMecabParser && enabled);

diff --git a/ext/settings.html b/ext/settings.html
@@ -3225,15 +3225,15 @@ <h5>or click here to upload</h5>
                     <td>List of definitions for the term, except the dictionary tag is omitted.</td>
                 </tr>
                 <tr>
-                    <td><code class="anki-field-marker">{glossary}</code></td>
+                    <td><code class="anki-field-marker">{glossary-first}</code></td>
                     <td>First definition for the term.</td>
                 </tr>
                 <tr>
-                    <td><code class="anki-field-marker">{glossary-brief}</code></td>
+                    <td><code class="anki-field-marker">{glossary-first-brief}</code></td>
                     <td>First definition for the term in a more compact format.</td>
                 </tr>
                 <tr>
-                    <td><code class="anki-field-marker">{glossary-no-dictionary}</code></td>
+                    <td><code class="anki-field-marker">{glossary-first-no-dictionary}</code></td>
                     <td>First definition for the term, except the dictionary tag is omitted.</td>
                 </tr>
                 <tr>