Skip to content

Commit cd183b5

Browse files
authored
Merge pull request #1154 from AppFlowy-IO/fix/1129
fix: duplicate time format str
2 parents a1b54e0 + d6d8b4d commit cd183b5

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

frontend/app_flowy/assets/translations/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
"includeTime": " Include time",
182182
"dateFormatFriendly": "Month Day,Year",
183183
"dateFormatISO": "Year-Month-Day",
184-
"dateFormatLocal": "Year/Month/Day",
184+
"dateFormatLocal": "Month/Day/Year",
185185
"dateFormatUS": "Year/Month/Day",
186186
"timeFormat": " Time format",
187187
"invalidTimeFormat": "Invalid format",

frontend/app_flowy/assets/translations/es-VE.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"includeTime": " Incluir tiempo",
173173
"dateFormatFriendly": "Mes Día, Año",
174174
"dateFormatISO": "Año-Mes-Día",
175-
"dateFormatLocal": "Año/Mes/Día",
175+
"dateFormatLocal": "Mes/Día/Año",
176176
"dateFormatUS": "Año/Mes/Día",
177177
"timeFormat": " Time format",
178178
"invalidTimeFormat": "Formato de tiempo",

frontend/app_flowy/assets/translations/fr-FR.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"includeTime": " Inclure l'heure",
171171
"dateFormatFriendly": "Mois Jour, Année",
172172
"dateFormatISO": "Année-Mois-Jour",
173-
"dateFormatLocal": "Année/Mois/Jour",
173+
"dateFormatLocal": "Mois/Jour/Année",
174174
"dateFormatUS": "Année/Mois/Jour",
175175
"timeFormat": " Format du temps",
176176
"invalidTimeFormat": "Format invalide",

frontend/app_flowy/assets/translations/id-ID.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
"includeTime": " Sertakan waktu",
174174
"dateFormatFriendly": "Bulan Hari,Tahun",
175175
"dateFormatISO": "Tahun-Bulan-Hari",
176-
"dateFormatLocal": "Tahun/Bulan/Hari",
176+
"dateFormatLocal": "Bulan/Hari/Tahun",
177177
"dateFormatUS": "Tahun/Bulan/Hari",
178178
"timeFormat": " Format waktu",
179179
"invalidTimeFormat": "Format yang tidak valid",

frontend/app_flowy/assets/translations/ja-JP.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"includeTime": " 時刻を含める",
166166
"dateFormatFriendly": "月 日,年",
167167
"dateFormatISO": "年-月-日",
168-
"dateFormatLocal": "年/月/日",
168+
"dateFormatLocal": "月/日/年",
169169
"dateFormatUS": "年/月/日",
170170
"timeFormat": " 時刻書式",
171171
"timeFormatTwelveHour": "12 時間表記",

frontend/app_flowy/assets/translations/pt-BR.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@
6363
"deletePermanent": "Apagar permanentemente"
6464
},
6565
"dialogCreatePageNameHint": "Nome da página",
66-
"questionBubble": {
66+
"questionBubble": {
6767
"whatsNew": "O que há de novo?",
6868
"help": "Ajuda e Suporte",
6969
"debug": {
70-
"name": "Informação de depuração",
71-
"success": "Informação de depuração copiada para a área de transferência!",
72-
"fail": "Falha ao copiar a informação de depuração para a área de transferência"
70+
"name": "Informação de depuração",
71+
"success": "Informação de depuração copiada para a área de transferência!",
72+
"fail": "Falha ao copiar a informação de depuração para a área de transferência"
7373
}
7474
},
7575
"menuAppHeader": {
@@ -148,7 +148,7 @@
148148
"menu": {
149149
"appearance": "Aparência",
150150
"language": "Idioma",
151-
"user":"Usuário",
151+
"user": "Usuário",
152152
"open": "Abrir as Configurações"
153153
},
154154
"appearance": {
@@ -181,7 +181,7 @@
181181
"includeTime": "Incluir horário",
182182
"dateFormatFriendly": "Mês/Dia/Ano",
183183
"dateFormatISO": "Ano/Mês/Dia",
184-
"dateFormatLocal": "Ano/Mês/Dia",
184+
"dateFormatLocal": "Mês/Dia/Ano",
185185
"dateFormatUS": "Ano/Mês/Dia",
186186
"timeFormat": "Formato de hora",
187187
"invalidTimeFormat": "Formato Inválido",
@@ -231,4 +231,4 @@
231231
"create_new_card": "Novo"
232232
}
233233
}
234-
}
234+
}

frontend/app_flowy/assets/translations/ru-RU.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494
},
9595
"tooltip": {
9696
"darkMode": "Переключиться в тёмную тему",
97-
"openAsPage": "Открыть как страницу",
98-
"addNewRow": "Добавить новую строку",
99-
"openMenu": "Открыть меню"
97+
"openAsPage": "Открыть как страницу",
98+
"addNewRow": "Добавить новую строку",
99+
"openMenu": "Открыть меню"
100100
},
101101
"sideBar": {
102102
"closeSidebar": "Закрыть боковое меню",
@@ -180,7 +180,7 @@
180180
"includeTime": " Время",
181181
"dateFormatFriendly": "День Месяц, Год",
182182
"dateFormatISO": "Год-Месяц-День",
183-
"dateFormatLocal": "Год/Месяц/День",
183+
"dateFormatLocal": "Месяц/День/Год",
184184
"dateFormatUS": "Год/Месяц/День",
185185
"timeFormat": " Форматировать время",
186186
"invalidTimeFormat": "Неверный формат",

frontend/app_flowy/assets/translations/zh-CN.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
"includeTime": " 包含时间",
178178
"dateFormatFriendly": "月 日,年",
179179
"dateFormatISO": "年-月-日",
180-
"dateFormatLocal": "年/月/日",
180+
"dateFormatLocal": "月/日/年",
181181
"dateFormatUS": "年/月/日",
182182
"timeFormat": " 时间格式",
183183
"invalidTimeFormat": "时间格式错误",

frontend/app_flowy/assets/translations/zh-TW.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
"includeTime": " 包含時間",
174174
"dateFormatFriendly": "月 日,年",
175175
"dateFormatISO": "年-月-日",
176-
"dateFormatLocal": "年/月/日",
176+
"dateFormatLocal": "月/日/年",
177177
"dateFormatUS": "年/月/日",
178178
"timeFormat": " 時間格式",
179179
"invalidTimeFormat": "格式無效",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mod tests {
2424
assert_date(&type_option, 1647251762, None, "2022-03-14", &field_rev);
2525
}
2626
DateFormat::Local => {
27-
assert_date(&type_option, 1647251762, None, "2022/03/14", &field_rev);
27+
assert_date(&type_option, 1647251762, None, "03/14/2022", &field_rev);
2828
}
2929
}
3030
}

0 commit comments

Comments
 (0)