Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.d/3114-face-join-i18n.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The **Join by number or link** / **Start a face-to-face room** dialog now follows the window's language: the Bot picker, the six-digit field and its refusals, the link and scan rows, their status lines, and every invite and camera refusal a join can hit ([#3114](https://github.com/ThinkFlowLab/FlyBot/issues/3114)).
39 changes: 39 additions & 0 deletions core/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,45 @@ var ZH = {
"Room number {code}": "房间号码 {code}",
"QR code for room number {code}": "房间号码 {code} 的二维码",
"Scan this with FlyBot to join": "用 FlyBot 扫描加入",
// #3114 cut 24: the join/create a room dialog — the picker's name, the number field and its
// refusals, the link and scan rows, and the copy tables those rows read.
"Enter a 6-digit number.": "请输入 6 位数字。",
"Choose which of your Bots join.": "请选择用哪些 Bot 加入。",
"Joining with that link…": "正在用这条链接加入…",
"Looking up that room…": "正在查找那个房间…",
"This group is already in your sidebar.": "这个群已经在你的侧边栏里了。",
"Point the camera at a FlyBot room code.": "把镜头对准 FlyBot 房间码。",
"Scanned a group link.": "已扫描到群链接。",
"Scanned an invite link.": "已扫描到邀请链接。",
"Scanned {code}.": "已扫描到 {code}。",
"Scanned {code}. Pick a Bot to join.": "已扫描到 {code}。选一个 Bot 加入。",
"Loading your Bots…": "正在加载你的 Bot…",
"Waiting for {who} to let you in. If the group does not appear, press Join group to ask again.": "正在等 {who} 放你进去。如果群没有出现,再按一次「加入群」重新申请。",
"Asked to join {name}. It opens in your sidebar as soon as their FlyBot seats your Bots.": "已申请加入 {name}。对方的 FlyBot 放好你的 Bot 后,群会出现在你的侧边栏。",
"the group": "那个群",
"the group’s owner": "那个群的主人",
"A group on another FlyBot": "另一个 FlyBot 上的群",
"This FlyBot has not approved the request yet, so their group has not been asked.": "这个 FlyBot 还没批准这次申请,所以对方的群还没收到请求。",
"Their FlyBot was not asked. Check the link and try again.": "对方的 FlyBot 没有收到请求。检查链接后再试一次。",
"Could not join that room. Try another number.": "没能加入那个房间。换一个号码试试。",
"Could not join that room with that link.": "没能用那条链接加入那个房间。",
"Invites need a newer Bot Social. The 6-digit number still works.": "邀请需要更新版本的 Bot Social。6 位号码仍然可用。",
"That is not an invite link. It looks like https://…/r/…": "这不是邀请链接。它看起来像 https://…/r/…",
"That link has expired. Ask for a new one.": "这条链接已过期。向他们要一条新的。",
"That link was withdrawn. Ask for a new one.": "这条链接已被撤回。向他们要一条新的。",
"You already joined with that link using other Bots. Leave the group first to join with different ones.": "你已经用别的 Bot 通过这条链接加入过了。想换 Bot 请先退出那个群。",
"That link is for this FlyBot’s own room.": "这条链接是给这个 FlyBot 自己的房间用的。",
"Too many tries for now. Wait a minute and try again.": "尝试次数太多了。等一分钟再试。",
"That link does not open any room. Check that it was copied whole.": "这条链接打不开任何房间。检查一下是否复制完整。",
"Bot Social could not look up that link right now. Try again.": "Bot Social 现在查不了这条链接。请再试一次。",
"That link cannot seat these Bots. Ask for a new one.": "这条链接放不下这些 Bot。向他们要一条新的。",
"That room cannot take guests right now.": "那个房间现在不能接待访客。",
"This FlyBot has no Bot Social identity yet.": "这个 FlyBot 还没有 Bot Social 身份。",
"This browser cannot scan codes. Type the 6-digit number instead.": "这个浏览器不能扫码。请直接输入 6 位号码。",
"This browser cannot use a camera here. Type the 6-digit number instead.": "这个浏览器在这里用不了摄像头。请直接输入 6 位号码。",
"FlyBot cannot use the camera. Allow the camera for this page, or type the 6-digit number instead.": "FlyBot 用不了摄像头。给这个页面开放摄像头权限,或直接输入 6 位号码。",
"That is not a FlyBot room code. Ask for the 6-digit number instead.": "这不是 FlyBot 房间码。向他们要 6 位号码吧。",
"The camera stopped before it read a code. Type the 6-digit number instead.": "摄像头还没读到码就停了。请直接输入 6 位号码。",
"Share with a friend": "分享给朋友",
"One click shares {name} with someone you already know. No invite link. They can decline; you can Revoke in People with access.": "一键把 {name} 分享给你已经认识的人,不需要邀请链接。对方可以拒绝,你也可以在「可访问的人」里撤销。",
"Loading friends…": "正在加载朋友…",
Expand Down
39 changes: 39 additions & 0 deletions core/src/client/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,45 @@ const ZH = {
'Room number {code}': '房间号码 {code}',
'QR code for room number {code}': '房间号码 {code} 的二维码',
'Scan this with FlyBot to join': '用 FlyBot 扫描加入',
// #3114 cut 24: the join/create a room dialog — the picker's name, the number field and its
// refusals, the link and scan rows, and the copy tables those rows read.
'Enter a 6-digit number.': '请输入 6 位数字。',
'Choose which of your Bots join.': '请选择用哪些 Bot 加入。',
'Joining with that link…': '正在用这条链接加入…',
'Looking up that room…': '正在查找那个房间…',
'This group is already in your sidebar.': '这个群已经在你的侧边栏里了。',
'Point the camera at a FlyBot room code.': '把镜头对准 FlyBot 房间码。',
'Scanned a group link.': '已扫描到群链接。',
'Scanned an invite link.': '已扫描到邀请链接。',
'Scanned {code}.': '已扫描到 {code}。',
'Scanned {code}. Pick a Bot to join.': '已扫描到 {code}。选一个 Bot 加入。',
'Loading your Bots…': '正在加载你的 Bot…',
'Waiting for {who} to let you in. If the group does not appear, press Join group to ask again.': '正在等 {who} 放你进去。如果群没有出现,再按一次「加入群」重新申请。',
'Asked to join {name}. It opens in your sidebar as soon as their FlyBot seats your Bots.': '已申请加入 {name}。对方的 FlyBot 放好你的 Bot 后,群会出现在你的侧边栏。',
'the group': '那个群',
'the group’s owner': '那个群的主人',
'A group on another FlyBot': '另一个 FlyBot 上的群',
'This FlyBot has not approved the request yet, so their group has not been asked.': '这个 FlyBot 还没批准这次申请,所以对方的群还没收到请求。',
'Their FlyBot was not asked. Check the link and try again.': '对方的 FlyBot 没有收到请求。检查链接后再试一次。',
'Could not join that room. Try another number.': '没能加入那个房间。换一个号码试试。',
'Could not join that room with that link.': '没能用那条链接加入那个房间。',
'Invites need a newer Bot Social. The 6-digit number still works.': '邀请需要更新版本的 Bot Social。6 位号码仍然可用。',
'That is not an invite link. It looks like https://…/r/…': '这不是邀请链接。它看起来像 https://…/r/…',
'That link has expired. Ask for a new one.': '这条链接已过期。向他们要一条新的。',
'That link was withdrawn. Ask for a new one.': '这条链接已被撤回。向他们要一条新的。',
'You already joined with that link using other Bots. Leave the group first to join with different ones.': '你已经用别的 Bot 通过这条链接加入过了。想换 Bot 请先退出那个群。',
'That link is for this FlyBot’s own room.': '这条链接是给这个 FlyBot 自己的房间用的。',
'Too many tries for now. Wait a minute and try again.': '尝试次数太多了。等一分钟再试。',
'That link does not open any room. Check that it was copied whole.': '这条链接打不开任何房间。检查一下是否复制完整。',
'Bot Social could not look up that link right now. Try again.': 'Bot Social 现在查不了这条链接。请再试一次。',
'That link cannot seat these Bots. Ask for a new one.': '这条链接放不下这些 Bot。向他们要一条新的。',
'That room cannot take guests right now.': '那个房间现在不能接待访客。',
'This FlyBot has no Bot Social identity yet.': '这个 FlyBot 还没有 Bot Social 身份。',
'This browser cannot scan codes. Type the 6-digit number instead.': '这个浏览器不能扫码。请直接输入 6 位号码。',
'This browser cannot use a camera here. Type the 6-digit number instead.': '这个浏览器在这里用不了摄像头。请直接输入 6 位号码。',
'FlyBot cannot use the camera. Allow the camera for this page, or type the 6-digit number instead.': 'FlyBot 用不了摄像头。给这个页面开放摄像头权限,或直接输入 6 位号码。',
'That is not a FlyBot room code. Ask for the 6-digit number instead.': '这不是 FlyBot 房间码。向他们要 6 位号码吧。',
'The camera stopped before it read a code. Type the 6-digit number instead.': '摄像头还没读到码就停了。请直接输入 6 位号码。',
'Share with a friend': '分享给朋友',
'One click shares {name} with someone you already know. No invite link. They can decline; you can Revoke in People with access.': '一键把 {name} 分享给你已经认识的人,不需要邀请链接。对方可以拒绝,你也可以在「可访问的人」里撤销。',
'Loading friends…': '正在加载朋友…',
Expand Down
31 changes: 0 additions & 31 deletions core/test/i18n-missing-entries.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,51 +3,20 @@
"entries": [
"plugins/social/client.js: +{} more",
"plugins/social/client.js:Anyone with the link can join while the room is open.",
"plugins/social/client.js:Bot Social could not look up that link right now. Try again.",
"plugins/social/client.js:Chat paused",
"plugins/social/client.js:Choose which of your Bots join.",
"plugins/social/client.js:Could not reach FlyBot. Check that it is still running.",
"plugins/social/client.js:Enter a 6-digit number.",
"plugins/social/client.js:FlyBot cannot use the camera. Allow the camera for this page, or type the 6-digit number instead.",
"plugins/social/client.js:In use in {} room{}: ",
"plugins/social/client.js:Invites need a newer Bot Social. The 6-digit number still works.#1",
"plugins/social/client.js:Invites need a newer Bot Social. The 6-digit number still works.#2",
"plugins/social/client.js:Invites need a newer Bot Social. The 6-digit number still works.#3",
"plugins/social/client.js:Joining with that link…#1",
"plugins/social/client.js:Joining with that link…#2",
"plugins/social/client.js:Link ready",
"plugins/social/client.js:Loading your Bots…",
"plugins/social/client.js:Looking up that room…#1",
"plugins/social/client.js:Looking up that room…#2",
"plugins/social/client.js:Past rooms",
"plugins/social/client.js:Point the camera at a FlyBot room code.",
"plugins/social/client.js:QR code for this room invite",
"plugins/social/client.js:Remove this Bot from Friends' Bots and from your groups. This does not unfriend the owner.",
"plugins/social/client.js:Scan to open this room",
"plugins/social/client.js:Scanned a group link.",
"plugins/social/client.js:Scanned an invite link.",
"plugins/social/client.js:Social is not running: the plugin did not start. See Settings → Feedback.",
"plugins/social/client.js:Social#1",
"plugins/social/client.js:Social#2",
"plugins/social/client.js:That is not a FlyBot room code. Ask for the 6-digit number instead.",
"plugins/social/client.js:That is not an invite link. It looks like https://…/r/…",
"plugins/social/client.js:That link cannot seat these Bots. Ask for a new one.",
"plugins/social/client.js:That link does not open any room. Check that it was copied whole.",
"plugins/social/client.js:That link has expired. Ask for a new one.",
"plugins/social/client.js:That link is for this FlyBot’s own room.",
"plugins/social/client.js:That link was withdrawn. Ask for a new one.",
"plugins/social/client.js:That room cannot take guests right now.",
"plugins/social/client.js:The FlyBot host did not answer (HTTP {}). Reload the page; if this keeps happening, restart FlyBot web.",
"plugins/social/client.js:The camera stopped before it read a code. Type the 6-digit number instead.",
"plugins/social/client.js:This FlyBot has no Bot Social identity yet.",
"plugins/social/client.js:This browser cannot scan codes. Type the 6-digit number instead.",
"plugins/social/client.js:This browser cannot use a camera here. Type the 6-digit number instead.",
"plugins/social/client.js:This group is already in your sidebar.",
"plugins/social/client.js:This invite was already used. Ask your friend for a new one.",
"plugins/social/client.js:This room only: ",
"plugins/social/client.js:Too many tries for now. Wait a minute and try again.",
"plugins/social/client.js:You already joined with that link using other Bots. Leave the group first to join with different ones.",
"plugins/social/client.js:the group",
"plugins/social/client.js:the room",
"plugins/timeline/client.js:Communication map: who sent requests to whom",
"plugins/timeline/client.js:Copy report",
Expand Down
4 changes: 2 additions & 2 deletions core/test/i18n-missing-entries.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ test('the scan counts copy tables and copy props, not data', () => {
"const REFUSAL_COPY = { expired: 'Too late.', busy: 'Wait a moment.' }",
"const STATE_TEXT = { connected: t => t('Connected') }",
"const INVITE_UNSUPPORTED = 'Invites need a newer Bot Social.'",
"setStatus({ tone: 'error', text: 'Enter a 6-digit number.' })",
"setStatus({ tone: 'error', text: 'Type the 6-digit number.' })",
"setInvite({ status: { tone: 'error', text: INVITE_UNSUPPORTED } })",
"h('div', { className: 'fs-status', role: status === 'done' ? 'status' : 'note' }, tr('Member'))",
"h(QrImage, { text: qrText, kind: 'face-qr', label: 'QR code for this room', hint: 'Scan this to join' })",
Expand All @@ -72,7 +72,7 @@ test('the scan counts copy tables and copy props, not data', () => {
assert.deepEqual(missingCopy(source, 'plugins/sample/client.js').map(entry => entry.key), [
'Too late.',
'Wait a moment.',
'Enter a 6-digit number.',
'Type the 6-digit number.',
'Invites need a newer Bot Social.',
'QR code for this room',
'Scan this to join',
Expand Down
1 change: 0 additions & 1 deletion core/test/i18n-plugins.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"plugins/social/client.js:Copied#2",
"plugins/social/client.js:Copy",
"plugins/social/client.js:Your Bot Social handle",
"plugins/social/client.js:Your Bots",
"plugins/timeline/client.js:Close",
"plugins/timeline/client.js:Copied",
"plugins/timeline/client.js:Copying…",
Expand Down
4 changes: 0 additions & 4 deletions core/test/i18n-template-draws.baseline.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
{
"version": 1,
"entries": [
"plugins/social/client.js:Asked to join {}. It opens in your sidebar as soon as their FlyBot seats your Bots.",
"plugins/social/client.js:Auto-send {} → room",
"plugins/social/client.js:Auto-send {}'s room messages",
"plugins/social/client.js:Invite grants {} only.",
"plugins/social/client.js:Invite grants {} only. Revoke anytime in People with access.",
"plugins/social/client.js:Scanned {}.",
"plugins/social/client.js:Scanned {}. Pick a Bot to join.",
"plugins/social/client.js:Waiting for {} to let you in. If the group does not appear, press Join group to ask again.",
"plugins/social/client.js:{} Send your message again: it starts a new chat.",
"plugins/timeline/client.js:Could not copy the report: {}",
"plugins/timeline/client.js:Last {}",
Expand Down
Loading
Loading