Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Autotranslate method should respect setting #26549

Merged
merged 5 commits into from
Aug 25, 2022
Merged

[FIX] Autotranslate method should respect setting #26549

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b43d50c
Autotranslate method should respect setting
KevLehman Aug 11, 2022
0234db8
Merge branch 'develop' into fix/autotranslate-ignoring-enabled-setting
KevLehman Aug 17, 2022
a39b0ba
Merge branch 'develop' into fix/autotranslate-ignoring-enabled-setting
Aug 18, 2022
9d7013f
remove error message
KevLehman Aug 22, 2022
e90d40f
Merge branch 'develop' into fix/autotranslate-ignoring-enabled-setting
Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/meteor/app/autotranslate/client/lib/autotranslate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const AutoTranslate = {
initialized: false,
providersMetadata: {} as { [providerNamer: string]: { name: string; displayName: string } },
messageIdsToWait: {} as { [messageId: string]: string },
supportedLanguages: [] as ISupportedLanguage[],
supportedLanguages: [] as ISupportedLanguage[] | undefined,

findSubscriptionByRid: mem((rid) => Subscriptions.findOne({ rid })),

Expand All @@ -43,7 +43,7 @@ export const AutoTranslate = {
}
const language = (subscription?.autoTranslateLanguage || userLanguage || window.defaultUserLanguage?.()) as string;
if (language.indexOf('-') !== -1) {
if (!this.supportedLanguages.some((supportedLanguage) => supportedLanguage.language === language)) {
if (!(this.supportedLanguages || []).some((supportedLanguage) => supportedLanguage.language === language)) {
return language.slice(0, 2);
}
}
Expand Down
5 changes: 5 additions & 0 deletions apps/meteor/app/autotranslate/server/methods/getSupportedLanguages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,14 @@ import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';

import { hasPermission } from '../../../authorization/server';
import { TranslationProviderRegistry } from '..';
import { settings } from '../../../settings/server';

Meteor.methods({
'autoTranslate.getSupportedLanguages'(targetLanguage) {
if (!settings.get('AutoTranslate_Enabled')) {
throw new Meteor.Error('error-autotranslate-disabled', 'Auto-Translate is disabled');
}

const userId = Meteor.userId();
if (!userId) {
throw new Meteor.Error('error-invalid-user', 'Invalid user', {
Expand Down