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

feat: added day/month/year format (#2189)

Browse Source
This commit is contained in:
Samiksha Garg 2023-04-10 16:16:07 +05:30 committed by GitHub
parent aac5c2a4da
commit 28ae193002
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/appflowy_flutter/assets/translations/en.json
View File

@ -282,6 +282,7 @@
"dateFormatISO": "Year-Month-Day", "dateFormatISO": "Year-Month-Day",
"dateFormatLocal": "Month/Day/Year", "dateFormatLocal": "Month/Day/Year",
"dateFormatUS": "Year/Month/Day", "dateFormatUS": "Year/Month/Day",
"dateFormatDayMonthYear": "Day/Month/Year",
"timeFormat": "Time format", "timeFormat": "Time format",
"invalidTimeFormat": "Invalid format", "invalidTimeFormat": "Invalid format",
"timeFormatTwelveHour": "12 hour", "timeFormatTwelveHour": "12 hour",

2
frontend/appflowy_flutter/lib/plugins/database_view/grid/presentation/widgets/header/type_option/date.dart
View File

@ -299,6 +299,8 @@ extension DateFormatExtension on DateFormat {
return LocaleKeys.grid_field_dateFormatLocal.tr(); return LocaleKeys.grid_field_dateFormatLocal.tr();
case DateFormat.US: case DateFormat.US:
return LocaleKeys.grid_field_dateFormatUS.tr(); return LocaleKeys.grid_field_dateFormatUS.tr();
case DateFormat.DayMonthYear:
return LocaleKeys.grid_field_dateFormatDayMonthYear.tr();
default: default:
throw UnimplementedError; throw UnimplementedError;
} }

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

@ -58,6 +58,16 @@ mod tests {
&field_rev, &field_rev,
); );
}, },
DateFormat::DayMonthYear => {
assert_date(
&type_option,
1647251762,
None,
"14/03/2022",
false,
&field_rev,
);
},
} }
} }
} }

3
frontend/rust-lib/flowy-database/src/services/field/type_options/date_type_option/date_type_option_entities.rs
View File

@ -174,6 +174,7 @@ pub enum DateFormat {
US = 1, US = 1,
ISO = 2, ISO = 2,
Friendly = 3, Friendly = 3,
DayMonthYear = 4,
} }
impl std::default::Default for DateFormat { impl std::default::Default for DateFormat {
fn default() -> Self { fn default() -> Self {
@ -188,6 +189,7 @@ impl std::convert::From<i32> for DateFormat {
1 => DateFormat::US, 1 => DateFormat::US,
2 => DateFormat::ISO, 2 => DateFormat::ISO,
3 => DateFormat::Friendly, 3 => DateFormat::Friendly,
4 => DateFormat::DayMonthYear,
_ => { _ => {
tracing::error!("Unsupported date format, fallback to friendly"); tracing::error!("Unsupported date format, fallback to friendly");
DateFormat::Friendly DateFormat::Friendly
@ -207,6 +209,7 @@ impl DateFormat {
DateFormat::US => "%Y/%m/%d", DateFormat::US => "%Y/%m/%d",
DateFormat::ISO => "%Y-%m-%d", DateFormat::ISO => "%Y-%m-%d",
DateFormat::Friendly => "%b %d,%Y", DateFormat::Friendly => "%b %d,%Y",
DateFormat::DayMonthYear => "%d/%m/%Y",
} }
} }
} }