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/3220-add-friend-zh.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The Add friend panel now reads in the window's language: its headings, the invite paste box, both Bot pickers and the Copy link / Copy with instructions / New link controls no longer draw bare English in a Chinese window ([#3114](https://github.com/ThinkFlowLab/FlyBot/issues/3114)).
28 changes: 27 additions & 1 deletion core/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,33 @@ var HOST_ZH = {
"This DeepSeek Harness has no folder chooser": "这个 DeepSeek Harness 没有文件夹选择窗口",
"This DeepSeek Harness cannot list folders": "这个 DeepSeek Harness 不能列出文件夹",
"No FlyBot core update is available": "没有可用的 FlyBot 核心更新",
"saved by a newer FlyBot; update FlyBot": "由更新的 FlyBot 保存;请更新 FlyBot"
"saved by a newer FlyBot; update FlyBot": "由更新的 FlyBot 保存;请更新 FlyBot",
// #3114 cut 22: the Add friend panel — both headings, the paste box, both Bot pickers, the invite controls.
"Accept an invite": "接受邀请",
"Invite a friend": "邀请朋友",
"Paste invite link or code": "粘贴邀请链接或邀请码",
"Invite link or code": "邀请链接或邀请码",
"Talk through ": "通过",
"Which of your Bots talks": "哪个 Bot 替你说话",
"Talks for you. Not shared: your friend can't use it unless you invite them to it.": "这个 Bot 替你说话,不会被共享;除非你邀请,否则你的朋友用不了它。",
"Share ": "分享",
"Which of your Bots to share": "分享哪个 Bot",
"Your friend gets this Bot only.": "你的朋友只会拿到这个 Bot。",
"You are {me}": "你是 {me}",
"Copy invite link for {bot}": "复制给 {bot} 的邀请链接",
"Invite link for {bot}": "{bot} 的邀请链接",
"Copy with instructions": "连说明一起复制",
"Invite for {bot} copied with instructions.": "{bot} 的邀请已复制(含说明)。",
"Invite link for {bot} copied.": "{bot} 的邀请链接已复制。",
"Could not copy. Select the link and copy it by hand.": "复制失败。请选中链接手动复制。",
"{bots} {verb} back in your list.": "{bots} 又回到了你的列表里。",
"{who} shared {bot} with you.{note}": "{who} 把 {bot} 分享给了你。{note}",
"Joined {who}'s invite, but their Bot hasn't loaded yet. It shows in your list when it does; if not, accept the link again.{note}": "你已加入 {who} 的邀请,但对方的 Bot 还没加载出来。加载后它会出现在你的列表里;如果没有,请重新接受这个链接。{note}",
"Request sent to {who}. They show up here once they accept.": "已向 {who} 发出请求。对方接受后会出现在这里。",
"{name} is now a friend.": "{name} 现在成了你的朋友。",
"Declined {name}.": "已拒绝 {name}。",
"{what} failed: {why}": "{what} 失败:{why}",
"Your friend": "你的朋友"
};
Object.assign(ZH, HOST_ZH);
var fill = (text2, params) => params ? text2.replace(/\{(\w+)\}/g, (match, name) => name in params ? String(params[name]) : match) : text2;
Expand Down
26 changes: 26 additions & 0 deletions core/src/client/i18n.js
Original file line number Diff line number Diff line change
Expand Up @@ -1702,6 +1702,32 @@ const HOST_ZH = {
'This DeepSeek Harness cannot list folders': '这个 DeepSeek Harness 不能列出文件夹',
'No FlyBot core update is available': '没有可用的 FlyBot 核心更新',
'saved by a newer FlyBot; update FlyBot': '由更新的 FlyBot 保存;请更新 FlyBot',
// #3114 cut 22: the Add friend panel — both headings, the paste box, both Bot pickers, the invite controls.
'Accept an invite': '接受邀请',
'Invite a friend': '邀请朋友',
'Paste invite link or code': '粘贴邀请链接或邀请码',
'Invite link or code': '邀请链接或邀请码',
'Talk through ': '通过',
'Which of your Bots talks': '哪个 Bot 替你说话',
"Talks for you. Not shared: your friend can't use it unless you invite them to it.": '这个 Bot 替你说话,不会被共享;除非你邀请,否则你的朋友用不了它。',
'Share ': '分享',
'Which of your Bots to share': '分享哪个 Bot',
'Your friend gets this Bot only.': '你的朋友只会拿到这个 Bot。',
'You are {me}': '你是 {me}',
'Copy invite link for {bot}': '复制给 {bot} 的邀请链接',
'Invite link for {bot}': '{bot} 的邀请链接',
'Copy with instructions': '连说明一起复制',
'Invite for {bot} copied with instructions.': '{bot} 的邀请已复制(含说明)。',
'Invite link for {bot} copied.': '{bot} 的邀请链接已复制。',
'Could not copy. Select the link and copy it by hand.': '复制失败。请选中链接手动复制。',
'{bots} {verb} back in your list.': '{bots} 又回到了你的列表里。',
'{who} shared {bot} with you.{note}': '{who} 把 {bot} 分享给了你。{note}',
"Joined {who}'s invite, but their Bot hasn't loaded yet. It shows in your list when it does; if not, accept the link again.{note}": '你已加入 {who} 的邀请,但对方的 Bot 还没加载出来。加载后它会出现在你的列表里;如果没有,请重新接受这个链接。{note}',
'Request sent to {who}. They show up here once they accept.': '已向 {who} 发出请求。对方接受后会出现在这里。',
'{name} is now a friend.': '{name} 现在成了你的朋友。',
'Declined {name}.': '已拒绝 {name}。',
'{what} failed: {why}': '{what} 失败:{why}',
'Your friend': '你的朋友',
}
Object.assign(ZH, HOST_ZH)

Expand Down
21 changes: 0 additions & 21 deletions core/test/i18n-missing-entries.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,39 @@
"version": 1,
"entries": [
"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: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:Copy with instructions",
"plugins/social/client.js:Could not copy. Select the link and copy it by hand.#1",
"plugins/social/client.js:Could not copy. Select the link and copy it by hand.#2",
"plugins/social/client.js:Could not reach FlyBot. Check that it is still running.",
"plugins/social/client.js:Declined {}.",
"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: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",
"plugins/social/client.js:Invite for {} copied with instructions.",
"plugins/social/client.js:Invite link for {} copied.",
"plugins/social/client.js:Invite link or code",
"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: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: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:Paste invite link or code",
"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:Remove this Bot from your list and from your groups. This does not unfriend the owner.",
"plugins/social/client.js:Remove this Bot#1",
"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: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: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.",
"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 All @@ -67,17 +52,11 @@
"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:Which of your Bots talks",
"plugins/social/client.js:Which of your Bots to share",
"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:the group",
"plugins/social/client.js:the room",
"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 {}.",
"plugins/social/client.js:{} {} back in your list.",
"plugins/timeline/client.js:Communication map: who sent requests to whom",
"plugins/timeline/client.js:Copy report",
"plugins/timeline/client.js:Copy this window as a Markdown 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 @@ -82,7 +82,7 @@ test('the scan counts copy tables and copy props, not data', () => {
test('the widened scan names every copy attribute and skips placeholder examples', () => {
const source = [
"h(Button, { title: 'Archive this room', 'aria-label': 'Archive this room' })",
"h('input', { placeholder: 'Paste invite link or code' })",
"h('input', { placeholder: 'Type a room name' })",
"h('input', { placeholder: 'https://social.example' })",
"h('input', { placeholder: 'github, composio' })",
"h(Picture, { alt: 'A picture of the room' })",
Expand All @@ -93,7 +93,7 @@ test('the widened scan names every copy attribute and skips placeholder examples
assert.deepEqual(keys, [
'Archive this room',
'Archive this room',
'Paste invite link or code',
'Type a room name',
'A picture of the room',
'Type a name',
'Explains the row',
Expand Down
2 changes: 0 additions & 2 deletions core/test/i18n-plugins.baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
"plugins/social/client.js:Copied#1",
"plugins/social/client.js:Copied#2",
"plugins/social/client.js:Copy",
"plugins/social/client.js:Copy link",
"plugins/social/client.js:New link",
"plugins/social/client.js:Your Bot Social handle",
"plugins/social/client.js:Your Bots",
"plugins/timeline/client.js:Close",
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
Expand Up @@ -5,18 +5,14 @@
"plugins/social/client.js:Auto-send my Bots' replies to {}",
"plugins/social/client.js:Auto-send {} → room",
"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:Remove {} from your list? {}",
"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: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/timeline/client.js:Could not copy the report: {}",
"plugins/timeline/client.js:Last {}",
"plugins/timeline/client.js:Looking back: window ends at {}.",
Expand Down
28 changes: 27 additions & 1 deletion patches/ds-bot/0001-core-fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2005,12 +2005,38 @@ diff --git a/src/client/i18n.js b/src/client/i18n.js
'The admin must be a member of the group': '管理员必须是群成员',
'Unknown group chat': '找不到这个群聊',
'Hand the admin role to another member instead of leaving the group without one': '请把管理员交给其他成员,不要让群聊没有管理员',
@@ -905,6 +905,8 @@ const HOST_ZH = {
@@ -905,6 +905,34 @@ const HOST_ZH = {
'Write the entry to save.': '请写下要保存的内容。',
'This DeepSeek Harness has no folder chooser': '这个 DeepSeek Harness 没有文件夹选择窗口',
'This DeepSeek Harness cannot list folders': '这个 DeepSeek Harness 不能列出文件夹',
+ 'No FlyBot core update is available': '没有可用的 FlyBot 核心更新',
+ 'saved by a newer FlyBot; update FlyBot': '由更新的 FlyBot 保存;请更新 FlyBot',
+ // #3114 cut 22: the Add friend panel — both headings, the paste box, both Bot pickers, the invite controls.
+ 'Accept an invite': '接受邀请',
+ 'Invite a friend': '邀请朋友',
+ 'Paste invite link or code': '粘贴邀请链接或邀请码',
+ 'Invite link or code': '邀请链接或邀请码',
+ 'Talk through ': '通过',
+ 'Which of your Bots talks': '哪个 Bot 替你说话',
+ "Talks for you. Not shared: your friend can't use it unless you invite them to it.": '这个 Bot 替你说话,不会被共享;除非你邀请,否则你的朋友用不了它。',
+ 'Share ': '分享',
+ 'Which of your Bots to share': '分享哪个 Bot',
+ 'Your friend gets this Bot only.': '你的朋友只会拿到这个 Bot。',
+ 'You are {me}': '你是 {me}',
+ 'Copy invite link for {bot}': '复制给 {bot} 的邀请链接',
+ 'Invite link for {bot}': '{bot} 的邀请链接',
+ 'Copy with instructions': '连说明一起复制',
+ 'Invite for {bot} copied with instructions.': '{bot} 的邀请已复制(含说明)。',
+ 'Invite link for {bot} copied.': '{bot} 的邀请链接已复制。',
+ 'Could not copy. Select the link and copy it by hand.': '复制失败。请选中链接手动复制。',
+ '{bots} {verb} back in your list.': '{bots} 又回到了你的列表里。',
+ '{who} shared {bot} with you.{note}': '{who} 把 {bot} 分享给了你。{note}',
+ "Joined {who}'s invite, but their Bot hasn't loaded yet. It shows in your list when it does; if not, accept the link again.{note}": '你已加入 {who} 的邀请,但对方的 Bot 还没加载出来。加载后它会出现在你的列表里;如果没有,请重新接受这个链接。{note}',
+ 'Request sent to {who}. They show up here once they accept.': '已向 {who} 发出请求。对方接受后会出现在这里。',
+ '{name} is now a friend.': '{name} 现在成了你的朋友。',
+ 'Declined {name}.': '已拒绝 {name}。',
+ '{what} failed: {why}': '{what} 失败:{why}',
+ 'Your friend': '你的朋友',
}
Object.assign(ZH, HOST_ZH)

Expand Down
30 changes: 28 additions & 2 deletions patches/ds-bot/0008-client-bundle.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1267,14 +1267,40 @@ diff --git a/client.js b/client.js
"The admin must be a member of the group": "管理员必须是群成员",
"Unknown group chat": "找不到这个群聊",
"Hand the admin role to another member instead of leaving the group without one": "请把管理员交给其他成员,不要让群聊没有管理员",
@@ -951,10 +951,12 @@ var HOST_ZH = {
@@ -951,10 +951,38 @@ var HOST_ZH = {
"The model wrote nothing": "模型没有输出内容",
"Write the entry to save.": "请写下要保存的内容。",
"This DeepSeek Harness has no folder chooser": "这个 DeepSeek Harness 没有文件夹选择窗口",
- "This DeepSeek Harness cannot list folders": "这个 DeepSeek Harness 不能列出文件夹"
+ "This DeepSeek Harness cannot list folders": "这个 DeepSeek Harness 不能列出文件夹",
+ "No FlyBot core update is available": "没有可用的 FlyBot 核心更新",
+ "saved by a newer FlyBot; update FlyBot": "由更新的 FlyBot 保存;请更新 FlyBot"
+ "saved by a newer FlyBot; update FlyBot": "由更新的 FlyBot 保存;请更新 FlyBot",
+ // #3114 cut 22: the Add friend panel — both headings, the paste box, both Bot pickers, the invite controls.
+ "Accept an invite": "接受邀请",
+ "Invite a friend": "邀请朋友",
+ "Paste invite link or code": "粘贴邀请链接或邀请码",
+ "Invite link or code": "邀请链接或邀请码",
+ "Talk through ": "通过",
+ "Which of your Bots talks": "哪个 Bot 替你说话",
+ "Talks for you. Not shared: your friend can't use it unless you invite them to it.": "这个 Bot 替你说话,不会被共享;除非你邀请,否则你的朋友用不了它。",
+ "Share ": "分享",
+ "Which of your Bots to share": "分享哪个 Bot",
+ "Your friend gets this Bot only.": "你的朋友只会拿到这个 Bot。",
+ "You are {me}": "你是 {me}",
+ "Copy invite link for {bot}": "复制给 {bot} 的邀请链接",
+ "Invite link for {bot}": "{bot} 的邀请链接",
+ "Copy with instructions": "连说明一起复制",
+ "Invite for {bot} copied with instructions.": "{bot} 的邀请已复制(含说明)。",
+ "Invite link for {bot} copied.": "{bot} 的邀请链接已复制。",
+ "Could not copy. Select the link and copy it by hand.": "复制失败。请选中链接手动复制。",
+ "{bots} {verb} back in your list.": "{bots} 又回到了你的列表里。",
+ "{who} shared {bot} with you.{note}": "{who} 把 {bot} 分享给了你。{note}",
+ "Joined {who}'s invite, but their Bot hasn't loaded yet. It shows in your list when it does; if not, accept the link again.{note}": "你已加入 {who} 的邀请,但对方的 Bot 还没加载出来。加载后它会出现在你的列表里;如果没有,请重新接受这个链接。{note}",
+ "Request sent to {who}. They show up here once they accept.": "已向 {who} 发出请求。对方接受后会出现在这里。",
+ "{name} is now a friend.": "{name} 现在成了你的朋友。",
+ "Declined {name}.": "已拒绝 {name}。",
+ "{what} failed: {why}": "{what} 失败:{why}",
+ "Your friend": "你的朋友"
};
Object.assign(ZH, HOST_ZH);
-var fill = (text, params) => params ? text.replace(/\{(\w+)\}/g, (match, name) => name in params ? String(params[name]) : match) : text;
Expand Down
Loading
Loading