Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: remove duplicated button labels for done, cancel and ok (#4718)

Dev-for-funfa3bc976986b
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/base/app_bar_actions.dart b/frontend/appflowy_flutter/lib/mobile/presentation/base/app_bar_actions.dart
index 4f611a3435..2a35ab24cc 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/base/app_bar_actions.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/base/app_bar_actions.dart
@@ -79,7 +79,7 @@ class AppBarDoneButton extends StatelessWidget {
onTap: onTap,
padding: const EdgeInsets.fromLTRB(12, 12, 8, 12),
child: FlowyText(
- LocaleKeys.button_Done.tr(),
+ LocaleKeys.button_done.tr(),
color: Theme.of(context).colorScheme.primary,
fontWeight: FontWeight.w500,
textAlign: TextAlign.right,
diff --git a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_header.dart b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_header.dart
index 7bca4a1e61..e09b13268c 100644
--- a/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_header.dart
+++ b/frontend/appflowy_flutter/lib/mobile/presentation/bottom_sheet/bottom_sheet_header.dart
@@ -49,7 +49,7 @@ class BottomSheetHeader extends StatelessWidget {
color: Color(0xFF00BCF0),
),
text: FlowyText.medium(
- LocaleKeys.button_Done.tr(),
+ LocaleKeys.button_done.tr(),
color: Colors.white,
fontSize: 16.0,
),
diff --git a/frontend/resources/translations/am-ET.json b/frontend/resources/translations/am-ET.json
index 005a272201..88d526ae09 100644
--- a/frontend/resources/translations/am-ET.json
+++ b/frontend/resources/translations/am-ET.json
@@ -194,8 +194,7 @@
},
"button": {
"OK": "እሺ",
- "Done": "ተከናውኗል",
- "Cancel": "ይቅር",
+ "cancel": "ይቅር",
"signIn": "ይግቡ",
"signOut": "ዘግተው ውጣ",
"complete": "ተጠናቀቀ",
diff --git a/frontend/resources/translations/ar-SA.json b/frontend/resources/translations/ar-SA.json
index d687267958..b20bdc5e1b 100644
--- a/frontend/resources/translations/ar-SA.json
+++ b/frontend/resources/translations/ar-SA.json
@@ -233,9 +233,6 @@
"helpCenter": "مركز المساعدة",
"add": "اضافة",
"yes": "نعم",
- "Done": "منتهي",
- "Cancel": "إلغاء",
- "OK": "نعم",
"tryAGain": "حاول ثانية"
},
"label": {
diff --git a/frontend/resources/translations/ca-ES.json b/frontend/resources/translations/ca-ES.json
index 1379cc4450..acf4f93c97 100644
--- a/frontend/resources/translations/ca-ES.json
+++ b/frontend/resources/translations/ca-ES.json
@@ -230,10 +230,7 @@
"rename": "Renombrar",
"helpCenter": "Centre d'ajuda",
"add": "Afegir",
- "yes": "Sí",
- "Done": "Fet",
- "Cancel": "Cancel·lar",
- "OK": "OK"
+ "yes": "Sí"
},
"label": {
"welcome": "Benvingut!",
diff --git a/frontend/resources/translations/ckb-KUR.json b/frontend/resources/translations/ckb-KUR.json
index 647a488239..f5509b5ea1 100644
--- a/frontend/resources/translations/ckb-KUR.json
+++ b/frontend/resources/translations/ckb-KUR.json
@@ -192,9 +192,8 @@
"delete": "سڕینەوە",
"duplicate": "هاوشێوە کردن",
"putback": "بیخەرەوە بۆ دواوە",
- "Done": "تەواوه",
- "Cancel": "ڕەتکردن",
- "OK": "ئۆکەی"
+ "cancel": "ڕەتکردن",
+ "ok": "ئۆکەی"
},
"label": {
"welcome": "بەخێربێن!",
diff --git a/frontend/resources/translations/de-DE.json b/frontend/resources/translations/de-DE.json
index d8147c62fc..79d1a26434 100644
--- a/frontend/resources/translations/de-DE.json
+++ b/frontend/resources/translations/de-DE.json
@@ -231,9 +231,7 @@
"rename": "Umbenennen",
"helpCenter": "Hilfe",
"add": "Hinzufügen",
- "yes": "Ja",
- "Done": "Erledigt",
- "Cancel": "Abbrechen"
+ "yes": "Ja"
},
"label": {
"welcome": "Willkommen!",
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
index c0304e020f..20c3e1c9e1 100644
--- a/frontend/resources/translations/en.json
+++ b/frontend/resources/translations/en.json
@@ -235,9 +235,7 @@
"rename": "Rename",
"helpCenter": "Help Center",
"add": "Add",
- "yes": "Yes",
- "Done": "Done",
- "Cancel": "Cancel"
+ "yes": "Yes"
},
"label": {
"welcome": "Welcome!",
diff --git a/frontend/resources/translations/es-VE.json b/frontend/resources/translations/es-VE.json
index 8bbb3aac2f..81e41a0306 100644
--- a/frontend/resources/translations/es-VE.json
+++ b/frontend/resources/translations/es-VE.json
@@ -234,10 +234,7 @@
"rename": "Renombrar",
"helpCenter": "Centro de ayuda",
"add": "Añadir",
- "yes": "Si",
- "Done": "Hecho",
- "Cancel": "Cancelar",
- "OK": "OK"
+ "yes": "Si"
},
"label": {
"welcome": "¡Bienvenido!",
diff --git a/frontend/resources/translations/eu-ES.json b/frontend/resources/translations/eu-ES.json
index e5573ad680..6e481da4a7 100644
--- a/frontend/resources/translations/eu-ES.json
+++ b/frontend/resources/translations/eu-ES.json
@@ -176,9 +176,8 @@
"delete": "Ezabatu",
"duplicate": "Bikoiztu",
"putback": "Jarri Atzera",
- "Done": "Eginda",
- "Cancel": "Ezteztatu",
- "OK": "OK"
+ "cancel": "Ezteztatu",
+ "ok": "OK"
},
"label": {
"welcome": "Ongi etorri!",
diff --git a/frontend/resources/translations/fa.json b/frontend/resources/translations/fa.json
index d7cdf6e92e..a0c5c6069e 100644
--- a/frontend/resources/translations/fa.json
+++ b/frontend/resources/translations/fa.json
@@ -192,9 +192,8 @@
"delete": "حذف کردن",
"duplicate": "تکرار کردن",
"putback": "بازگشت",
- "Done": "انجام شد",
- "Cancel": "لغو",
- "OK": "باشه"
+ "cancel": "لغو",
+ "ok": "باشه"
},
"label": {
"welcome": "خوش آمدید!",
diff --git a/frontend/resources/translations/fr-CA.json b/frontend/resources/translations/fr-CA.json
index 022a097001..f84eccfb67 100644
--- a/frontend/resources/translations/fr-CA.json
+++ b/frontend/resources/translations/fr-CA.json
@@ -237,9 +237,6 @@
"helpCenter": "Centre d'aide",
"add": "Ajouter",
"yes": "Oui",
- "Done": "Fait",
- "Cancel": "Annuler",
- "OK": "OK",
"tryAGain": "Réessayer"
},
"label": {
diff --git a/frontend/resources/translations/fr-FR.json b/frontend/resources/translations/fr-FR.json
index 5c372dd6fc..91c5e89716 100644
--- a/frontend/resources/translations/fr-FR.json
+++ b/frontend/resources/translations/fr-FR.json
@@ -237,9 +237,6 @@
"helpCenter": "Centre d'aide",
"add": "Ajouter",
"yes": "Oui",
- "Done": "Fait",
- "Cancel": "Annuler",
- "OK": "OK",
"tryAGain": "Réessayer"
},
"label": {
diff --git a/frontend/resources/translations/hin.json b/frontend/resources/translations/hin.json
index 4ed84960c1..55cbce7f05 100644
--- a/frontend/resources/translations/hin.json
+++ b/frontend/resources/translations/hin.json
@@ -188,9 +188,8 @@
"editContact": "संपर्क संपादित करें"
},
"button": {
- "OK": "ठीक है",
- "Done": "किया",
- "Cancel": "रद्द करें",
+ "ok": "ठीक है",
+ "cancel": "रद्द करें",
"signIn": "साइन इन करें",
"signOut": "साइन आउट करें",
"complete": "पूर्ण",
diff --git a/frontend/resources/translations/hu-HU.json b/frontend/resources/translations/hu-HU.json
index 93d1341310..84ba5fd067 100644
--- a/frontend/resources/translations/hu-HU.json
+++ b/frontend/resources/translations/hu-HU.json
@@ -180,9 +180,8 @@
"delete": "Töröl",
"duplicate": "Másolat",
"putback": "Visszatesz",
- "Done": "Kész",
- "Cancel": "Mégse",
- "OK": "OK"
+ "cancel": "Mégse",
+ "ok": "OK"
},
"label": {
"welcome": "Üdvözlünk!",
diff --git a/frontend/resources/translations/id-ID.json b/frontend/resources/translations/id-ID.json
index 6959403759..8ffc31acd5 100644
--- a/frontend/resources/translations/id-ID.json
+++ b/frontend/resources/translations/id-ID.json
@@ -228,10 +228,7 @@
"removeFromFavorites": "Hapus dari favorit",
"addToFavorites": "Tambahkan ke Favorit",
"rename": "Ganti nama",
- "helpCenter": "Pusat Bantuan",
- "Done": "Selesai",
- "Cancel": "Batal",
- "OK": "Ya"
+ "helpCenter": "Pusat Bantuan"
},
"label": {
"welcome": "Selamat datang!",
diff --git a/frontend/resources/translations/it-IT.json b/frontend/resources/translations/it-IT.json
index 34c31b6861..72a03f8302 100644
--- a/frontend/resources/translations/it-IT.json
+++ b/frontend/resources/translations/it-IT.json
@@ -231,10 +231,7 @@
"rename": "Rinomina",
"helpCenter": "Centro assistenza",
"add": "Aggiungi",
- "yes": "SÌ",
- "Done": "Fatto",
- "Cancel": "Annulla",
- "OK": "OK"
+ "yes": "SÌ"
},
"label": {
"welcome": "Benvenuto!",
diff --git a/frontend/resources/translations/ja-JP.json b/frontend/resources/translations/ja-JP.json
index 56c2ba8b8e..3a7e2863dd 100644
--- a/frontend/resources/translations/ja-JP.json
+++ b/frontend/resources/translations/ja-JP.json
@@ -214,10 +214,7 @@
"addToFavorites": "お気に入りへ追加",
"rename": "名前を変更",
"helpCenter": "ヘルプセンター",
- "add": "追加",
- "Done": "終わり",
- "Cancel": "キャンセル",
- "OK": "OK"
+ "add": "追加"
},
"label": {
"welcome": "ようこそ!",
diff --git a/frontend/resources/translations/ko-KR.json b/frontend/resources/translations/ko-KR.json
index 5fad732b78..a1e9e2f48b 100644
--- a/frontend/resources/translations/ko-KR.json
+++ b/frontend/resources/translations/ko-KR.json
@@ -176,9 +176,8 @@
"delete": "삭제",
"duplicate": "복제하다",
"putback": "다시 집어 넣어",
- "Done": "완료",
- "Cancel": "취소",
- "OK": "확인"
+ "cancel": "취소",
+ "ok": "확인"
},
"label": {
"welcome": "환영합니다!",
diff --git a/frontend/resources/translations/pl-PL.json b/frontend/resources/translations/pl-PL.json
index 06aa12352c..cb62b3a338 100644
--- a/frontend/resources/translations/pl-PL.json
+++ b/frontend/resources/translations/pl-PL.json
@@ -228,9 +228,7 @@
"removeFromFavorites": "Usuń z ulubionych",
"addToFavorites": "Dodaj do ulubionych",
"rename": "Zmień nazwę",
- "helpCenter": "Centrum Pomocy",
- "Done": "Zrobione",
- "Cancel": "Anuluj"
+ "helpCenter": "Centrum Pomocy"
},
"label": {
"welcome": "Witaj!",
diff --git a/frontend/resources/translations/pt-BR.json b/frontend/resources/translations/pt-BR.json
index b7ef0bcd50..ae32e52baf 100644
--- a/frontend/resources/translations/pt-BR.json
+++ b/frontend/resources/translations/pt-BR.json
@@ -235,9 +235,6 @@
"helpCenter": "Central de Ajuda",
"add": "Adicionar",
"yes": "Sim",
- "Done": "Feito",
- "Cancel": "Cancelar",
- "OK": "Ok",
"tryAGain": "Tentar novamente"
},
"label": {
diff --git a/frontend/resources/translations/pt-PT.json b/frontend/resources/translations/pt-PT.json
index dbbfc69f50..4808fa67fd 100644
--- a/frontend/resources/translations/pt-PT.json
+++ b/frontend/resources/translations/pt-PT.json
@@ -211,9 +211,8 @@
"delete": "Excluir",
"duplicate": "Duplicado",
"putback": "Por de volta",
- "Done": "Feito",
- "Cancel": "Cancelar",
- "OK": "OK"
+ "cancel": "Cancelar",
+ "ok": "OK"
},
"label": {
"welcome": "Bem vindo!",
diff --git a/frontend/resources/translations/ru-RU.json b/frontend/resources/translations/ru-RU.json
index 9658b769e1..041bfbfb93 100644
--- a/frontend/resources/translations/ru-RU.json
+++ b/frontend/resources/translations/ru-RU.json
@@ -232,9 +232,7 @@
"rename": "Переименовать",
"helpCenter": "Центр помощи",
"add": "Добавить",
- "yes": "Да",
- "Done": "Готово",
- "Cancel": "Отменить"
+ "yes": "Да"
},
"label": {
"welcome": "Добро пожаловать!",
diff --git a/frontend/resources/translations/sv-SE.json b/frontend/resources/translations/sv-SE.json
index bd6e45f504..c7791cfea5 100644
--- a/frontend/resources/translations/sv-SE.json
+++ b/frontend/resources/translations/sv-SE.json
@@ -176,9 +176,8 @@
"delete": "Radera",
"duplicate": "Duplicera",
"putback": "Ställ tillbaka",
- "OK": "OK",
- "Done": "Gjort",
- "Cancel": "Avbryt"
+ "ok": "OK",
+ "cancel": "Avbryt"
},
"label": {
"welcome": "Välkommen!",
diff --git a/frontend/resources/translations/th-TH.json b/frontend/resources/translations/th-TH.json
index 48eeab7787..0f8a9d8161 100644
--- a/frontend/resources/translations/th-TH.json
+++ b/frontend/resources/translations/th-TH.json
@@ -231,9 +231,7 @@
"rename": "เปลี่ยนชื่อ",
"helpCenter": "ศูนย์ช่วยเหลือ",
"add": "เพิ่ม",
- "yes": "ใช่",
- "Done": "เสร็จแล้ว",
- "Cancel": "ยกเลิก"
+ "yes": "ใช่"
},
"label": {
"welcome": "ยินดีต้อนรับ!",
diff --git a/frontend/resources/translations/uk-UA.json b/frontend/resources/translations/uk-UA.json
index 6fe0c7e1e8..c714e62a88 100644
--- a/frontend/resources/translations/uk-UA.json
+++ b/frontend/resources/translations/uk-UA.json
@@ -193,9 +193,8 @@
"editContact": "Редагувати контакт"
},
"button": {
- "OK": "OK",
- "Done": "Готово",
- "Cancel": "Скасувати",
+ "ok": "OK",
+ "cancel": "Скасувати",
"signIn": "Увійти",
"signOut": "Вийти",
"complete": "Завершити",
diff --git a/frontend/resources/translations/ur.json b/frontend/resources/translations/ur.json
index 2d705a8a90..0ec8763bcf 100644
--- a/frontend/resources/translations/ur.json
+++ b/frontend/resources/translations/ur.json
@@ -188,9 +188,8 @@
"editContact": "رابطہ ایڈیٹ کریں"
},
"button": {
- "OK": "ٹھیک ہے",
- "Done": "ہو گیا",
- "Cancel": "منسوخ کریں",
+ "ok": "ٹھیک ہے",
+ "cancel": "منسوخ کریں",
"signIn": "سائن ان کریں",
"signOut": "سائن آؤٹ کریں",
"complete": "مکمل",
diff --git a/frontend/resources/translations/vi-VN.json b/frontend/resources/translations/vi-VN.json
index c0c8c279d8..eaf600420d 100644
--- a/frontend/resources/translations/vi-VN.json
+++ b/frontend/resources/translations/vi-VN.json
@@ -229,8 +229,6 @@
"helpCenter": "Trung tâm trợ giúp",
"add": "Thêm",
"yes": "Đúng",
- "Done": "Xong",
- "Cancel": "Hủy",
"tryAGain": "Thử lại"
},
"label": {
diff --git a/frontend/resources/translations/zh-CN.json b/frontend/resources/translations/zh-CN.json
index 47f8f629af..036e471839 100644
--- a/frontend/resources/translations/zh-CN.json
+++ b/frontend/resources/translations/zh-CN.json
@@ -236,10 +236,7 @@
"rename": "重命名",
"helpCenter": "帮助中心",
"add": "添加",
- "yes": "是",
- "Done": "完成",
- "Cancel": "取消",
- "OK": "确定"
+ "yes": "是"
},
"label": {
"welcome": "欢迎!",
diff --git a/frontend/resources/translations/zh-TW.json b/frontend/resources/translations/zh-TW.json
index 67fae83e00..7d222cc4b0 100644
--- a/frontend/resources/translations/zh-TW.json
+++ b/frontend/resources/translations/zh-TW.json
@@ -235,9 +235,7 @@
"rename": "重新命名",
"helpCenter": "支援中心",
"add": "新增",
- "yes": "是",
- "Done": "完成",
- "Cancel": "取消"
+ "yes": "是"
},
"label": {
"welcome": "歡迎!",