Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
33cc0de97c |
@@ -89,6 +89,8 @@ import { zIndices } from '../styles/zIndex';
|
||||
|
||||
const PIP_MIN_W = 200;
|
||||
const PIP_MIN_H = 112;
|
||||
/** Default PiP top: just below the 64px-ish room header. */
|
||||
const PIP_DEFAULT_TOP = 72;
|
||||
|
||||
type Corner = 'se' | 'sw' | 'ne' | 'nw';
|
||||
|
||||
@@ -1046,8 +1048,11 @@ export function CallEmbedProvider({ children }: CallEmbedProviderProps) {
|
||||
el.style.left = `${Math.max(0, Math.min(savedPos.left, window.innerWidth - 280))}px`;
|
||||
el.style.top = `${Math.max(0, Math.min(savedPos.top, window.innerHeight - 158))}px`;
|
||||
} else {
|
||||
el.style.left = `${window.innerWidth - 280 - 16}px`;
|
||||
el.style.top = `${window.innerHeight - 158 - 72}px`;
|
||||
// [Gitea #323] First use: top-right under the room header, over the
|
||||
// timeline. Bottom-right sat on the composer (Send / Emoji, and on
|
||||
// phones the whole message box), so typing landed on the call.
|
||||
el.style.left = `${Math.max(0, window.innerWidth - 280 - 16)}px`;
|
||||
el.style.top = `${PIP_DEFAULT_TOP}px`;
|
||||
}
|
||||
el.style.width = '280px';
|
||||
el.style.height = '158px';
|
||||
|
||||
@@ -12,8 +12,7 @@ import {
|
||||
markAutoTranslateTried,
|
||||
} from '../state/translation';
|
||||
import { chromeTranslationEngine as engine } from '../utils/translation/chromeEngine';
|
||||
import { sameLanguage, translateSkipMessage } from '../utils/translation/langUtils';
|
||||
import { toastQueueAtom } from '../state/toast';
|
||||
import { sameLanguage } from '../utils/translation/langUtils';
|
||||
|
||||
export type MsgTranslationStatus =
|
||||
| 'idle' // not translating (original shown)
|
||||
@@ -53,7 +52,6 @@ export const useMessageTranslation = (eventId: string, text: string): MsgTransla
|
||||
// Write-only: reading the whole cache array here (via useAtom) would
|
||||
// resubscribe this message to every other message's writes. [Gitea #39]
|
||||
const setCache = useSetAtom(translationCacheAtom);
|
||||
const setToast = useSetAtom(toastQueueAtom);
|
||||
|
||||
// The key includes a fingerprint of `text`, so an edit (same event id, new
|
||||
// body) misses the old entry and re-translates instead of showing stale
|
||||
@@ -126,16 +124,6 @@ export const useMessageTranslation = (eventId: string, text: string): MsgTransla
|
||||
if (!from || sameLanguage(from, targetLang)) {
|
||||
setStatus('skipped');
|
||||
setActive(false);
|
||||
// [Gitea #287] Say why nothing happened instead of silently undoing
|
||||
// the click (no chip shows once translation is switched back off).
|
||||
setToast({
|
||||
id: `translate-skipped-${eventId}-${Date.now()}`,
|
||||
displayName: 'Translate',
|
||||
body: translateSkipMessage(from, targetLang),
|
||||
roomName: '',
|
||||
roomId: '',
|
||||
onClick: () => undefined,
|
||||
});
|
||||
return;
|
||||
}
|
||||
setFromLang(from);
|
||||
@@ -166,7 +154,7 @@ export const useMessageTranslation = (eventId: string, text: string): MsgTransla
|
||||
// Invalidate this run's writes if inputs change / unmount.
|
||||
runIdRef.current += 1;
|
||||
};
|
||||
}, [active, cached, supported, text, targetLang, key, setActive, setCache, setToast, eventId]);
|
||||
}, [active, cached, supported, text, targetLang, key, setActive, setCache]);
|
||||
|
||||
// When switched off, drop back to idle (keep the cached translation around so
|
||||
// toggling back on is instant).
|
||||
|
||||
@@ -85,9 +85,3 @@ export function languageName(code: string, uiLocale = 'en'): string {
|
||||
export function isSupportedTargetLang(code: string): boolean {
|
||||
return CURATED_NAME.has(normalizeLang(code));
|
||||
}
|
||||
|
||||
/** 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.";
|
||||
|
||||
@@ -1,8 +0,0 @@
|
||||
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