Merge branch 'main' into feature_sfu
This commit is contained in:
commit
9de7fe81f2
8 changed files with 2662 additions and 2963 deletions
|
@ -136,5 +136,8 @@
|
|||
"<0>Why not finish by setting up a password to keep your account?</0><1>You'll be able to keep your name and set an avatar for use on future calls</1>": "<0>Proč neskončit nastavením hesla, abyste mohli účet použít znovu?</0><1>Budete si moci nechat své jméno a nastavit si avatar pro budoucí hovory </1>",
|
||||
"<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Připojit se</0><1>Or</1><2>Zkopírovat odkaz a připojit se později</2>",
|
||||
"<0>Already have an account?</0><1><0>Log in</0> Or <2>Access as a guest</2></1>": "<0>Už máte účet?</0><1><0>Přihlásit se</0> Or <2>Jako host</2></1>",
|
||||
"{{name}} (Waiting for video...)": "{{name}} (Čekání na video...)"
|
||||
"{{name}} (Waiting for video...)": "{{name}} (Čekání na video...)",
|
||||
"This feature is only supported on Firefox.": "Tato funkce je podporována jen ve Firefoxu.",
|
||||
"<0>Submitting debug logs will help us track down the problem.</0>": "<0>Odeslání ladících záznamů nám pomůže diagnostikovat problém.</0>",
|
||||
"<0>Oops, something's gone wrong.</0>": "<0>Oops, něco se pokazilo.</0>"
|
||||
}
|
||||
|
|
|
@ -90,6 +90,18 @@
|
|||
"Video": "ビデオ",
|
||||
"Waiting for other participants…": "他の参加者を待機しています…",
|
||||
"Waiting for network": "ネットワークを待機しています",
|
||||
"Walkie-talkie call name": "トランシーバー通話の名前",
|
||||
"Walkie-talkie call": "トランシーバー通話"
|
||||
"Walkie-talkie call name": "トランシーバー通話の名称",
|
||||
"Walkie-talkie call": "トランシーバー通話",
|
||||
"Camera {{n}}": "カメラ {{n}}",
|
||||
"{{name}} is talking…": "{{name}}が話しています…",
|
||||
"Yes, join call": "はい、通話に参加",
|
||||
"Spatial audio": "空間オーディオ",
|
||||
"Select an option": "オプションを選択",
|
||||
"Debug log request": "デバッグログを要求",
|
||||
"Your recent calls": "最近の通話",
|
||||
"You can't talk at the same time": "同時に会話することはできません",
|
||||
"WebRTC is not supported or is being blocked in this browser.": "お使いのブラウザでWebRTCがサポートされていないか、またはブロックされています。",
|
||||
"Login to your account": "お持ちのアカウントでログイン",
|
||||
"Freedom": "自由",
|
||||
"{{displayName}}, your call is now ended": "{{displayName}}、通話が終了しました"
|
||||
}
|
||||
|
|
|
@ -124,5 +124,16 @@
|
|||
"{{name}} is talking…": "{{name}} mówi…",
|
||||
"{{name}} is presenting": "{{name}} prezentuje",
|
||||
"{{displayName}}, your call is now ended": "{{displayName}}, twoje połączenie zostało zakończone",
|
||||
"{{count}} people connected|one": "{{count}} osoba połączona"
|
||||
"{{count}} people connected|one": "{{count}} osoba połączona",
|
||||
"Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Czy włączyć skróty klawiszowe pojedynczych klawiszy, np. 'm' aby wyciszyć/załączyć mikrofon.",
|
||||
"This feature is only supported on Firefox.": "Ta funkcjonalność jest dostępna tylko w Firefox.",
|
||||
"Single-key keyboard shortcuts": "Skróty klawiszowe (pojedyncze klawisze)",
|
||||
"Copy": "Kopiuj",
|
||||
"Allow analytics": "Zezwól na analitykę",
|
||||
"Advanced": "Zaawansowane",
|
||||
"<0>Submitting debug logs will help us track down the problem.</0>": "<0>Wysłanie logów debuggowania pomoże nam ustalić przyczynę problemu.</0>",
|
||||
"<0>Oops, something's gone wrong.</0>": "<0>Ojej, coś poszło nie tak.</0>",
|
||||
"<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Dołącz do rozmowy teraz</0><1>Or</1><2>Skopiuj link do rozmowy i dołącz później</2>",
|
||||
"{{name}} (Waiting for video...)": "{{name}} (Oczekiwanie na wideo...)",
|
||||
"{{name}} (Connecting...)": "{{name}} (Łączenie...)"
|
||||
}
|
||||
|
|
|
@ -132,6 +132,12 @@
|
|||
"Copy": "Копировать",
|
||||
"Allow analytics": "Разрешить аналитику",
|
||||
"Advanced": "Расширенные",
|
||||
"<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Присоединиться сейчас</0><1>или<1><2>Скопировать ссылку на звонок и присоединиться позже</2>",
|
||||
"{{name}} (Connecting...)": "{{name}} (Соединение...)"
|
||||
"<0>Join call now</0><1>Or</1><2>Copy call link and join later</2>": "<0>Присоединиться сейчас</0><1>или<1><2>cкопировать ссылку на звонок и присоединиться позже</2>",
|
||||
"{{name}} (Connecting...)": "{{name}} (Соединение...)",
|
||||
"Whether to enable single-key keyboard shortcuts, e.g. 'm' to mute/unmute the mic.": "Включить горячие клавиши, например 'm' чтобы отключить/включить микрофон.",
|
||||
"This feature is only supported on Firefox.": "Эта возможность доступна только в Firefox.",
|
||||
"Single-key keyboard shortcuts": "Горячие клавиши",
|
||||
"<0>Submitting debug logs will help us track down the problem.</0>": "<0>Отправка журналов поможет нам найти и устранить проблему.</0>",
|
||||
"<0>Oops, something's gone wrong.</0>": "<0>Упс, что-то пошло не так.</0>",
|
||||
"{{name}} (Waiting for video...)": "{{name}} (Ожидание видео...)"
|
||||
}
|
||||
|
|
11
src/Menu.tsx
11
src/Menu.tsx
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
|||
limitations under the License.
|
||||
*/
|
||||
|
||||
import React, { Key, useRef, useState } from "react";
|
||||
import React, { Key, ReactNode, useRef, useState } from "react";
|
||||
import { AriaMenuOptions, useMenu, useMenuItem } from "@react-aria/menu";
|
||||
import { TreeState, useTreeState } from "@react-stately/tree";
|
||||
import { mergeProps } from "@react-aria/utils";
|
||||
|
@ -25,10 +25,11 @@ import { Node } from "@react-types/shared";
|
|||
import styles from "./Menu.module.css";
|
||||
|
||||
interface MenuProps<T> extends AriaMenuOptions<T> {
|
||||
className?: String;
|
||||
className?: string;
|
||||
onClose?: () => void;
|
||||
onAction: (value: Key) => void;
|
||||
label?: string;
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
export function Menu<T extends object>({
|
||||
|
@ -38,7 +39,11 @@ export function Menu<T extends object>({
|
|||
label,
|
||||
...rest
|
||||
}: MenuProps<T>) {
|
||||
const state = useTreeState<T>({ ...rest, selectionMode: "none" });
|
||||
const state = useTreeState<T>({
|
||||
...rest,
|
||||
selectionMode: "none",
|
||||
children: undefined,
|
||||
});
|
||||
const menuRef = useRef();
|
||||
const { menuProps } = useMenu<T>(rest, state, menuRef);
|
||||
|
||||
|
|
|
@ -32,13 +32,13 @@ import { useDialog } from "@react-aria/dialog";
|
|||
import { FocusScope } from "@react-aria/focus";
|
||||
import { ButtonAria, useButton } from "@react-aria/button";
|
||||
import classNames from "classnames";
|
||||
import { AriaDialogProps } from "@react-types/dialog";
|
||||
import { SpectrumDialogProps } from "@react-types/dialog";
|
||||
import { useTranslation } from "react-i18next";
|
||||
|
||||
import { ReactComponent as CloseIcon } from "./icons/Close.svg";
|
||||
import styles from "./Modal.module.css";
|
||||
|
||||
export interface ModalProps extends OverlayProps, AriaDialogProps {
|
||||
export interface ModalProps extends OverlayProps, SpectrumDialogProps {
|
||||
title: string;
|
||||
children: ReactNode;
|
||||
className?: string;
|
||||
|
|
|
@ -30,5 +30,5 @@ export function PTTFeed({
|
|||
}) {
|
||||
const { isLocal, stream } = useCallFeed(callFeed);
|
||||
const mediaRef = useMediaStream(stream, audioOutputDevice, isLocal);
|
||||
return <audio ref={mediaRef} className={styles.audioFeed} playsInline />;
|
||||
return <audio ref={mediaRef} className={styles.audioFeed} />;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue