From 29858dda7a9502d2db3e75fbe6b4ecae25b5f622 Mon Sep 17 00:00:00 2001 From: "Nathan.fooo" <86001920+appflowy@users.noreply.github.com> Date: Fri, 30 Aug 2024 15:35:57 +0800 Subject: [PATCH] chore: update plan desc (#6120) --- .../settings_plan_comparison_dialog.dart | 9 +++++++ frontend/resources/translations/en.json | 25 +++++++++++-------- .../rust-lib/flowy-ai/src/local_ai/watch.rs | 4 --- .../rust-lib/flowy-database2/src/manager.rs | 4 ++- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart index f2dec9550c..3ce6c6aca2 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/settings_plan_comparison_dialog.dart @@ -668,6 +668,9 @@ final _planLabels = [ label: LocaleKeys.settings_comparePlanDialog_planLabels_itemSix.tr(), tooltip: LocaleKeys.settings_comparePlanDialog_planLabels_tooltipSix.tr(), ), + _PlanItem( + label: LocaleKeys.settings_comparePlanDialog_planLabels_itemFileUpload.tr(), + ), ]; class _CellItem { @@ -703,6 +706,9 @@ final List<_CellItem> _freeLabels = [ _CellItem( label: LocaleKeys.settings_comparePlanDialog_freeLabels_itemSix.tr(), ), + _CellItem( + label: LocaleKeys.settings_comparePlanDialog_freeLabels_itemFileUpload.tr(), + ), ]; final List<_CellItem> _proLabels = [ @@ -731,4 +737,7 @@ final List<_CellItem> _proLabels = [ _CellItem( label: LocaleKeys.settings_comparePlanDialog_proLabels_itemSix.tr(), ), + _CellItem( + label: LocaleKeys.settings_comparePlanDialog_proLabels_itemFileUpload.tr(), + ), ]; diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json index b2270cfd5d..5129ba26c1 100644 --- a/frontend/resources/translations/en.json +++ b/frontend/resources/translations/en.json @@ -747,14 +747,14 @@ "title": "AI Max", "description": "Unlimited AI responses powered by GPT-4o, Claude 3.5 Sonnet, and more", "price": "{}", - "priceInfo": "per user per month billed annually", + "priceInfo": "Per user per month billed annually", "recommend": "" }, "aiOnDevice": { "title": "AI On-device for Mac", "description": "Run Mistral 7B, LLAMA 3, and more local models on your machine", "price": "{}", - "priceInfo": "per user per month billed annually", + "priceInfo": "Per user per month billed annually", "recommend": "Recommend M1 or newer" } }, @@ -825,13 +825,13 @@ "title": "Free", "description": "For individuals up to 2 members to organize everything", "price": "{}", - "priceInfo": "free forever" + "priceInfo": "Free forever" }, "proPlan": { "title": "Pro", "description": "For small teams to manage projects and team knowledge", "price": "{}", - "priceInfo": "per user per month \nbilled annually\n\n{} billed monthly" + "priceInfo": "Per user per month \nbilled annually\n\n{} billed monthly" }, "planLabels": { "itemOne": "Workspaces", @@ -840,26 +840,29 @@ "itemFour": "Real-time collaboration", "itemFive": "Mobile app", "itemSix": "AI Responses", + "itemFileUpload": "File uploads", "tooltipSix": "Lifetime means the number of responses never reset", "intelligentSearch": "Intelligent search", "tooltipSeven": "Allows you to customize part of the URL for your workspace" }, "freeLabels": { - "itemOne": "charged per workspace", - "itemTwo": "up to 2", + "itemOne": "Charged per workspace", + "itemTwo": "Up to 2", "itemThree": "5 GB", "itemFour": "yes", "itemFive": "yes", "itemSix": "100 lifetime", + "itemFileUpload": "Up to 7 MB", "intelligentSearch": "Intelligent search" }, "proLabels": { - "itemOne": "charged per workspace", - "itemTwo": "up to 10", - "itemThree": "unlimited", + "itemOne": "Charged per workspace", + "itemTwo": "Up to 10", + "itemThree": "Unlimited", "itemFour": "yes", "itemFive": "yes", - "itemSix": "unlimited", + "itemSix": "Unlimited", + "itemFileUpload": "Unlimited", "intelligentSearch": "Intelligent search" }, "paymentSuccess": { @@ -2502,4 +2505,4 @@ "uploadFailedDescription": "The file upload failed", "uploadingDescription": "The file is being uploaded" } -} +} \ No newline at end of file diff --git a/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs b/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs index 974484f922..93c332de15 100644 --- a/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs +++ b/frontend/rust-lib/flowy-ai/src/local_ai/watch.rs @@ -16,10 +16,6 @@ pub fn watch_offline_app() -> FlowyResult<(WatchContext, UnboundedReceiver| match res { diff --git a/frontend/rust-lib/flowy-database2/src/manager.rs b/frontend/rust-lib/flowy-database2/src/manager.rs index 7f09840a44..344a1516d7 100644 --- a/frontend/rust-lib/flowy-database2/src/manager.rs +++ b/frontend/rust-lib/flowy-database2/src/manager.rs @@ -815,7 +815,9 @@ impl DatabaseCollabService for WorkspaceDatabaseCollabServiceImpl { } }, Err(err) => { - error!("build collab: failed to get encode collab: {}", err); + if !matches!(err, DatabaseError::ActionCancelled) { + error!("build collab: failed to get encode collab: {}", err); + } return Err(err); }, }