aboutsummaryrefslogtreecommitdiff
path: root/ext/js/language
diff options
context:
space:
mode:
Diffstat (limited to 'ext/js/language')
-rw-r--r--ext/js/language/dictionary-database.js4
-rw-r--r--ext/js/language/translator.js8
2 files changed, 6 insertions, 6 deletions
diff --git a/ext/js/language/dictionary-database.js b/ext/js/language/dictionary-database.js
index 98f56986..6b235fb6 100644
--- a/ext/js/language/dictionary-database.js
+++ b/ext/js/language/dictionary-database.js
@@ -392,7 +392,7 @@ class DictionaryDatabase {
definitionTags: this._splitField(row.definitionTags || row.tags || ''),
termTags: this._splitField(row.termTags || ''),
rules: this._splitField(row.rules),
- glossary: row.glossary,
+ definitions: row.glossary,
score: row.score,
dictionary: row.dictionary,
id: row.id,
@@ -407,7 +407,7 @@ class DictionaryDatabase {
onyomi: this._splitField(row.onyomi),
kunyomi: this._splitField(row.kunyomi),
tags: this._splitField(row.tags),
- glossary: row.meanings,
+ definitions: row.meanings,
stats: row.stats,
dictionary: row.dictionary
};
diff --git a/ext/js/language/translator.js b/ext/js/language/translator.js
index 68a55cf9..28634f9c 100644
--- a/ext/js/language/translator.js
+++ b/ext/js/language/translator.js
@@ -148,13 +148,13 @@ class Translator {
this._sortDatabaseEntriesByIndex(databaseEntries);
const dictionaryEntries = [];
- for (const {character, onyomi, kunyomi, tags, glossary, stats, dictionary} of databaseEntries) {
+ for (const {character, onyomi, kunyomi, tags, definitions, stats, dictionary} of databaseEntries) {
const expandedStats = await this._expandKanjiStats(stats, dictionary);
const tagGroups = [];
if (tags.length > 0) { tagGroups.push(this._createTagGroup(dictionary, tags)); }
- const dictionaryEntry = this._createKanjiDictionaryEntry(character, dictionary, onyomi, kunyomi, tagGroups, expandedStats, glossary);
+ const dictionaryEntry = this._createKanjiDictionaryEntry(character, dictionary, onyomi, kunyomi, tagGroups, expandedStats, definitions);
dictionaryEntries.push(dictionaryEntry);
}
@@ -960,7 +960,7 @@ class Translator {
}
_createTermDictionaryEntryFromDatabaseEntry(databaseEntry, originalText, transformedText, deinflectedText, reasons, isPrimary, enabledDictionaryMap) {
- const {term, reading: rawReading, definitionTags, termTags, glossary, score, dictionary, id, sequence, rules} = databaseEntry;
+ const {term, reading: rawReading, definitionTags, termTags, definitions, score, dictionary, id, sequence, rules} = databaseEntry;
const reading = (rawReading.length > 0 ? rawReading : term);
const {index: dictionaryIndex, priority: dictionaryPriority} = this._getDictionaryOrder(dictionary, enabledDictionaryMap);
const sourceTermExactMatchCount = (isPrimary && deinflectedText === term ? 1 : 0);
@@ -984,7 +984,7 @@ class Translator {
sourceTermExactMatchCount,
maxTransformedTextLength,
[this._createTermHeadword(0, term, reading, [source], headwordTagGroups, rules)],
- [this._createTermDefinition(0, [0], dictionary, definitionTagGroups, glossary)]
+ [this._createTermDefinition(0, [0], dictionary, definitionTagGroups, definitions)]
);
}