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/3219-face-waiting-room-zh.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A face-to-face waiting room now reads in the window's language: its number, QR hint, roster heading, Enter chat and Leave question no longer draw bare English in a Chinese window.
15 changes: 15 additions & 0 deletions core/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,21 @@ var ZH = {
"Revoke {who}? They lose this Bot in {n} room.": "撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。",
"Revoke {who}? They lose this Bot in {n} rooms.": "撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。",
"this person": "这个人",
// #3114 cut 21: the face-to-face waiting room — its number, QR hint, roster heading and alone
// line, Enter chat and the Leave question, which every window drew as bare English.
"Anyone with the number can still join.": "只要房间还开着,拿到号码的人都能加入。",
"The room is open. The number is no longer valid.": "房间已经开了,这个号码不再有效。",
"Who has joined": "谁已加入",
"Waiting for others to join…": "正在等其他人加入…",
"Enter chat": "进入聊天",
"Leave this room?": "离开这个房间?",
Leave: "离开",
Stay: "留下",
mine: "我的",
"Room number": "房间号码",
"Room number {code}": "房间号码 {code}",
"QR code for room number {code}": "房间号码 {code} 的二维码",
"Scan this with FlyBot to join": "用 FlyBot 扫描加入",
"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
15 changes: 15 additions & 0 deletions core/src/client/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,21 @@ const ZH = {
'Revoke {who}? They lose this Bot in {n} room.': '撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。',
'Revoke {who}? They lose this Bot in {n} rooms.': '撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。',
'this person': '这个人',
// #3114 cut 21: the face-to-face waiting room — its number, QR hint, roster heading and alone
// line, Enter chat and the Leave question, which every window drew as bare English.
'Anyone with the number can still join.': '只要房间还开着,拿到号码的人都能加入。',
'The room is open. The number is no longer valid.': '房间已经开了,这个号码不再有效。',
'Who has joined': '谁已加入',
'Waiting for others to join…': '正在等其他人加入…',
'Enter chat': '进入聊天',
'Leave this room?': '离开这个房间?',
Leave: '离开',
Stay: '留下',
mine: '我的',
'Room number': '房间号码',
'Room number {code}': '房间号码 {code}',
'QR code for room number {code}': '房间号码 {code} 的二维码',
'Scan this with FlyBot to join': '用 FlyBot 扫描加入',
'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
17 changes: 0 additions & 17 deletions core/test/i18n-missing-entries.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"plugins/social/client.js: +{} more",
"plugins/social/client.js:Accept an invite",
"plugins/social/client.js:Anyone with the link can join while the room is open.",
"plugins/social/client.js:Anyone with the number can still join.",
"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.",
Expand All @@ -16,8 +15,6 @@
"plugins/social/client.js:Don't ask each time.#1",
"plugins/social/client.js:Don't ask each time.#2",
"plugins/social/client.js:Enter a 6-digit number.",
"plugins/social/client.js:Enter chat#1",
"plugins/social/client.js:Enter chat#2",
"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:Invite a friend",
Expand All @@ -30,9 +27,6 @@
"plugins/social/client.js:Joined {}'s invite, but their Bot hasn't loaded yet. It shows in your list when it does; if not, accept the link again.{}",
"plugins/social/client.js:Joining with that link…#1",
"plugins/social/client.js:Joining with that link…#2",
"plugins/social/client.js:Leave this room?",
"plugins/social/client.js:Leave#1",
"plugins/social/client.js:Leave#2",
"plugins/social/client.js:Link ready",
"plugins/social/client.js:Loading your Bots…",
"plugins/social/client.js:Looking up that room…#1",
Expand All @@ -47,16 +41,13 @@
"plugins/social/client.js:Remove this Bot#2",
"plugins/social/client.js:Removing…",
"plugins/social/client.js:Request sent to {}. They show up here once they accept.",
"plugins/social/client.js:Room number",
"plugins/social/client.js:Scan this with FlyBot to join",
"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:Share ",
"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:Stay",
"plugins/social/client.js:Talk through ",
"plugins/social/client.js:Talks for you. Not shared: your friend can't use it unless you invite them to it.",
"plugins/social/client.js:That is not a FlyBot room code. Ask for the 6-digit number instead.",
Expand All @@ -69,28 +60,20 @@
"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:The room is open. The number is no longer valid.",
"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:Waiting for others to join…#1",
"plugins/social/client.js:Waiting for others to join…#2",
"plugins/social/client.js:Which of your Bots talks",
"plugins/social/client.js:Which of your Bots to share",
"plugins/social/client.js:Who has joined#1",
"plugins/social/client.js:Who has joined#2",
"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:Your friend gets this Bot only.",
"plugins/social/client.js:Your own Bots stay shared. {} can share it again.",
"plugins/social/client.js:mine#1",
"plugins/social/client.js:mine#2",
"plugins/social/client.js:the group",
"plugins/social/client.js:the room",
"plugins/social/client.js:{} (you)",
"plugins/social/client.js:{} is now a friend.",
"plugins/social/client.js:{} shared {} with you.{}",
"plugins/social/client.js:{} stays a friend: still shared through {}.",
Expand Down
2 changes: 0 additions & 2 deletions core/test/i18n-template-draws.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"plugins/social/client.js:Invite grants {} only.",
"plugins/social/client.js:Invite grants {} only. Revoke anytime in People with access.",
"plugins/social/client.js:Invite link for {}",
"plugins/social/client.js:QR code for room number {}",
"plugins/social/client.js:Remove {} from your list? {}",
"plugins/social/client.js:Room number {}",
"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.",
Expand Down
17 changes: 16 additions & 1 deletion patches/ds-bot/0001-core-fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js
Content: '内容',
'Referenced {labels}': '引用了 {labels}',
', ': '、',
@@ -41,22 +41,132 @@ const ZH = {
@@ -41,22 +41,147 @@ const ZH = {
' and ': '、',
and: '和',
'{count} members': '{count} 位成员',
Expand Down Expand Up @@ -974,6 +974,21 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js
+ 'Revoke {who}? They lose this Bot in {n} room.': '撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。',
+ 'Revoke {who}? They lose this Bot in {n} rooms.': '撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。',
+ 'this person': '这个人',
+ // #3114 cut 21: the face-to-face waiting room — its number, QR hint, roster heading and alone
+ // line, Enter chat and the Leave question, which every window drew as bare English.
+ 'Anyone with the number can still join.': '只要房间还开着,拿到号码的人都能加入。',
+ 'The room is open. The number is no longer valid.': '房间已经开了,这个号码不再有效。',
+ 'Who has joined': '谁已加入',
+ 'Waiting for others to join…': '正在等其他人加入…',
+ 'Enter chat': '进入聊天',
+ 'Leave this room?': '离开这个房间?',
+ Leave: '离开',
+ Stay: '留下',
+ mine: '我的',
+ 'Room number': '房间号码',
+ 'Room number {code}': '房间号码 {code}',
+ 'QR code for room number {code}': '房间号码 {code} 的二维码',
+ 'Scan this with FlyBot to join': '用 FlyBot 扫描加入',
+ '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
17 changes: 16 additions & 1 deletion patches/ds-bot/0008-client-bundle.patch
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ diff --git a/client.js b/client.js
Content: "内容",
"Referenced {labels}": "引用了 {labels}",
", ": "、",
@@ -78,21 +78,131 @@ var ZH = {
@@ -78,21 +78,146 @@ var ZH = {
" and ": "、",
and: "和",
"{count} members": "{count} 位成员",
Expand Down Expand Up @@ -238,6 +238,21 @@ diff --git a/client.js b/client.js
+ "Revoke {who}? They lose this Bot in {n} room.": "撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。",
+ "Revoke {who}? They lose this Bot in {n} rooms.": "撤销 {who} 的授权?对方将在 {n} 个房间里失去这个 Bot。",
+ "this person": "这个人",
+ // #3114 cut 21: the face-to-face waiting room — its number, QR hint, roster heading and alone
+ // line, Enter chat and the Leave question, which every window drew as bare English.
+ "Anyone with the number can still join.": "只要房间还开着,拿到号码的人都能加入。",
+ "The room is open. The number is no longer valid.": "房间已经开了,这个号码不再有效。",
+ "Who has joined": "谁已加入",
+ "Waiting for others to join…": "正在等其他人加入…",
+ "Enter chat": "进入聊天",
+ "Leave this room?": "离开这个房间?",
+ Leave: "离开",
+ Stay: "留下",
+ mine: "我的",
+ "Room number": "房间号码",
+ "Room number {code}": "房间号码 {code}",
+ "QR code for room number {code}": "房间号码 {code} 的二维码",
+ "Scan this with FlyBot to join": "用 FlyBot 扫描加入",
+ "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
17 changes: 0 additions & 17 deletions patches/ds-bot/files/test/i18n-missing-entries.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"plugins/social/client.js: +{} more",
"plugins/social/client.js:Accept an invite",
"plugins/social/client.js:Anyone with the link can join while the room is open.",
"plugins/social/client.js:Anyone with the number can still join.",
"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.",
Expand All @@ -16,8 +15,6 @@
"plugins/social/client.js:Don't ask each time.#1",
"plugins/social/client.js:Don't ask each time.#2",
"plugins/social/client.js:Enter a 6-digit number.",
"plugins/social/client.js:Enter chat#1",
"plugins/social/client.js:Enter chat#2",
"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:Invite a friend",
Expand All @@ -30,9 +27,6 @@
"plugins/social/client.js:Joined {}'s invite, but their Bot hasn't loaded yet. It shows in your list when it does; if not, accept the link again.{}",
"plugins/social/client.js:Joining with that link…#1",
"plugins/social/client.js:Joining with that link…#2",
"plugins/social/client.js:Leave this room?",
"plugins/social/client.js:Leave#1",
"plugins/social/client.js:Leave#2",
"plugins/social/client.js:Link ready",
"plugins/social/client.js:Loading your Bots…",
"plugins/social/client.js:Looking up that room…#1",
Expand All @@ -47,16 +41,13 @@
"plugins/social/client.js:Remove this Bot#2",
"plugins/social/client.js:Removing…",
"plugins/social/client.js:Request sent to {}. They show up here once they accept.",
"plugins/social/client.js:Room number",
"plugins/social/client.js:Scan this with FlyBot to join",
"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:Share ",
"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:Stay",
"plugins/social/client.js:Talk through ",
"plugins/social/client.js:Talks for you. Not shared: your friend can't use it unless you invite them to it.",
"plugins/social/client.js:That is not a FlyBot room code. Ask for the 6-digit number instead.",
Expand All @@ -69,28 +60,20 @@
"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:The room is open. The number is no longer valid.",
"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:Waiting for others to join…#1",
"plugins/social/client.js:Waiting for others to join…#2",
"plugins/social/client.js:Which of your Bots talks",
"plugins/social/client.js:Which of your Bots to share",
"plugins/social/client.js:Who has joined#1",
"plugins/social/client.js:Who has joined#2",
"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:Your friend gets this Bot only.",
"plugins/social/client.js:Your own Bots stay shared. {} can share it again.",
"plugins/social/client.js:mine#1",
"plugins/social/client.js:mine#2",
"plugins/social/client.js:the group",
"plugins/social/client.js:the room",
"plugins/social/client.js:{} (you)",
"plugins/social/client.js:{} is now a friend.",
"plugins/social/client.js:{} shared {} with you.{}",
"plugins/social/client.js:{} stays a friend: still shared through {}.",
Expand Down
2 changes: 0 additions & 2 deletions patches/ds-bot/files/test/i18n-template-draws.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"plugins/social/client.js:Invite grants {} only.",
"plugins/social/client.js:Invite grants {} only. Revoke anytime in People with access.",
"plugins/social/client.js:Invite link for {}",
"plugins/social/client.js:QR code for room number {}",
"plugins/social/client.js:Remove {} from your list? {}",
"plugins/social/client.js:Room number {}",
"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.",
Expand Down
Loading
Loading