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/3215-sharing-page-i18n.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A Bot's Sharing page now reads in the window's language: the People-with-access card and the share-with-a-friend card stop drawing bare English in a Chinese window ([#3215](https://github.com/ThinkFlowLab/FlyBot/issues/3215)).
25 changes: 25 additions & 0 deletions core/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,31 @@ var ZH = {
"outside the tree": "不在树中",
Undo: "撤销",
"no longer shared": "已不再共享",
// #3114 cut 20: a Bot's Sharing page — the People-with-access card, its Auto-send switch and
// inline revoke question, and the share-with-a-friend card.
"One row per Bot. Default: nobody, Chief included.": "每行一个 Bot。默认谁都没有,包括 Chief。",
"One row per Bot. Revoke one without affecting the rest. Default: nobody, Chief included.": "每行一个 Bot。撤销其中一个不影响其他。默认谁都没有,包括 Chief。",
"Nobody has this Bot yet. Copy an invite link above and send it to a friend.": "还没有人拿到这个 Bot。复制上面的邀请链接发给朋友。",
"Auto-send": "自动发送",
"Auto-send on": "自动发送已开",
"Auto-send off": "自动发送已关",
"Auto-send {name} → {who}": "{name} 发给 {who} 的消息自动发送",
"{name}’s replies to {who} go out without asking you first.": "{name} 发给 {who} 的回复不再先问你。",
Revoke: "撤销授权",
"Revoke {name}": "撤销 {name} 的授权",
"Revoking…": "正在撤销…",
"Revoke {who}? They lose this Bot.": "撤销 {who} 的授权?对方将失去这个 Bot。",
"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": "这个人",
"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…": "正在加载朋友…",
"No friends left to share with. Invite someone new above, or they already have this Bot.": "没有可分享的朋友了。在上面邀请新朋友,或者他们已经拿到了这个 Bot。",
Share: "分享",
"Share {name} with {who}": "把 {name} 分享给 {who}",
"Sharing…": "正在分享…",
"That Bot was removed from that home.": "那个 Bot 已从对方那里移除。",
"Messages waiting for your approval": "等你批准的消息",
"Waiting for approval": "等待批准",
// #3032: the four approval-card controls that were still drawn as bare English.
Expand Down
25 changes: 25 additions & 0 deletions core/src/client/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,31 @@ const ZH = {
'outside the tree': '不在树中',
Undo: '撤销',
'no longer shared': '已不再共享',
// #3114 cut 20: a Bot's Sharing page — the People-with-access card, its Auto-send switch and
// inline revoke question, and the share-with-a-friend card.
'One row per Bot. Default: nobody, Chief included.': '每行一个 Bot。默认谁都没有,包括 Chief。',
'One row per Bot. Revoke one without affecting the rest. Default: nobody, Chief included.': '每行一个 Bot。撤销其中一个不影响其他。默认谁都没有,包括 Chief。',
'Nobody has this Bot yet. Copy an invite link above and send it to a friend.': '还没有人拿到这个 Bot。复制上面的邀请链接发给朋友。',
'Auto-send': '自动发送',
'Auto-send on': '自动发送已开',
'Auto-send off': '自动发送已关',
'Auto-send {name} → {who}': '{name} 发给 {who} 的消息自动发送',
'{name}’s replies to {who} go out without asking you first.': '{name} 发给 {who} 的回复不再先问你。',
Revoke: '撤销授权',
'Revoke {name}': '撤销 {name} 的授权',
'Revoking…': '正在撤销…',
'Revoke {who}? They lose this Bot.': '撤销 {who} 的授权?对方将失去这个 Bot。',
'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': '这个人',
'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…': '正在加载朋友…',
'No friends left to share with. Invite someone new above, or they already have this Bot.': '没有可分享的朋友了。在上面邀请新朋友,或者他们已经拿到了这个 Bot。',
Share: '分享',
'Share {name} with {who}': '把 {name} 分享给 {who}',
'Sharing…': '正在分享…',
'That Bot was removed from that home.': '那个 Bot 已从对方那里移除。',
'Messages waiting for your approval': '等你批准的消息',
'Waiting for approval': '等待批准',
// #3032: the four approval-card controls that were still drawn as bare English.
Expand Down
16 changes: 0 additions & 16 deletions core/test/i18n-missing-entries.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"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:Auto-send",
"plugins/social/client.js:Auto-send off",
"plugins/social/client.js:Auto-send on",
"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 Down Expand Up @@ -37,13 +34,9 @@
"plugins/social/client.js:Leave#1",
"plugins/social/client.js:Leave#2",
"plugins/social/client.js:Link ready",
"plugins/social/client.js:Loading friends…",
"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:No friends left to share with. Invite someone new above, or they already have this Bot.",
"plugins/social/client.js:Nobody has this Bot yet. Copy an invite link above and send it to a friend.",
"plugins/social/client.js:One row per Bot. Default: nobody, Chief included.",
"plugins/social/client.js:Past rooms",
"plugins/social/client.js:Paste invite link or code",
"plugins/social/client.js:Point the camera at a FlyBot room code.",
Expand All @@ -54,27 +47,18 @@
"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:Revoke {}? They lose this Bot in {} room{}.",
"plugins/social/client.js:Revoke {}? They lose this Bot.",
"plugins/social/client.js:Revoke#1",
"plugins/social/client.js:Revoke#2",
"plugins/social/client.js:Revoking…",
"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:Share ",
"plugins/social/client.js:Share with a friend",
"plugins/social/client.js:Sharing…",
"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 Bot was removed from that home.",
"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.",
Expand Down
7 changes: 0 additions & 7 deletions core/test/i18n-template-draws.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,21 @@
"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 my Bots' replies to {}",
"plugins/social/client.js:Auto-send {} → room",
"plugins/social/client.js:Auto-send {} → {}",
"plugins/social/client.js:Auto-send {}'s room messages",
"plugins/social/client.js:Copy invite link for {}",
"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:One click shares {} with someone you already know. No invite link. They can decline; you can Revoke in People with access.",
"plugins/social/client.js:QR code for room number {}",
"plugins/social/client.js:Remove {} from your list? {}",
"plugins/social/client.js:Revoke {}#1",
"plugins/social/client.js:Revoke {}#2",
"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:Share {} with {}",
"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:You are {}",
"plugins/social/client.js:Your Bots' replies to {} go out without asking you first. What you type is not affected.",
"plugins/social/client.js:{} Send your message again: it starts a new chat.",
"plugins/social/client.js:{} failed: {}",
"plugins/social/client.js:{}'s replies to {} go out without asking you first.#1",
"plugins/social/client.js:{}'s replies to {} go out without asking you first.#2",
"plugins/timeline/client.js:Could not copy the report: {}",
"plugins/timeline/client.js:Last {}",
"plugins/timeline/client.js:Looking back: window ends at {}.",
Expand Down
27 changes: 26 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,107 @@ const ZH = {
@@ -41,22 +41,132 @@ const ZH = {
' and ': '、',
and: '和',
'{count} members': '{count} 位成员',
Expand Down Expand Up @@ -957,6 +957,31 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js
+ 'outside the tree': '不在树中',
+ Undo: '撤销',
+ 'no longer shared': '已不再共享',
+ // #3114 cut 20: a Bot's Sharing page — the People-with-access card, its Auto-send switch and
+ // inline revoke question, and the share-with-a-friend card.
+ 'One row per Bot. Default: nobody, Chief included.': '每行一个 Bot。默认谁都没有,包括 Chief。',
+ 'One row per Bot. Revoke one without affecting the rest. Default: nobody, Chief included.': '每行一个 Bot。撤销其中一个不影响其他。默认谁都没有,包括 Chief。',
+ 'Nobody has this Bot yet. Copy an invite link above and send it to a friend.': '还没有人拿到这个 Bot。复制上面的邀请链接发给朋友。',
+ 'Auto-send': '自动发送',
+ 'Auto-send on': '自动发送已开',
+ 'Auto-send off': '自动发送已关',
+ 'Auto-send {name} → {who}': '{name} 发给 {who} 的消息自动发送',
+ '{name}’s replies to {who} go out without asking you first.': '{name} 发给 {who} 的回复不再先问你。',
+ Revoke: '撤销授权',
+ 'Revoke {name}': '撤销 {name} 的授权',
+ 'Revoking…': '正在撤销…',
+ 'Revoke {who}? They lose this Bot.': '撤销 {who} 的授权?对方将失去这个 Bot。',
+ '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': '这个人',
+ '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…': '正在加载朋友…',
+ 'No friends left to share with. Invite someone new above, or they already have this Bot.': '没有可分享的朋友了。在上面邀请新朋友,或者他们已经拿到了这个 Bot。',
+ Share: '分享',
+ 'Share {name} with {who}': '把 {name} 分享给 {who}',
+ 'Sharing…': '正在分享…',
+ 'That Bot was removed from that home.': '那个 Bot 已从对方那里移除。',
+ 'Messages waiting for your approval': '等你批准的消息',
+ 'Waiting for approval': '等待批准',
+ // #3032: the four approval-card controls that were still drawn as bare English.
Expand Down
27 changes: 26 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,106 @@ var ZH = {
@@ -78,21 +78,131 @@ var ZH = {
" and ": "、",
and: "和",
"{count} members": "{count} 位成员",
Expand Down Expand Up @@ -221,6 +221,31 @@ diff --git a/client.js b/client.js
+ "outside the tree": "不在树中",
+ Undo: "撤销",
+ "no longer shared": "已不再共享",
+ // #3114 cut 20: a Bot's Sharing page — the People-with-access card, its Auto-send switch and
+ // inline revoke question, and the share-with-a-friend card.
+ "One row per Bot. Default: nobody, Chief included.": "每行一个 Bot。默认谁都没有,包括 Chief。",
+ "One row per Bot. Revoke one without affecting the rest. Default: nobody, Chief included.": "每行一个 Bot。撤销其中一个不影响其他。默认谁都没有,包括 Chief。",
+ "Nobody has this Bot yet. Copy an invite link above and send it to a friend.": "还没有人拿到这个 Bot。复制上面的邀请链接发给朋友。",
+ "Auto-send": "自动发送",
+ "Auto-send on": "自动发送已开",
+ "Auto-send off": "自动发送已关",
+ "Auto-send {name} → {who}": "{name} 发给 {who} 的消息自动发送",
+ "{name}’s replies to {who} go out without asking you first.": "{name} 发给 {who} 的回复不再先问你。",
+ Revoke: "撤销授权",
+ "Revoke {name}": "撤销 {name} 的授权",
+ "Revoking…": "正在撤销…",
+ "Revoke {who}? They lose this Bot.": "撤销 {who} 的授权?对方将失去这个 Bot。",
+ "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": "这个人",
+ "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…": "正在加载朋友…",
+ "No friends left to share with. Invite someone new above, or they already have this Bot.": "没有可分享的朋友了。在上面邀请新朋友,或者他们已经拿到了这个 Bot。",
+ Share: "分享",
+ "Share {name} with {who}": "把 {name} 分享给 {who}",
+ "Sharing…": "正在分享…",
+ "That Bot was removed from that home.": "那个 Bot 已从对方那里移除。",
+ "Messages waiting for your approval": "等你批准的消息",
+ "Waiting for approval": "等待批准",
+ // #3032: the four approval-card controls that were still drawn as bare English.
Expand Down
16 changes: 0 additions & 16 deletions patches/ds-bot/files/test/i18n-missing-entries.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
"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:Auto-send",
"plugins/social/client.js:Auto-send off",
"plugins/social/client.js:Auto-send on",
"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 Down Expand Up @@ -37,13 +34,9 @@
"plugins/social/client.js:Leave#1",
"plugins/social/client.js:Leave#2",
"plugins/social/client.js:Link ready",
"plugins/social/client.js:Loading friends…",
"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:No friends left to share with. Invite someone new above, or they already have this Bot.",
"plugins/social/client.js:Nobody has this Bot yet. Copy an invite link above and send it to a friend.",
"plugins/social/client.js:One row per Bot. Default: nobody, Chief included.",
"plugins/social/client.js:Past rooms",
"plugins/social/client.js:Paste invite link or code",
"plugins/social/client.js:Point the camera at a FlyBot room code.",
Expand All @@ -54,27 +47,18 @@
"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:Revoke {}? They lose this Bot in {} room{}.",
"plugins/social/client.js:Revoke {}? They lose this Bot.",
"plugins/social/client.js:Revoke#1",
"plugins/social/client.js:Revoke#2",
"plugins/social/client.js:Revoking…",
"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:Share ",
"plugins/social/client.js:Share with a friend",
"plugins/social/client.js:Sharing…",
"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 Bot was removed from that home.",
"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.",
Expand Down
Loading
Loading