From ead807babe0c0c79fabbd0da316ade3f588b04dd Mon Sep 17 00:00:00 2001 From: jhdcruz Date: Mon, 27 Apr 2020 22:23:37 +0800 Subject: [PATCH 1/3] updated remove storage strings --- src/components/pages/StorageEditPage.tsx | 2 +- src/locales/enUS.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/pages/StorageEditPage.tsx b/src/components/pages/StorageEditPage.tsx index f1c548ac6f..75ff62cb22 100644 --- a/src/components/pages/StorageEditPage.tsx +++ b/src/components/pages/StorageEditPage.tsx @@ -32,7 +32,7 @@ export default ({ storage }: StorageEditProps) => { const removeCallback = useCallback(() => { messageBox({ - title: `Remove "${storage.name}" storage`, + title: `Delete "${storage.name}" storage`, message: t('storage.removeMessage'), iconType: DialogIconTypes.Warning, buttons: [t('storage.remove'), t('general.cancel')], diff --git a/src/locales/enUS.ts b/src/locales/enUS.ts index 495ce69448..05b155df94 100644 --- a/src/locales/enUS.ts +++ b/src/locales/enUS.ts @@ -20,7 +20,7 @@ export default { 'storage.rename': 'Rename Storage', 'storage.renameMessage': 'Enter new storage name', 'storage.remove': 'Remove Storage', - 'storage.removeMessage': 'The storage will be removed from this app.', + 'storage.removeMessage': 'Warning! This will permanently remove all notes locally stored on this location.', 'storage.delete': 'Delete Storage', 'storage.move': 'Move Note', 'storage.moveTitle': 'Move Note to Other storage', From 6faa992322a6daa1a5327af26cf32385b5533118 Mon Sep 17 00:00:00 2001 From: jhdcruz Date: Mon, 27 Apr 2020 22:29:07 +0800 Subject: [PATCH 2/3] fixes prettier issue --- src/locales/enUS.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/locales/enUS.ts b/src/locales/enUS.ts index 05b155df94..26cdfaf680 100644 --- a/src/locales/enUS.ts +++ b/src/locales/enUS.ts @@ -20,7 +20,8 @@ export default { 'storage.rename': 'Rename Storage', 'storage.renameMessage': 'Enter new storage name', 'storage.remove': 'Remove Storage', - 'storage.removeMessage': 'Warning! This will permanently remove all notes locally stored on this location.', + 'storage.removeMessage': + 'Warning! This will permanently remove all notes locally stored on this location.', 'storage.delete': 'Delete Storage', 'storage.move': 'Move Note', 'storage.moveTitle': 'Move Note to Other storage', From 0bdcd12f8c839113329e962a9859878ee696d2d6 Mon Sep 17 00:00:00 2001 From: jhdcruz Date: Wed, 29 Apr 2020 17:37:27 +0800 Subject: [PATCH 3/3] i18next support --- src/components/pages/StorageEditPage.tsx | 2 +- src/locales/de.ts | 2 +- src/locales/enUS.ts | 2 +- src/locales/esES.ts | 2 +- src/locales/frFR.ts | 2 +- src/locales/ja.ts | 2 +- src/locales/ko.ts | 2 +- src/locales/ptBR.ts | 2 +- src/locales/ukUA.ts | 2 +- src/locales/zhCN.ts | 2 +- src/locales/zhHK.ts | 2 +- src/locales/zhTW.ts | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/pages/StorageEditPage.tsx b/src/components/pages/StorageEditPage.tsx index 75ff62cb22..97f5ae4c92 100644 --- a/src/components/pages/StorageEditPage.tsx +++ b/src/components/pages/StorageEditPage.tsx @@ -32,7 +32,7 @@ export default ({ storage }: StorageEditProps) => { const removeCallback = useCallback(() => { messageBox({ - title: `Delete "${storage.name}" storage`, + title: t('storage.delete', { storage: storage.name }), message: t('storage.removeMessage'), iconType: DialogIconTypes.Warning, buttons: [t('storage.remove'), t('general.cancel')], diff --git a/src/locales/de.ts b/src/locales/de.ts index 4d019b29cd..4a10efe4c6 100644 --- a/src/locales/de.ts +++ b/src/locales/de.ts @@ -21,7 +21,7 @@ export default { 'storage.renameMessage': 'Name des Speicherorts ändern', 'storage.remove': 'Speicherort entfernen', 'storage.removeMessage': 'Verknüpfung des Speicherorts wird entfernt', - 'storage.delete': 'Speicherort löschen', + 'storage.delete': 'Speicherort löschen {{storage}}', 'storage.move': 'Speicherort verschieben', 'storage.moveTitle': 'Speicherort wird verschoben', 'storage.moveMessage': diff --git a/src/locales/enUS.ts b/src/locales/enUS.ts index 26cdfaf680..2b662c850a 100644 --- a/src/locales/enUS.ts +++ b/src/locales/enUS.ts @@ -22,7 +22,7 @@ export default { 'storage.remove': 'Remove Storage', 'storage.removeMessage': 'Warning! This will permanently remove all notes locally stored on this location.', - 'storage.delete': 'Delete Storage', + 'storage.delete': 'Delete {{storage}} storage', 'storage.move': 'Move Note', 'storage.moveTitle': 'Move Note to Other storage', 'storage.moveMessage': diff --git a/src/locales/esES.ts b/src/locales/esES.ts index 651e6bfc9c..5059891b02 100644 --- a/src/locales/esES.ts +++ b/src/locales/esES.ts @@ -22,7 +22,7 @@ export default { 'storage.remove': 'Eliminar almacenamiento', 'storage.removeMessage': 'Este almacenamiento se va a desvincular de esta aplicación.', - 'storage.delete': 'Eliminar almacenamiento', + 'storage.delete': 'Eliminar almacenamiento {{storage}}', 'storage.move': 'Mover nota', 'storage.moveTitle': 'Mover nota a otro almacenamiento', 'storage.moveMessage': diff --git a/src/locales/frFR.ts b/src/locales/frFR.ts index 67e4f39987..7dbf9a57c8 100644 --- a/src/locales/frFR.ts +++ b/src/locales/frFR.ts @@ -22,7 +22,7 @@ export default { 'storage.remove': "Supprimer l'espace de stockage", 'storage.removeMessage': "L'espace de stockage sera dissocié de cette application.", - 'storage.delete': "Supprimer l'espace de stockage", + 'storage.delete': "Supprimer l'espace de stockage {{storage}}", 'storage.move': 'Déplacer la note', 'storage.moveTitle': 'Déplacer la note dans un autre espace de stockage', 'storage.moveMessage': diff --git a/src/locales/ja.ts b/src/locales/ja.ts index 85377c9742..23d94a7fd8 100644 --- a/src/locales/ja.ts +++ b/src/locales/ja.ts @@ -21,7 +21,7 @@ export default { 'storage.renameMessage': '新しいストレージ名を入力する', 'storage.remove': 'ストレージを除去する', 'storage.removeMessage': 'このストレージはアプリから除外されます', - 'storage.delete': 'ストレージを削除する', + 'storage.delete': 'ストレージを削除する {{storage}}', 'storage.move': 'ストレージを移動する', 'storage.moveTitle': 'ノートを新しいストレージに移動する', 'storage.moveMessage': 'ノートを別のストレージに移動させています', diff --git a/src/locales/ko.ts b/src/locales/ko.ts index a1818e2cfa..f000eb8360 100644 --- a/src/locales/ko.ts +++ b/src/locales/ko.ts @@ -21,7 +21,7 @@ export default { 'storage.renameMessage': '새로운 저장소명을 입력해주세요.', 'storage.remove': '저장소 제거', 'storage.removeMessage': '해당 저장소가 이 앱에서 연결이 해제됩니다.', - 'storage.delete': '저장소 삭제', + 'storage.delete': '저장소 삭제 {{storage}}', 'storage.move': '노트 이동', 'storage.moveTitle': '다른 저장소로 노트 이동', 'storage.moveMessage': '노트를 다른 저장소로 옮기려고 합니다.', diff --git a/src/locales/ptBR.ts b/src/locales/ptBR.ts index 07a8462d72..a09b08b50e 100644 --- a/src/locales/ptBR.ts +++ b/src/locales/ptBR.ts @@ -22,7 +22,7 @@ 'storage.remove': 'Remover armazenamento', 'storage.removeMessage': 'O armazenamento será desvinculado deste aplicativo.', - 'storage.delete': 'Deletar armazenamento', + 'storage.delete': 'Deletar armazenamento {{storage}}', 'storage.move': 'Mover nota', 'storage.moveTitle': 'Mover nota para outro armazenamento', 'storage.moveMessage': diff --git a/src/locales/ukUA.ts b/src/locales/ukUA.ts index 520a1897b8..113da1c9ab 100644 --- a/src/locales/ukUA.ts +++ b/src/locales/ukUA.ts @@ -21,7 +21,7 @@ export default { 'storage.renameMessage': 'Введіть нову назву сховища', 'storage.remove': 'Видаліть сховище', 'storage.removeMessage': 'З цього додатка буде від’єднано сховище.', - 'storage.delete': 'Видалити сховище', + 'storage.delete': 'Видалити сховище {{storage}}', 'storage.move': 'Перемістіти нотатку', 'storage.moveTitle': 'Перемістити нотатку до іншого сховища', 'storage.moveMessage': diff --git a/src/locales/zhCN.ts b/src/locales/zhCN.ts index 1d6927218f..b6d1df783e 100644 --- a/src/locales/zhCN.ts +++ b/src/locales/zhCN.ts @@ -21,7 +21,7 @@ export default { 'storage.renameMessage': '输入新的储存名', 'storage.remove': '移除储存', 'storage.removeMessage': '这个储存将会从这个 APP 解除联系.', - 'storage.delete': '删除储存', + 'storage.delete': '删除储存 {{storage}}', 'storage.move': '移动笔记', 'storage.moveTitle': '移动笔记到其他储存', 'storage.moveMessage': '你正在尝试把笔记移到另一个储存.', diff --git a/src/locales/zhHK.ts b/src/locales/zhHK.ts index 74e7384ec9..dc3f9537c3 100644 --- a/src/locales/zhHK.ts +++ b/src/locales/zhHK.ts @@ -21,7 +21,7 @@ export default { 'storage.renameMessage': '輸入新的儲存空間名稱', 'storage.remove': '移除儲存空間', 'storage.removeMessage': '這個筆記將會從這個 APP 解除聯繫.', - 'storage.delete': '刪除儲存空間', + 'storage.delete': '刪除儲存空間 {{storage}}', 'storage.move': '移動儲存空間', 'storage.moveTitle': '移動筆記到其他儲存空間', 'storage.moveMessage': '你正在嘗試把筆記移到另一個儲存空間.', diff --git a/src/locales/zhTW.ts b/src/locales/zhTW.ts index 92c665544f..fe287e9ef2 100644 --- a/src/locales/zhTW.ts +++ b/src/locales/zhTW.ts @@ -21,7 +21,7 @@ export default { 'storage.renameMessage': '請輸入新儲存空間名稱', 'storage.remove': '移除儲存空間', 'storage.removeMessage': '這個筆記將會從這個 APP 解除連結。', - 'storage.delete': '刪除儲存空間', + 'storage.delete': '刪除儲存空間 {{storage}}', 'storage.move': '移動儲存空間', 'storage.moveTitle': '移動筆記到其他儲存空間', 'storage.moveMessage': '您正在嘗試把筆記移到另一個儲存空間。',