Merge remote-tracking branch 'origin/lotus' into fix/translate-unavailable-copy
CI / Build & Quality Checks (pull_request) Canceled after 0s
CI / Trigger Desktop Build (pull_request) Canceled after 0s
CI / Secret scan (gitleaks) (pull_request) Canceled after 0s
CI / Docker image build & smoke test (pull_request) Canceled after 0s
CI / Playwright smoke (e2e) (pull_request) Canceled after 0s
CI / Build & Quality Checks (pull_request) Canceled after 0s
CI / Trigger Desktop Build (pull_request) Canceled after 0s
CI / Secret scan (gitleaks) (pull_request) Canceled after 0s
CI / Docker image build & smoke test (pull_request) Canceled after 0s
CI / Playwright smoke (e2e) (pull_request) Canceled after 0s
# Conflicts: # src/app/utils/translation/langUtils.ts
This commit is contained in:
@@ -95,3 +95,9 @@ export const translationUnavailableText = (desktopApp: boolean): string =>
|
||||
desktopApp
|
||||
? 'On-device translation isn’t available in this version of the desktop app. It works in Chrome or Edge 138+ on a computer.'
|
||||
: 'On-device translation isn’t available in this browser. Use Chrome or Edge 138+ on a computer.';
|
||||
|
||||
/** Pure: why a manual Translate did nothing (#287). */
|
||||
export const translateSkipMessage = (from: string | undefined, targetLang: string): string =>
|
||||
from
|
||||
? `This message is already in ${languageName(targetLang) || targetLang}.`
|
||||
: "Couldn't tell what language this message is in, so it wasn't translated.";
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { translateSkipMessage } from './langUtils';
|
||||
|
||||
test('translateSkipMessage explains a Translate that did nothing (#287)', () => {
|
||||
assert.equal(translateSkipMessage('en', 'en'), 'This message is already in English.');
|
||||
assert.match(translateSkipMessage(undefined, 'en'), /^Couldn't tell what language/);
|
||||
});
|
||||
Reference in New Issue
Block a user