Alias for pronunciation dict

yomidevs · Jul 30, 2024 · 9cb30eb · 9cb30eb
1 parent 550ab45
commit 9cb30eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ext/js/dictionary/dictionary-data-util.js b/ext/js/dictionary/dictionary-data-util.js
@@ -147,19 +147,21 @@ export function getGroupedPronunciations(dictionaryEntry) {
 
     const allTerms = new Set();
     const allReadings = new Set();
+    const aliasMap = new Map();
     for (const {term, reading} of headwords) {
         allTerms.add(term);
         allReadings.add(reading);
     }
 
     /** @type {Map<string, import('dictionary-data-util').GroupedPronunciationInternal[]>} */
     const groupedPronunciationsMap = new Map();
-    for (const {headwordIndex, dictionary, pronunciations} of termPronunciations) {
+    for (const {headwordIndex, dictionary, dictionaryAlias, pronunciations} of termPronunciations) {
         const {term, reading} = headwords[headwordIndex];
         let dictionaryGroupedPronunciationList = groupedPronunciationsMap.get(dictionary);
         if (typeof dictionaryGroupedPronunciationList === 'undefined') {
             dictionaryGroupedPronunciationList = [];
             groupedPronunciationsMap.set(dictionary, dictionaryGroupedPronunciationList);
+            aliasMap.set(dictionary, dictionaryAlias);
         }
         for (const pronunciation of pronunciations) {
             let groupedPronunciation = findExistingGroupedPronunciation(reading, pronunciation, dictionaryGroupedPronunciationList);
@@ -181,6 +183,7 @@ export function getGroupedPronunciations(dictionaryEntry) {
     for (const [dictionary, dictionaryGroupedPronunciationList] of groupedPronunciationsMap.entries()) {
         /** @type {import('dictionary-data-util').GroupedPronunciation[]} */
         const pronunciations2 = [];
+        const dictionaryAlias = aliasMap.get(dictionary) ?? dictionary;
         for (const groupedPronunciation of dictionaryGroupedPronunciationList) {
             const {pronunciation, terms, reading} = groupedPronunciation;
             const exclusiveTerms = !areSetsEqual(terms, allTerms) ? getSetIntersection(terms, allTerms) : [];
@@ -197,7 +200,7 @@ export function getGroupedPronunciations(dictionaryEntry) {
             });
         }
 
-        results2.push({dictionary, pronunciations: pronunciations2});
+        results2.push({dictionary, dictionaryAlias, pronunciations: pronunciations2});
     }
     return results2;
 }

diff --git a/ext/js/display/display-generator.js b/ext/js/display/display-generator.js
@@ -663,15 +663,15 @@ export class DisplayGenerator {
      * @returns {HTMLElement}
      */
     _createGroupedPronunciation(details) {
-        const {dictionary, pronunciations} = details;
+        const {dictionary, dictionaryAlias, pronunciations} = details;
 
         const node = this._instantiate('pronunciation-group');
         node.dataset.dictionary = dictionary;
         node.dataset.pronunciationsMulti = 'true';
         node.dataset.pronunciationsCount = `${pronunciations.length}`;
 
         const n1 = this._querySelector(node, '.pronunciation-group-tag-list');
-        const tag = this._createTag(this._createTagData(dictionary, 'pronunciation-dictionary'));
+        const tag = this._createTag(this._createTagData(dictionaryAlias, 'pronunciation-dictionary'));
         n1.appendChild(tag);
 
         let hasTags = false;
@@ -686,6 +686,7 @@ export class DisplayGenerator {
         n.dataset.hasTags = `${hasTags}`;
         this._appendMultiple(n, this._createPronunciation.bind(this), pronunciations);
 
+        tag.dataset.details = dictionary;
         return node;
     }
 

diff --git a/types/ext/dictionary-data-util.d.ts b/types/ext/dictionary-data-util.d.ts
@@ -80,6 +80,7 @@ export type GroupedPronunciation = {
 
 export type DictionaryGroupedPronunciations = {
     dictionary: string;
+    dictionaryAlias: string;
     pronunciations: GroupedPronunciation[];
 };