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

fix: duplicate time format str

Browse Source
This commit is contained in:
nathan
2022-09-25 10:57:40 +08:00
parent a1b54e0646
commit d6d8b4da5a
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@
"includeTime": " Include time", "includeTime": " Include time",
"dateFormatFriendly": "Month Day,Year", "dateFormatFriendly": "Month Day,Year",
"dateFormatISO": "Year-Month-Day", "dateFormatISO": "Year-Month-Day",
"dateFormatLocal": "Year/Month/Day", "dateFormatLocal": "Month/Day/Year",
"dateFormatUS": "Year/Month/Day", "dateFormatUS": "Year/Month/Day",
"timeFormat": " Time format", "timeFormat": " Time format",
"invalidTimeFormat": "Invalid format", "invalidTimeFormat": "Invalid format",

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

@ -172,7 +172,7 @@
"includeTime": " Incluir tiempo", "includeTime": " Incluir tiempo",
"dateFormatFriendly": "Mes Día, Año", "dateFormatFriendly": "Mes Día, Año",
"dateFormatISO": "Año-Mes-Día", "dateFormatISO": "Año-Mes-Día",
"dateFormatLocal": "Año/Mes/Día", "dateFormatLocal": "Mes/Día/Año",
"dateFormatUS": "Año/Mes/Día", "dateFormatUS": "Año/Mes/Día",
"timeFormat": " Time format", "timeFormat": " Time format",
"invalidTimeFormat": "Formato de tiempo", "invalidTimeFormat": "Formato de tiempo",

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

@ -170,7 +170,7 @@
"includeTime": " Inclure l'heure", "includeTime": " Inclure l'heure",
"dateFormatFriendly": "Mois Jour, Année", "dateFormatFriendly": "Mois Jour, Année",
"dateFormatISO": "Année-Mois-Jour", "dateFormatISO": "Année-Mois-Jour",
"dateFormatLocal": "Année/Mois/Jour", "dateFormatLocal": "Mois/Jour/Année",
"dateFormatUS": "Année/Mois/Jour", "dateFormatUS": "Année/Mois/Jour",
"timeFormat": " Format du temps", "timeFormat": " Format du temps",
"invalidTimeFormat": "Format invalide", "invalidTimeFormat": "Format invalide",

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

@ -173,7 +173,7 @@
"includeTime": " Sertakan waktu", "includeTime": " Sertakan waktu",
"dateFormatFriendly": "Bulan Hari,Tahun", "dateFormatFriendly": "Bulan Hari,Tahun",
"dateFormatISO": "Tahun-Bulan-Hari", "dateFormatISO": "Tahun-Bulan-Hari",
"dateFormatLocal": "Tahun/Bulan/Hari", "dateFormatLocal": "Bulan/Hari/Tahun",
"dateFormatUS": "Tahun/Bulan/Hari", "dateFormatUS": "Tahun/Bulan/Hari",
"timeFormat": " Format waktu", "timeFormat": " Format waktu",
"invalidTimeFormat": "Format yang tidak valid", "invalidTimeFormat": "Format yang tidak valid",

2
frontend/app_flowy/assets/translations/ja-JP.json
View File

@ -165,7 +165,7 @@
"includeTime": " 時刻を含める", "includeTime": " 時刻を含める",
"dateFormatFriendly": "月 日,年", "dateFormatFriendly": "月 日,年",
"dateFormatISO": "年-月-日", "dateFormatISO": "年-月-日",
"dateFormatLocal": "年/月/日", "dateFormatLocal": "月/日/年",
"dateFormatUS": "年/月/日", "dateFormatUS": "年/月/日",
"timeFormat": " 時刻書式", "timeFormat": " 時刻書式",
"timeFormatTwelveHour": "12 時間表記", "timeFormatTwelveHour": "12 時間表記",

4
frontend/app_flowy/assets/translations/pt-BR.json
View File

@ -148,7 +148,7 @@
"menu": { "menu": {
"appearance": "Aparência", "appearance": "Aparência",
"language": "Idioma", "language": "Idioma",
"user":"Usuário", "user": "Usuário",
"open": "Abrir as Configurações" "open": "Abrir as Configurações"
}, },
"appearance": { "appearance": {
@ -181,7 +181,7 @@
"includeTime": "Incluir horário", "includeTime": "Incluir horário",
"dateFormatFriendly": "Mês/Dia/Ano", "dateFormatFriendly": "Mês/Dia/Ano",
"dateFormatISO": "Ano/Mês/Dia", "dateFormatISO": "Ano/Mês/Dia",
"dateFormatLocal": "Ano/Mês/Dia", "dateFormatLocal": "Mês/Dia/Ano",
"dateFormatUS": "Ano/Mês/Dia", "dateFormatUS": "Ano/Mês/Dia",
"timeFormat": "Formato de hora", "timeFormat": "Formato de hora",
"invalidTimeFormat": "Formato Inválido", "invalidTimeFormat": "Formato Inválido",

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

@ -180,7 +180,7 @@
"includeTime": " Время", "includeTime": " Время",
"dateFormatFriendly": "День Месяц, Год", "dateFormatFriendly": "День Месяц, Год",
"dateFormatISO": "Год-Месяц-День", "dateFormatISO": "Год-Месяц-День",
"dateFormatLocal": "Год/Месяц/День", "dateFormatLocal": "Месяц/День/Год",
"dateFormatUS": "Год/Месяц/День", "dateFormatUS": "Год/Месяц/День",
"timeFormat": " Форматировать время", "timeFormat": " Форматировать время",
"invalidTimeFormat": "Неверный формат", "invalidTimeFormat": "Неверный формат",

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

@ -177,7 +177,7 @@
"includeTime": " 包含时间", "includeTime": " 包含时间",
"dateFormatFriendly": "月 日,年", "dateFormatFriendly": "月 日,年",
"dateFormatISO": "年-月-日", "dateFormatISO": "年-月-日",
"dateFormatLocal": "年/月/日", "dateFormatLocal": "月/日/年",
"dateFormatUS": "年/月/日", "dateFormatUS": "年/月/日",
"timeFormat": " 时间格式", "timeFormat": " 时间格式",
"invalidTimeFormat": "时间格式错误", "invalidTimeFormat": "时间格式错误",

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

@ -173,7 +173,7 @@
"includeTime": " 包含時間", "includeTime": " 包含時間",
"dateFormatFriendly": "月 日,年", "dateFormatFriendly": "月 日,年",
"dateFormatISO": "年-月-日", "dateFormatISO": "年-月-日",
"dateFormatLocal": "年/月/日", "dateFormatLocal": "月/日/年",
"dateFormatUS": "年/月/日", "dateFormatUS": "年/月/日",
"timeFormat": " 時間格式", "timeFormat": " 時間格式",
"invalidTimeFormat": "格式無效", "invalidTimeFormat": "格式無效",

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

@ -24,7 +24,7 @@ mod tests {
assert_date(&type_option, 1647251762, None, "2022-03-14", &field_rev); assert_date(&type_option, 1647251762, None, "2022-03-14", &field_rev);
} }
DateFormat::Local => { DateFormat::Local => {
assert_date(&type_option, 1647251762, None, "2022/03/14", &field_rev); assert_date(&type_option, 1647251762, None, "03/14/2022", &field_rev);
} }
} }
} }

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

@ -153,7 +153,7 @@ impl DateFormat {
// https://docs.rs/chrono/0.4.19/chrono/format/strftime/index.html // https://docs.rs/chrono/0.4.19/chrono/format/strftime/index.html
pub fn format_str(&self) -> &'static str { pub fn format_str(&self) -> &'static str {
match self { match self {
DateFormat::Local => "%Y/%m/%d", DateFormat::Local => "%m/%d/%Y",
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",