Merge pull request #5087 from ipyramiddev/master

Corrected source code so that it works correctly with reactiveCache
This commit is contained in:
Lauri Ojansivu 2023-08-17 21:24:32 +03:00 committed by GitHub
commit baf1ddc8e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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);
}