From 92fa53d28b61751eb05c4de6b1b480e1ce30ee28 Mon Sep 17 00:00:00 2001 From: GangemiLorenzo Date: Tue, 17 May 2022 20:25:35 +0200 Subject: [PATCH 1/3] chore: add translations --- .../app_flowy/assets/translations/en.json | 10 +++++++-- .../app_flowy/assets/translations/it-IT.json | 6 +++++ .../presentation/plugins/doc/document.dart | 22 +++++++++---------- .../presentation/plugins/grid/grid.dart | 6 +++-- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/frontend/app_flowy/assets/translations/en.json b/frontend/app_flowy/assets/translations/en.json index 8755f05952..d4fe0f536f 100644 --- a/frontend/app_flowy/assets/translations/en.json +++ b/frontend/app_flowy/assets/translations/en.json @@ -75,7 +75,9 @@ "menuAppHeader": { "addPageTooltip": "Quickly add a page inside", "defaultNewPageName": "Untitled", - "renameDialog": "Rename" + "renameDialog": "Rename", + "document":"Doc", + "grid":"Grid" }, "toolbar": { "undo": "Undo", @@ -195,6 +197,10 @@ "colorPannelTitle": "Colors", "pannelTitle": "Select an option or create one", "searchOption": "Search for an option" - } + }, + "menuName":"Grid" + }, + "document":{ + "menuName":"Doc" } } diff --git a/frontend/app_flowy/assets/translations/it-IT.json b/frontend/app_flowy/assets/translations/it-IT.json index 861e2c2b0b..9a546076c5 100644 --- a/frontend/app_flowy/assets/translations/it-IT.json +++ b/frontend/app_flowy/assets/translations/it-IT.json @@ -141,5 +141,11 @@ "lightLabel": "Modalità Chiara", "darkLabel": "Modalità Scura" } + }, + "grid": { + "menuName":"Griglia" + }, + "document":{ + "menuName":"Documento" } } diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart index 5dcf744083..f785dd9ad1 100644 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart @@ -1,10 +1,6 @@ library docuemnt_plugin; -export './src/document_page.dart'; -export './src/widget/toolbar/history_button.dart'; -export './src/widget/toolbar/toolbar_icon_button.dart'; -export './src/widget/toolbar/tool_bar.dart'; - +import 'package:app_flowy/generated/locale_keys.g.dart'; import 'package:app_flowy/plugin/plugin.dart'; import 'package:app_flowy/startup/startup.dart'; import 'package:app_flowy/workspace/application/appearance.dart'; @@ -14,24 +10,28 @@ import 'package:app_flowy/workspace/presentation/home/home_stack.dart'; import 'package:app_flowy/workspace/presentation/plugins/widgets/left_bar_item.dart'; import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart'; import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart'; +import 'package:clipboard/clipboard.dart'; +import 'package:dartz/dartz.dart' as dartz; import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_infra/notifier.dart'; import 'package:flowy_infra/size.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart'; import 'package:flowy_infra_ui/widget/rounded_button.dart'; import 'package:flowy_sdk/log.dart'; -import 'package:flowy_sdk/protobuf/flowy-text-block/entities.pb.dart'; -import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; import 'package:flowy_sdk/protobuf/flowy-error/errors.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; +import 'package:flowy_sdk/protobuf/flowy-text-block/entities.pb.dart'; import 'package:flutter/material.dart'; -import 'package:dartz/dartz.dart' as dartz; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:clipboard/clipboard.dart'; -import 'package:app_flowy/generated/locale_keys.g.dart'; import 'package:provider/provider.dart'; import 'src/document_page.dart'; +export './src/document_page.dart'; +export './src/widget/toolbar/history_button.dart'; +export './src/widget/toolbar/tool_bar.dart'; +export './src/widget/toolbar/toolbar_icon_button.dart'; + class DocumentPluginBuilder extends PluginBuilder { @override Plugin build(dynamic data) { @@ -43,7 +43,7 @@ class DocumentPluginBuilder extends PluginBuilder { } @override - String get menuName => "Doc"; + String get menuName => LocaleKeys.document_menuName.tr(); @override PluginType get pluginType => DefaultPlugin.quill.type(); diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/grid.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/grid.dart index adc2a91fa9..d566223de9 100644 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/grid.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/grid.dart @@ -1,7 +1,9 @@ +import 'package:app_flowy/generated/locale_keys.g.dart'; +import 'package:app_flowy/plugin/plugin.dart'; import 'package:app_flowy/workspace/presentation/home/home_stack.dart'; import 'package:app_flowy/workspace/presentation/plugins/widgets/left_bar_item.dart'; +import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_sdk/protobuf/flowy-folder-data-model/view.pb.dart'; -import 'package:app_flowy/plugin/plugin.dart'; import 'package:flutter/material.dart'; import 'src/grid_page.dart'; @@ -17,7 +19,7 @@ class GridPluginBuilder implements PluginBuilder { } @override - String get menuName => "Grid"; + String get menuName => LocaleKeys.grid_menuName.tr(); @override PluginType get pluginType => DefaultPlugin.grid.type(); From 9b01d31fb95dce85f73a402b2ea0733cb67a42a3 Mon Sep 17 00:00:00 2001 From: GangemiLorenzo Date: Tue, 17 May 2022 21:26:57 +0200 Subject: [PATCH 2/3] fix: duplicated translations --- frontend/app_flowy/assets/translations/en.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/app_flowy/assets/translations/en.json b/frontend/app_flowy/assets/translations/en.json index d4fe0f536f..cb081c4ab8 100644 --- a/frontend/app_flowy/assets/translations/en.json +++ b/frontend/app_flowy/assets/translations/en.json @@ -75,9 +75,7 @@ "menuAppHeader": { "addPageTooltip": "Quickly add a page inside", "defaultNewPageName": "Untitled", - "renameDialog": "Rename", - "document":"Doc", - "grid":"Grid" + "renameDialog": "Rename" }, "toolbar": { "undo": "Undo", From 4701a281b333273a4871426773e9eb54ae5d70e5 Mon Sep 17 00:00:00 2001 From: appflowy Date: Sat, 11 Jun 2022 07:41:46 +0800 Subject: [PATCH 3/3] chore: fix typo error --- frontend/app_flowy/assets/translations/en.json | 6 +++--- .../lib/workspace/application/grid/cell/date_cal_bloc.dart | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/app_flowy/assets/translations/en.json b/frontend/app_flowy/assets/translations/en.json index 521321d54f..a6f9b4d3ae 100644 --- a/frontend/app_flowy/assets/translations/en.json +++ b/frontend/app_flowy/assets/translations/en.json @@ -205,10 +205,10 @@ "pannelTitle": "Select an option or create one", "searchOption": "Search for an option" }, - "menuName":"Grid" + "menuName": "Grid" }, - "document":{ - "menuName":"Doc" + "document": { + "menuName": "Doc", "date": { "timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwentyFourHour": "12:00" diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell/date_cal_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/cell/date_cal_bloc.dart index c72a10b481..28f8bf1b10 100644 --- a/frontend/app_flowy/lib/workspace/application/grid/cell/date_cal_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/grid/cell/date_cal_bloc.dart @@ -225,9 +225,9 @@ class DateCalState with _$DateCalState { String _timeHintText(DateTypeOption typeOption) { switch (typeOption.timeFormat) { case TimeFormat.TwelveHour: - return LocaleKeys.grid_date_timeHintTextInTwelveHour.tr(); + return LocaleKeys.document_date_timeHintTextInTwelveHour.tr(); case TimeFormat.TwentyFourHour: - return LocaleKeys.grid_date_timeHintTextInTwentyFourHour.tr(); + return LocaleKeys.document_date_timeHintTextInTwentyFourHour.tr(); } return ""; }