Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1080 from richardshiue/fix-include-time

Browse Source 
fix: some improvements for when including time in a date cell
This commit is contained in:
Annie 2022-09-21 20:08:35 +08:00 committed by GitHub
commit a5e0e97df5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/app_flowy/assets/translations/en.json
View File

@ -222,8 +222,8 @@
"document": { "document": {
"menuName": "Doc", "menuName": "Doc",
"date": { "date": {
"timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwelveHour": "01:00 PM",
"timeHintTextInTwentyFourHour": "12:00" "timeHintTextInTwentyFourHour": "13:00"
} }
}, },
"board": { "board": {

4
frontend/app_flowy/assets/translations/es-VE.json
View File

@ -210,8 +210,8 @@
"document": { "document": {
"menuName": "Doc", "menuName": "Doc",
"date": { "date": {
"timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwelveHour": "01:00 PM",
"timeHintTextInTwentyFourHour": "12:00" "timeHintTextInTwentyFourHour": "13:00"
} }
}, },
"sideBar": { "sideBar": {

4
frontend/app_flowy/assets/translations/fr-FR.json
View File

@ -208,8 +208,8 @@
"document": { "document": {
"menuName": "Doc", "menuName": "Doc",
"date": { "date": {
"timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwelveHour": "01:00 PM",
"timeHintTextInTwentyFourHour": "12:00" "timeHintTextInTwentyFourHour": "13:00"
} }
} }
} }

4
frontend/app_flowy/assets/translations/id-ID.json
View File

@ -211,8 +211,8 @@
"document": { "document": {
"menuName": "Doc", "menuName": "Doc",
"date": { "date": {
"timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwelveHour": "01:00 PM",
"timeHintTextInTwentyFourHour": "12:00" "timeHintTextInTwentyFourHour": "13:00"
} }
}, },
"sideBar": { "sideBar": {

4
frontend/app_flowy/assets/translations/ru-RU.json
View File

@ -221,8 +221,8 @@
"document": { "document": {
"menuName": "Документ", "menuName": "Документ",
"date": { "date": {
"timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwelveHour": "01:00 PM",
"timeHintTextInTwentyFourHour": "12:00" "timeHintTextInTwentyFourHour": "13:00"
} }
}, },
"board": { "board": {

4
frontend/app_flowy/assets/translations/zh-CN.json
View File

@ -215,8 +215,8 @@
"document": { "document": {
"menuName": "文档", "menuName": "文档",
"date": { "date": {
"timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwelveHour": "01:00 PM",
"timeHintTextInTwentyFourHour": "12:00" "timeHintTextInTwentyFourHour": "13:00"
} }
} }
} }

4
frontend/app_flowy/assets/translations/zh-TW.json
View File

@ -211,8 +211,8 @@
"document": { "document": {
"menuName": "檔案", "menuName": "檔案",
"date": { "date": {
"timeHintTextInTwelveHour": "12:00 AM", "timeHintTextInTwelveHour": "01:00 PM",
"timeHintTextInTwentyFourHour": "12:00" "timeHintTextInTwentyFourHour": "13:00"
} }
}, },
"sideBar": { "sideBar": {

8
frontend/app_flowy/lib/plugins/grid/application/cell/date_cal_bloc.dart
View File

@ -108,7 +108,7 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {
(err) { (err) {
switch (ErrorCode.valueOf(err.code)!) { switch (ErrorCode.valueOf(err.code)!) {
case ErrorCode.InvalidDateTimeFormat: case ErrorCode.InvalidDateTimeFormat:
updateCalData(none(), Some(timeFormatPrompt(err))); updateCalData(state.calData, Some(timeFormatPrompt(err)));
break; break;
default: default:
Log.error(err); Log.error(err);
@ -119,13 +119,13 @@ class DateCalBloc extends Bloc<DateCalEvent, DateCalState> {
} }
String timeFormatPrompt(FlowyError error) { String timeFormatPrompt(FlowyError error) {
String msg = "${LocaleKeys.grid_field_invalidTimeFormat.tr()}. "; String msg = "${LocaleKeys.grid_field_invalidTimeFormat.tr()}.";
switch (state.dateTypeOptionPB.timeFormat) { switch (state.dateTypeOptionPB.timeFormat) {
case TimeFormat.TwelveHour: case TimeFormat.TwelveHour:
msg = "${msg}e.g. 01: 00 AM"; msg = "$msg e.g. 01:00 PM";
break; break;
case TimeFormat.TwentyFourHour: case TimeFormat.TwentyFourHour:
msg = "${msg}e.g. 13: 00"; msg = "$msg e.g. 13:00";
break; break;
default: default:
break; break;

1
frontend/app_flowy/lib/plugins/grid/presentation/widgets/cell/date_cell/date_editor.dart
View File

@ -261,6 +261,7 @@ class _TimeTextFieldState extends State<_TimeTextField> {
child: RoundedInputField( child: RoundedInputField(
height: 40, height: 40,
focusNode: _focusNode, focusNode: _focusNode,
autoFocus: true,
hintText: state.timeHintText, hintText: state.timeHintText,
controller: _controller, controller: _controller,
style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500),

4
frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs
View File

@ -141,7 +141,9 @@ mod tests {
.unwrap(); .unwrap();
if type_option.include_time { if type_option.include_time {
format!("{}{}", decoded_data.date, decoded_data.time) format!("{} {}", decoded_data.date, decoded_data.time)
.trim_end()
.to_owned()
} else { } else {
decoded_data.date decoded_data.date
} }

4
frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option.rs
View File

@ -51,8 +51,8 @@ impl DateTypeOptionPB {
let date = format!("{}", utc.format_with_items(StrftimeItems::new(fmt))); let date = format!("{}", utc.format_with_items(StrftimeItems::new(fmt)));
let mut time = "".to_string(); let mut time = "".to_string();
if has_time { if has_time && self.include_time {
let fmt = format!("{} {}", self.date_format.format_str(), self.time_format.format_str()); let fmt = format!("{}{}", self.date_format.format_str(), self.time_format.format_str());
time = format!("{}", utc.format_with_items(StrftimeItems::new(&fmt))).replace(&date, ""); time = format!("{}", utc.format_with_items(StrftimeItems::new(&fmt))).replace(&date, "");
} }