diff --git a/frontend/app_flowy/assets/translations/en.json b/frontend/app_flowy/assets/translations/en.json index b607180f4f..cd7932945b 100644 --- a/frontend/app_flowy/assets/translations/en.json +++ b/frontend/app_flowy/assets/translations/en.json @@ -181,7 +181,7 @@ "includeTime": " Include time", "dateFormatFriendly": "Month Day,Year", "dateFormatISO": "Year-Month-Day", - "dateFormatLocal": "Year/Month/Day", + "dateFormatLocal": "Month/Day/Year", "dateFormatUS": "Year/Month/Day", "timeFormat": " Time format", "invalidTimeFormat": "Invalid format", diff --git a/frontend/app_flowy/assets/translations/es-VE.json b/frontend/app_flowy/assets/translations/es-VE.json index b07b0a6ef5..869a5e75a3 100644 --- a/frontend/app_flowy/assets/translations/es-VE.json +++ b/frontend/app_flowy/assets/translations/es-VE.json @@ -172,7 +172,7 @@ "includeTime": " Incluir tiempo", "dateFormatFriendly": "Mes Día, Año", "dateFormatISO": "Año-Mes-Día", - "dateFormatLocal": "Año/Mes/Día", + "dateFormatLocal": "Mes/Día/Año", "dateFormatUS": "Año/Mes/Día", "timeFormat": " Time format", "invalidTimeFormat": "Formato de tiempo", diff --git a/frontend/app_flowy/assets/translations/fr-FR.json b/frontend/app_flowy/assets/translations/fr-FR.json index 1408db0343..2a3ad60b7b 100644 --- a/frontend/app_flowy/assets/translations/fr-FR.json +++ b/frontend/app_flowy/assets/translations/fr-FR.json @@ -170,7 +170,7 @@ "includeTime": " Inclure l'heure", "dateFormatFriendly": "Mois Jour, Année", "dateFormatISO": "Année-Mois-Jour", - "dateFormatLocal": "Année/Mois/Jour", + "dateFormatLocal": "Mois/Jour/Année", "dateFormatUS": "Année/Mois/Jour", "timeFormat": " Format du temps", "invalidTimeFormat": "Format invalide", diff --git a/frontend/app_flowy/assets/translations/id-ID.json b/frontend/app_flowy/assets/translations/id-ID.json index 765865b012..1239194266 100644 --- a/frontend/app_flowy/assets/translations/id-ID.json +++ b/frontend/app_flowy/assets/translations/id-ID.json @@ -173,7 +173,7 @@ "includeTime": " Sertakan waktu", "dateFormatFriendly": "Bulan Hari,Tahun", "dateFormatISO": "Tahun-Bulan-Hari", - "dateFormatLocal": "Tahun/Bulan/Hari", + "dateFormatLocal": "Bulan/Hari/Tahun", "dateFormatUS": "Tahun/Bulan/Hari", "timeFormat": " Format waktu", "invalidTimeFormat": "Format yang tidak valid", diff --git a/frontend/app_flowy/assets/translations/ja-JP.json b/frontend/app_flowy/assets/translations/ja-JP.json index f29051263f..793604212c 100644 --- a/frontend/app_flowy/assets/translations/ja-JP.json +++ b/frontend/app_flowy/assets/translations/ja-JP.json @@ -165,7 +165,7 @@ "includeTime": " 時刻を含める", "dateFormatFriendly": "月 日,年", "dateFormatISO": "年-月-日", - "dateFormatLocal": "年/月/日", + "dateFormatLocal": "月/日/年", "dateFormatUS": "年/月/日", "timeFormat": " 時刻書式", "timeFormatTwelveHour": "12 時間表記", diff --git a/frontend/app_flowy/assets/translations/pt-BR.json b/frontend/app_flowy/assets/translations/pt-BR.json index a5ccbeaf2a..4bea9c6a3d 100644 --- a/frontend/app_flowy/assets/translations/pt-BR.json +++ b/frontend/app_flowy/assets/translations/pt-BR.json @@ -63,13 +63,13 @@ "deletePermanent": "Apagar permanentemente" }, "dialogCreatePageNameHint": "Nome da página", - "questionBubble": { + "questionBubble": { "whatsNew": "O que há de novo?", "help": "Ajuda e Suporte", "debug": { - "name": "Informação de depuração", - "success": "Informação de depuração copiada para a área de transferência!", - "fail": "Falha ao copiar a informação de depuração para a área de transferência" + "name": "Informação de depuração", + "success": "Informação de depuração copiada para a área de transferência!", + "fail": "Falha ao copiar a informação de depuração para a área de transferência" } }, "menuAppHeader": { @@ -148,7 +148,7 @@ "menu": { "appearance": "Aparência", "language": "Idioma", - "user":"Usuário", + "user": "Usuário", "open": "Abrir as Configurações" }, "appearance": { @@ -181,7 +181,7 @@ "includeTime": "Incluir horário", "dateFormatFriendly": "Mês/Dia/Ano", "dateFormatISO": "Ano/Mês/Dia", - "dateFormatLocal": "Ano/Mês/Dia", + "dateFormatLocal": "Mês/Dia/Ano", "dateFormatUS": "Ano/Mês/Dia", "timeFormat": "Formato de hora", "invalidTimeFormat": "Formato Inválido", @@ -231,4 +231,4 @@ "create_new_card": "Novo" } } -} +} \ No newline at end of file diff --git a/frontend/app_flowy/assets/translations/ru-RU.json b/frontend/app_flowy/assets/translations/ru-RU.json index 50ffa83a44..6f53886f84 100644 --- a/frontend/app_flowy/assets/translations/ru-RU.json +++ b/frontend/app_flowy/assets/translations/ru-RU.json @@ -94,9 +94,9 @@ }, "tooltip": { "darkMode": "Переключиться в тёмную тему", - "openAsPage": "Открыть как страницу", - "addNewRow": "Добавить новую строку", - "openMenu": "Открыть меню" + "openAsPage": "Открыть как страницу", + "addNewRow": "Добавить новую строку", + "openMenu": "Открыть меню" }, "sideBar": { "closeSidebar": "Закрыть боковое меню", @@ -180,7 +180,7 @@ "includeTime": " Время", "dateFormatFriendly": "День Месяц, Год", "dateFormatISO": "Год-Месяц-День", - "dateFormatLocal": "Год/Месяц/День", + "dateFormatLocal": "Месяц/День/Год", "dateFormatUS": "Год/Месяц/День", "timeFormat": " Форматировать время", "invalidTimeFormat": "Неверный формат", diff --git a/frontend/app_flowy/assets/translations/zh-CN.json b/frontend/app_flowy/assets/translations/zh-CN.json index e5628c8bb8..f5fee6ab23 100644 --- a/frontend/app_flowy/assets/translations/zh-CN.json +++ b/frontend/app_flowy/assets/translations/zh-CN.json @@ -177,7 +177,7 @@ "includeTime": " 包含时间", "dateFormatFriendly": "月 日,年", "dateFormatISO": "年-月-日", - "dateFormatLocal": "年/月/日", + "dateFormatLocal": "月/日/年", "dateFormatUS": "年/月/日", "timeFormat": " 时间格式", "invalidTimeFormat": "时间格式错误", diff --git a/frontend/app_flowy/assets/translations/zh-TW.json b/frontend/app_flowy/assets/translations/zh-TW.json index 6990d1697b..faa2dea03e 100644 --- a/frontend/app_flowy/assets/translations/zh-TW.json +++ b/frontend/app_flowy/assets/translations/zh-TW.json @@ -173,7 +173,7 @@ "includeTime": " 包含時間", "dateFormatFriendly": "月 日,年", "dateFormatISO": "年-月-日", - "dateFormatLocal": "年/月/日", + "dateFormatLocal": "月/日/年", "dateFormatUS": "年/月/日", "timeFormat": " 時間格式", "invalidTimeFormat": "格式無效", diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs index d8f034fa3d..2e08b91d1c 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_tests.rs @@ -24,7 +24,7 @@ mod tests { assert_date(&type_option, 1647251762, None, "2022-03-14", &field_rev); } DateFormat::Local => { - assert_date(&type_option, 1647251762, None, "2022/03/14", &field_rev); + assert_date(&type_option, 1647251762, None, "03/14/2022", &field_rev); } } } diff --git a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs index aef76b9c65..ff2dc3fc4f 100644 --- a/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs +++ b/frontend/rust-lib/flowy-grid/src/services/field/type_options/date_type_option/date_type_option_entities.rs @@ -153,7 +153,7 @@ impl DateFormat { // https://docs.rs/chrono/0.4.19/chrono/format/strftime/index.html pub fn format_str(&self) -> &'static str { match self { - DateFormat::Local => "%Y/%m/%d", + DateFormat::Local => "%m/%d/%Y", DateFormat::US => "%Y/%m/%d", DateFormat::ISO => "%Y-%m-%d", DateFormat::Friendly => "%b %d,%Y",