Skip to content

Commit b6d3e96

Browse files
asjqkkkkasjqkkkk
committed
Merge branch 'main' into fix/launch_review
2 parents 0044b6f + 15b4d49 commit b6d3e96

File tree

7 files changed

+90
-18
lines changed

7 files changed

+90
-18
lines changed

‎frontend/appflowy_flutter/lib/mobile/presentation/base/mobile_view_page.dart‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,9 @@ class _MobileViewPageState extends State<MobileViewPage> {
293293
);
294294
}
295295

296+
final name =
297+
widget.fixedTitle ?? view?.nameOrDefault ?? widget.title ?? '';
298+
296299
return Opacity(
297300
opacity: value,
298301
child: Row(
@@ -306,7 +309,7 @@ class _MobileViewPageState extends State<MobileViewPage> {
306309
],
307310
Flexible(
308311
child: FlowyText.medium(
309-
widget.fixedTitle ?? view?.name ?? widget.title ?? ' ',
312+
name,
310313
fontSize: 15.0,
311314
overflow: TextOverflow.ellipsis,
312315
figmaLineHeight: 18.0,

‎frontend/appflowy_flutter/lib/mobile/presentation/home/space/mobile_space.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class MobileSpace extends StatelessWidget {
9898
Navigator.of(sheetContext).pop();
9999
context.read<SpaceBloc>().add(
100100
SpaceEvent.createPage(
101-
name: layout.defaultName,
101+
name: '',
102102
layout: layout,
103103
index: 0,
104104
openAfterCreate: true,

‎frontend/appflowy_flutter/lib/mobile/presentation/home/tab/mobile_space_tab.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import 'package:appflowy/workspace/application/menu/sidebar_sections_bloc.dart';
1111
import 'package:appflowy/workspace/application/sidebar/folder/folder_bloc.dart';
1212
import 'package:appflowy/workspace/application/sidebar/space/space_bloc.dart';
1313
import 'package:appflowy/workspace/application/user/user_workspace_bloc.dart';
14-
import 'package:appflowy/workspace/application/view/view_ext.dart';
1514
import 'package:appflowy_backend/log.dart';
1615
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
1716
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
@@ -193,7 +192,7 @@ class _MobileSpaceTabState extends State<MobileSpaceTab>
193192
if (context.read<SpaceBloc>().state.spaces.isNotEmpty) {
194193
context.read<SpaceBloc>().add(
195194
SpaceEvent.createPage(
196-
name: layout.defaultName,
195+
name: '',
197196
layout: layout,
198197
openAfterCreate: true,
199198
),
@@ -202,7 +201,7 @@ class _MobileSpaceTabState extends State<MobileSpaceTab>
202201
// only support create document in section
203202
context.read<SidebarSectionsBloc>().add(
204203
SidebarSectionsEvent.createRootViewInSection(
205-
name: layout.defaultName,
204+
name: '',
206205
index: 0,
207206
viewSection: FolderSpaceType.public.toViewSectionPB,
208207
),

‎frontend/appflowy_flutter/lib/shared/version_checker/version_checker.dart‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:appflowy/core/helpers/url_launcher.dart';
22
import 'package:appflowy/startup/tasks/device_info_task.dart';
3+
import 'package:appflowy_backend/log.dart';
34
import 'package:auto_updater/auto_updater.dart';
45
import 'package:collection/collection.dart';
56
import 'package:http/http.dart' as http;
@@ -32,13 +33,15 @@ class VersionChecker {
3233
/// Returns a list of [AppcastItem] or throws an exception if the feed URL is not set
3334
Future<AppcastItem?> checkForUpdateInformation() async {
3435
if (_feedUrl == null) {
35-
throw Exception('Feed URL not set. Call setFeedUrl() first.');
36+
Log.error('Feed URL is not set');
37+
return null;
3638
}
3739

3840
try {
3941
final response = await http.get(Uri.parse(_feedUrl!));
4042
if (response.statusCode != 200) {
41-
throw Exception('Failed to fetch appcast feed');
43+
Log.info('Failed to fetch appcast XML: ${response.statusCode}');
44+
return null;
4245
}
4346

4447
// Parse XML content
@@ -51,8 +54,10 @@ class VersionChecker {
5154
.nonNulls
5255
.firstWhereOrNull((e) => e.os == ApplicationInfo.os);
5356
} catch (e) {
54-
throw Exception('Error checking for updates: $e');
57+
Log.error('Failed to check for updates: $e');
5558
}
59+
60+
return null;
5661
}
5762

5863
/// For Windows and macOS, calling this API will trigger the auto updater to check for updates

‎frontend/resources/translations/de-DE.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -980,13 +980,13 @@
980980
"itemFour": "Gäste",
981981
"itemFive": "Speicher",
982982
"itemSix": "Zusammenarbeit in Echtzeit",
983+
"itemSeven": "Mobile App",
983984
"itemFileUpload": "Datei-Uploads",
984985
"customNamespace": "Benutzerdefinierter Namensraum",
985986
"tooltipSix": "Lebenslang bedeutet, dass die Anzahl der Antworten nie zurückgesetzt wird",
986987
"intelligentSearch": "Intelligente Suche",
987988
"tooltipSeven": "Ermöglicht dir, einen Teil der URL für deinen Arbeitsbereich anzupassen",
988989
"customNamespaceTooltip": "Benutzerdefinierte veröffentlichte Seiten-URL",
989-
"itemSeven": "Mobile App",
990990
"tooltipThree": "Gäste haben nur Leserechte für die speziell freigegebenen Inhalte",
991991
"tooltipFour": "Gäste werden als ein Sitzplatz abgerechnet",
992992
"itemEight": "AI-Antworten",
@@ -999,9 +999,9 @@
999999
"itemFour": "0",
10001000
"itemFive": "5 GB",
10011001
"itemSix": "10 Lebenszeiten",
1002+
"itemSeven": "ja",
10021003
"itemFileUpload": "Bis zu 7 MB",
10031004
"intelligentSearch": "Intelligente Suche",
1004-
"itemSeven": "ja",
10051005
"itemEight": "1.000 lebenslang"
10061006
},
10071007
"proLabels": {
@@ -1011,9 +1011,9 @@
10111011
"itemFour": "10 Gäste werden als ein Sitzplatz berechnet",
10121012
"itemFive": "unbegrenzt",
10131013
"itemSix": "ja",
1014+
"itemSeven": "ja",
10141015
"itemFileUpload": "Unbegrenzt",
10151016
"intelligentSearch": "Intelligente Suche",
1016-
"itemSeven": "ja",
10171017
"itemEight": "10.000 monatlich"
10181018
},
10191019
"paymentSuccess": {

‎frontend/resources/translations/uk-UA.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,11 +846,11 @@
846846
"itemFour": "Співпраця в реальному часі",
847847
"itemFive": "Мобільний додаток",
848848
"itemSix": "Відповіді ШІ",
849+
"itemSeven": "Спеціальний простір імен",
849850
"itemFileUpload": "Завантаження файлів",
850851
"tooltipSix": "Термін служби означає кількість відповідей, які ніколи не скидаються",
851852
"intelligentSearch": "Інтелектуальний пошук",
852-
"tooltipSeven": "Дозволяє налаштувати частину URL-адреси для вашої робочої області",
853-
"itemSeven": "Спеціальний простір імен"
853+
"tooltipSeven": "Дозволяє налаштувати частину URL-адреси для вашої робочої області"
854854
},
855855
"freeLabels": {
856856
"itemOne": "сплачується за робоче місце",

‎frontend/resources/translations/zh-CN.json‎

Lines changed: 70 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@
137137
"copyLinkFailed": "无法将链接复制到剪贴板",
138138
"copyLinkToBlockSuccess": "区块链接已复制到剪贴板",
139139
"copyLinkToBlockFailed": "无法将区块链接复制到剪贴板",
140-
"manageAllSites": "管理所有站点"
140+
"manageAllSites": "管理所有站点",
141+
"updatePathName": "更新路径名称"
141142
},
142143
"moreAction": {
143144
"small": "小",
@@ -152,7 +153,10 @@
152153
"deleteView": "删除",
153154
"duplicateView": "复制",
154155
"wordCountLabel": "词总数:",
155-
"charCountLabel": "字符总数:"
156+
"charCountLabel": "字符总数:",
157+
"createdAtLabel": "已创建的:",
158+
"syncedAtLabel": "已同步的:",
159+
"saveAsNewPage": "在页面中添加消息"
156160
},
157161
"importPanel": {
158162
"textAndMarkdown": "文本 和 Markdown",
@@ -175,7 +179,8 @@
175179
"changeIcon": "更改图标",
176180
"collapseAllPages": "收起全部子页面",
177181
"movePageTo": "将页面移动至",
178-
"move": "移动"
182+
"move": "移动",
183+
"lockPage": "锁定页面"
179184
},
180185
"blankPageTitle": "空白页",
181186
"newPageText": "新页面",
@@ -206,10 +211,19 @@
206211
"uploadFile": "上传聊天使用的 PDF、md 或 txt 文件",
207212
"questionDetail": "{} 你好！我能怎么帮到你？",
208213
"indexingFile": "正在索引 {}",
214+
"generatingResponse": "正在生成相应",
215+
"sourceUnsupported": "我们当前不支持基于数据库的交流",
209216
"regenerate": "请重试",
217+
"addToPageTitle": "添加消息至......",
218+
"addToNewPage": "创建新的页面",
210219
"openPagePreviewFailedToast": "打开页面失败",
211220
"changeFormat": {
212-
"actionButton": "变更样式"
221+
"actionButton": "变更样式",
222+
"confirmButton": "基于该样式重新生成",
223+
"imageOnly": "仅图片",
224+
"textAndImage": "文本与图片",
225+
"text": "段落",
226+
"table": "表格"
213227
},
214228
"referenceSource": "找到 {} 个来源",
215229
"referenceSources": "找到 {} 个来源",
@@ -349,6 +363,7 @@
349363
"askOwnerToUpgradeToProIOS": "你的工作区即将用尽免费存储。",
350364
"askOwnerToUpgradeToAIMax": "你的工作区即将用尽免费 AI 回应。请联系工作区所有者升级计划或购买 AI 插件",
351365
"askOwnerToUpgradeToAIMaxIOS": "你的工作区即将用尽免费 AI 回应限额。",
366+
"aiImageResponseLimit": "你已消耗完你的 AI 图像响应额度。\n转到 设置 -> 方案 -> 点击 AI Max 去获得更多的图像响应额度",
352367
"purchaseStorageSpace": "购买存储空间",
353368
"purchaseAIResponse": "购买",
354369
"askOwnerToUpgradeToLocalAI": "联系工作区所有者启用设备上 AI",
@@ -471,6 +486,7 @@
471486
"selectHomePage": "选择一个页面",
472487
"customUrl": "自定义 URL",
473488
"namespace": {
489+
"updateExistingNamespace": "更新现有的名称空间",
474490
"upgradeToPro": "请升级至 Pro 订阅计划以设置主页",
475491
"redirectToPayment": "正在重定向至付款页面......",
476492
"onlyWorkspaceOwnerCanSetHomePage": "仅工作空间的所有者能为其设置主页",
@@ -479,13 +495,39 @@
479495
"publishedPage": {
480496
"title": "所有已发布页面",
481497
"description": "管理您已发布的页面",
498+
"date": "已发布的数据",
499+
"emptyHinText": "在当前工作空间没有已发布的页面",
482500
"noPublishedPages": "没有已发布的页面",
483501
"settings": "发布设置",
484502
"clickToOpenPageInApp": "在 App 中打开页面",
485503
"clickToOpenPageInBrowser": "在浏览器中打开页面"
486504
},
505+
"error": {
506+
"failedToUpdateNamespace": "更新名称空间失败",
507+
"proPlanLimitation": "您需要升级至 Pro 方案以更新名称空间",
508+
"namespaceAlreadyInUse": "该名称空间已被占用你，请尝试其他名称空间",
509+
"invalidNamespace": "无效的名称空间，请尝试其他的名称空间",
510+
"namespaceLengthAtLeast2Characters": "名称空间应不少于 2 个字符长度",
511+
"onlyWorkspaceOwnerCanUpdateNamespace": "仅工作空间所有者可更新名称空间",
512+
"onlyWorkspaceOwnerCanRemoveHomepage": "仅工作空间所有者可移除主页",
513+
"setHomepageFailed": "设置主页失败",
514+
"namespaceTooLong": "该名称空间过长，请尝试其他名称空间",
515+
"namespaceTooShort": "该名称空间过短，请尝试其他名称空间",
516+
"namespaceIsReserved": "该名称空间已被占用，请尝试其他名称空间",
517+
"updatePathNameFailed": "更新路径名称失败",
518+
"removeHomePageFailed": "移除主页失败",
519+
"publishNameContainsInvalidCharacters": "该路径名称包含无效的字符，请尝试其他的路径名称",
520+
"publishNameTooShort": "路径名称过短，请尝试其他路径名称",
521+
"publishNameTooLong": "路径名称过长，请尝试其他路径名称",
522+
"publishNameAlreadyInUse": "该路径名称已被使用，请尝试其他路径名称",
523+
"namespaceContainsInvalidCharacters": "该名称空间包含无效的字符，请尝试其他名称空间",
524+
"publishPermissionDenied": "仅工作空间所有者或页面发布者可管理发布设置",
525+
"publishNameCannotBeEmpty": "该路径名称不能为空，请尝试其他路径名称"
526+
},
487527
"success": {
528+
"namespaceUpdated": "更新名称空间成功",
488529
"setHomepageSuccess": "成功设置主页",
530+
"updatePathNameSuccess": "更新路径名称成功",
489531
"removeHomePageSuccess": "成功删除主页"
490532
}
491533
},
@@ -628,6 +670,7 @@
628670
"descriptionEncrypted": "你的数据已加密。",
629671
"action": "加密数据",
630672
"dialog": {
673+
"title": "加密您的所有数据？",
631674
"description": "加密所有数据将保证数据安全。此操作无法撤消。您确定要继续吗？"
632675
}
633676
},
@@ -646,9 +689,14 @@
646689
}
647690
},
648691
"shortcutsPage": {
692+
"menuLabel": "快捷键",
693+
"title": "快捷键",
649694
"actions": {
650695
"resetDefault": "重置为默认"
651696
},
697+
"errorPage": {
698+
"howToFix": "请再次尝试，如果该问题依然存在，请在 Github 上联系我们"
699+
},
652700
"resetDialog": {
653701
"title": "重置快捷键",
654702
"description": "这将会将所有按键绑定重置为默认，之后无法撤销。你确定要继续吗？"
@@ -657,13 +705,30 @@
657705
"confirmLabel": "继续"
658706
},
659707
"keybindings": {
708+
"insertNewParagraphInCodeblock": "插入新的段落",
709+
"pasteInCodeblock": "粘贴为代码块",
660710
"selectAllCodeblock": "全选",
711+
"copy": "复制选中的内容",
661712
"alignLeft": "文本居左对齐",
662713
"alignCenter": "文本居中对齐",
663714
"alignRight": "文本居右对齐",
664715
"undo": "撤销",
665716
"redo": "重做",
666-
"convertToParagraph": "将块转换为段落"
717+
"convertToParagraph": "将块转换为段落",
718+
"backspace": "删除",
719+
"deleteLeftWord": "删除左侧文字",
720+
"deleteLeftSentence": "删除左侧句子",
721+
"delete": "删除右侧字符",
722+
"deleteMacOS": "删除左侧字符",
723+
"deleteRightWord": "删除右侧文字",
724+
"moveCursorLeft": "将光标移至左侧",
725+
"moveCursorBeginning": "将光标移至开头",
726+
"moveCursorLeftWord": "将光标移至文字左侧",
727+
"moveCursorRight": "将光标移至右侧",
728+
"moveCursorEnd": "将光标移至末尾",
729+
"moveCursorRightWord": "将光标移至文字右侧",
730+
"home": "滚动至顶部",
731+
"end": "滚动至底部"
667732
}
668733
},
669734
"aiPage": {

0 commit comments

Comments
 (0)