From 38b1301258db329c457ffeb948ce37fc5369e288 Mon Sep 17 00:00:00 2001 From: Yevhenii Pertiaka Date: Fri, 18 Aug 2023 03:20:45 +0900 Subject: [PATCH] Corrected source code so that it works correctly with reactiveCache #5000 --- imports/i18n/tap.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/imports/i18n/tap.js b/imports/i18n/tap.js index 51c605add..3062e4a35 100644 --- a/imports/i18n/tap.js +++ b/imports/i18n/tap.js @@ -47,13 +47,13 @@ export const TAPi18n = { async loadLanguage(language) { if (language in languages && 'load' in languages[language]) { let data = await languages[language].load(); + let custom_translations = []; - if (Meteor.isServer) { - custom_translations = Translation.find({language: language}, {fields: { text: true, translationText: true }}).fetch(); - } else if (Meteor.isClient) { - await Meteor.subscribe('translation', {language: language}, 0); - custom_translations = ReactiveCache.getTranslations({language: language}, {fields: { text: true, translationText: true }}); + if (Meteor.isClient) { + await Meteor.subscribe('translation', {language: language}, 0); } + custom_translations = ReactiveCache.getTranslations({language: language}, {fields: { text: true, translationText: true }}); + if (custom_translations && custom_translations.length > 0) { data = custom_translations.reduce((acc, cur) => (acc[cur.text]=cur.translationText, acc), data); }