From d3d2202caa70af8100f4a6e9c76189aec707f896 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Fri, 16 Dec 2022 10:11:09 +0100 Subject: [PATCH 1/3] Fixed #561 --- src/screens/Tabs/Shared/Toot.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index 91a93f1f..a3ba3e89 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -118,7 +118,7 @@ const TabSharedToot: React.FC> = ({ return ( <> Date: Fri, 16 Dec 2022 10:35:31 +0100 Subject: [PATCH 2/3] Fix push --- README.md | 2 ++ src/components/openLink.ts | 1 - src/i18n/en/screens/tabs.json | 3 +++ src/utils/slices/instances/push/register.ts | 7 +++---- src/utils/slices/instances/updatePushAlert.ts | 7 +++---- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b1bcf7e3..7d29999d 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,8 @@ Please **do not** create a pull request to update translation. tooot's translati [@janlindblom](https://github.com/janlindblom) for Swedish +[@ihoryan](https://crowdin.com/profile/ihoryan) for Ukrainian + [@duy@mas.to](https://mas.to/@duy) for Vietnamese translation [@jimmyorz](https://github.com/jimmyorz) for Traditional Chinese translation diff --git a/src/components/openLink.ts b/src/components/openLink.ts index 30425685..fc1dea57 100644 --- a/src/components/openLink.ts +++ b/src/components/openLink.ts @@ -17,7 +17,6 @@ const openLink = async (url: string, navigation?: any) => { const handleNavigation = (page: 'Tab-Shared-Toot' | 'Tab-Shared-Account', options: {}) => { if (navigation) { - // @ts-ignore navigation.push(page, options) } else { // @ts-ignore diff --git a/src/i18n/en/screens/tabs.json b/src/i18n/en/screens/tabs.json index 5d7d1f2d..d0f8d2e7 100644 --- a/src/i18n/en/screens/tabs.json +++ b/src/i18n/en/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Toot from subscribed users" }, + "update": { + "heading": "Reblog has been edited" + }, "admin.sign_up": { "heading": "Admin: sign up" }, diff --git a/src/utils/slices/instances/push/register.ts b/src/utils/slices/instances/push/register.ts index f6185a7a..93a339a8 100644 --- a/src/utils/slices/instances/push/register.ts +++ b/src/utils/slices/instances/push/register.ts @@ -62,10 +62,9 @@ const pushRegister = async ( 'BMn2PLpZrMefG981elzG6SB1EY9gU7QZwmtZ/a/J2vUeWG+zXgeskMPwHh4T/bxsD4l7/8QT94F57CbZqYRRfJo=' ) formData.append('subscription[keys][auth]', auth) - Object.keys(alerts).map(key => - // @ts-ignore - formData.append(`data[alerts][${key}]`, alerts[key].value.toString()) - ) + for (const [key, value] of Object.entries(alerts)) { + formData.append(`data[alerts][${key}]`, value.toString()) + } const res = await apiInstance({ method: 'post', diff --git a/src/utils/slices/instances/updatePushAlert.ts b/src/utils/slices/instances/updatePushAlert.ts index d4cbb0ee..60d8c864 100644 --- a/src/utils/slices/instances/updatePushAlert.ts +++ b/src/utils/slices/instances/updatePushAlert.ts @@ -10,10 +10,9 @@ export const updateInstancePushAlert = createAsyncThunk( alerts: InstanceLatest['push']['alerts'] }): Promise => { const formData = new FormData() - Object.keys(alerts).map(alert => - // @ts-ignore - formData.append(`data[alerts][${alert}]`, alerts[alert].value.toString()) - ) + for (const [key, value] of Object.entries(alerts)) { + formData.append(`data[alerts][${key}]`, value.toString()) + } await apiInstance({ method: 'put', From ac6de3ebf11f235b1fe4f3004c2573e12ecc7708 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Fri, 16 Dec 2022 10:47:17 +0100 Subject: [PATCH 3/3] New Crowdin updates (#562) * New translations timeline.json (Chinese Traditional) * New translations tabs.json (Chinese Traditional) * New translations tabs.json (German) * New translations tabs.json (Italian) * New translations tabs.json (Japanese) * New translations tabs.json (Korean) * New translations tabs.json (Chinese Simplified) * New translations tabs.json (Chinese Traditional) * New translations tabs.json (Vietnamese) * New translations tabs.json (Portuguese, Brazilian) * New translations tabs.json (French) * New translations tabs.json (Polish) * New translations tabs.json (Spanish) * New translations tabs.json (Swedish) * New translations tabs.json (Czech) * New translations tabs.json (Dutch) * New translations tabs.json (Catalan) * New translations tabs.json (Ukrainian) * New translations timeline.json (German) * New translations tabs.json (German) * New translations tabs.json (Italian) * New translations tabs.json (Japanese) * New translations tabs.json (Korean) * New translations tabs.json (Chinese Simplified) * New translations tabs.json (Chinese Traditional) * New translations tabs.json (Vietnamese) * New translations tabs.json (Portuguese, Brazilian) * New translations tabs.json (Spanish) * New translations tabs.json (Swedish) * New translations tabs.json (Dutch) * New translations tabs.json (Catalan) * New translations tabs.json (Ukrainian) --- src/i18n/ca/screens/tabs.json | 5 ++++- src/i18n/cs/screens/tabs.json | 3 +++ src/i18n/de/components/timeline.json | 2 +- src/i18n/de/screens/tabs.json | 3 +++ src/i18n/es/screens/tabs.json | 9 ++++++--- src/i18n/fr/screens/tabs.json | 3 +++ src/i18n/it/screens/tabs.json | 5 ++++- src/i18n/ja/screens/tabs.json | 3 +++ src/i18n/ko/screens/tabs.json | 7 +++++-- src/i18n/nl/screens/tabs.json | 5 ++++- src/i18n/pl/screens/tabs.json | 3 +++ src/i18n/pt_BR/screens/tabs.json | 5 ++++- src/i18n/sv/screens/tabs.json | 3 +++ src/i18n/uk/screens/tabs.json | 3 +++ src/i18n/vi/screens/tabs.json | 3 +++ src/i18n/zh-Hans/screens/tabs.json | 3 +++ src/i18n/zh-Hant/components/timeline.json | 6 +++--- src/i18n/zh-Hant/screens/tabs.json | 9 ++++++--- 18 files changed, 64 insertions(+), 16 deletions(-) diff --git a/src/i18n/ca/screens/tabs.json b/src/i18n/ca/screens/tabs.json index baa840c8..3b136f86 100644 --- a/src/i18n/ca/screens/tabs.json +++ b/src/i18n/ca/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Publicació d'usuaris subscrits" }, + "update": { + "heading": "L'impuls ha sigut editat" + }, "admin.sign_up": { "heading": "Administració: Registra" }, @@ -348,7 +351,7 @@ "notInLists": "Altres llistes" }, "attachments": { - "name": "" + "name": "Multimèdia de <0 /><1>" }, "hashtag": { "follow": "Segueix", diff --git a/src/i18n/cs/screens/tabs.json b/src/i18n/cs/screens/tabs.json index 89dc4321..0decff11 100644 --- a/src/i18n/cs/screens/tabs.json +++ b/src/i18n/cs/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "" }, + "update": { + "heading": "" + }, "admin.sign_up": { "heading": "" }, diff --git a/src/i18n/de/components/timeline.json b/src/i18n/de/components/timeline.json index 703494bd..ed401308 100644 --- a/src/i18n/de/components/timeline.json +++ b/src/i18n/de/components/timeline.json @@ -55,7 +55,7 @@ "accessibilityLabel": "Lesezeichen hinzufügen", "function": "Lesezeichen setzen" }, - "openReport": "" + "openReport": "Meldung öffnen" }, "actionsUsers": { "reblogged_by": { diff --git a/src/i18n/de/screens/tabs.json b/src/i18n/de/screens/tabs.json index 9225e3d9..a650e306 100644 --- a/src/i18n/de/screens/tabs.json +++ b/src/i18n/de/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Toot eines abonnierten Nutzers" }, + "update": { + "heading": "Boost wurde bearbeitet" + }, "admin.sign_up": { "heading": "Admin: Registrierung" }, diff --git a/src/i18n/es/screens/tabs.json b/src/i18n/es/screens/tabs.json index ddefffbe..7022aa6d 100644 --- a/src/i18n/es/screens/tabs.json +++ b/src/i18n/es/screens/tabs.json @@ -3,8 +3,8 @@ "local": { "name": "Siguiendo", "options": { - "showBoosts": "", - "showReplies": "" + "showBoosts": "Mostrar retoots", + "showReplies": "Mostrar respuestas" } }, "public": { @@ -231,6 +231,9 @@ "status": { "heading": "Toot de usuarios suscritos" }, + "update": { + "heading": "El impulso ha sido editado" + }, "admin.sign_up": { "heading": "Administración: Registrarse" }, @@ -348,7 +351,7 @@ "notInLists": "Otras listas" }, "attachments": { - "name": "" + "name": "Multimedia de <0 /><1>" }, "hashtag": { "follow": "Seguir", diff --git a/src/i18n/fr/screens/tabs.json b/src/i18n/fr/screens/tabs.json index c0205c2b..5a207b26 100644 --- a/src/i18n/fr/screens/tabs.json +++ b/src/i18n/fr/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Pouet des utilisateurs inscrits" }, + "update": { + "heading": "" + }, "admin.sign_up": { "heading": "" }, diff --git a/src/i18n/it/screens/tabs.json b/src/i18n/it/screens/tabs.json index 981af617..d2b98efe 100644 --- a/src/i18n/it/screens/tabs.json +++ b/src/i18n/it/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Toot da utenti seguiti" }, + "update": { + "heading": "Il link è stato modificato" + }, "admin.sign_up": { "heading": "" }, @@ -348,7 +351,7 @@ "notInLists": "" }, "attachments": { - "name": "" + "name": "Media di <0 /><1>\"" }, "hashtag": { "follow": "Segui", diff --git a/src/i18n/ja/screens/tabs.json b/src/i18n/ja/screens/tabs.json index 2df441a6..c5aba370 100644 --- a/src/i18n/ja/screens/tabs.json +++ b/src/i18n/ja/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "購読したユーザーのトゥート" }, + "update": { + "heading": "ブーストしたトゥートが編集されました" + }, "admin.sign_up": { "heading": "" }, diff --git a/src/i18n/ko/screens/tabs.json b/src/i18n/ko/screens/tabs.json index 86708a64..6132afc7 100644 --- a/src/i18n/ko/screens/tabs.json +++ b/src/i18n/ko/screens/tabs.json @@ -70,7 +70,7 @@ "name": "{{list}} 리스트의 사용자" }, "listAdd": { - "name": "" + "name": "목록 만들기" }, "listEdit": { "name": "리스트 상세 편집" @@ -231,6 +231,9 @@ "status": { "heading": "구독한 사용자의 툿" }, + "update": { + "heading": "부스트한 툿이 수정됨" + }, "admin.sign_up": { "heading": "" }, @@ -348,7 +351,7 @@ "notInLists": "다른 리스트" }, "attachments": { - "name": "" + "name": "<0 /><1>의 미디어" }, "hashtag": { "follow": "팔로우", diff --git a/src/i18n/nl/screens/tabs.json b/src/i18n/nl/screens/tabs.json index 4e80882c..218d6b52 100644 --- a/src/i18n/nl/screens/tabs.json +++ b/src/i18n/nl/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Toot van geabonneerde gebruikers" }, + "update": { + "heading": "De reblog is bewerkt" + }, "admin.sign_up": { "heading": "Admin: registreren" }, @@ -396,7 +399,7 @@ "reblogged_by": "{{count}} boostten", "favourited_by": "{{count}} markeerden als favoriet" }, - "resultIncomplete": "" + "resultIncomplete": "Resultaten van een externe instantie zijn onvolledig" } } } \ No newline at end of file diff --git a/src/i18n/pl/screens/tabs.json b/src/i18n/pl/screens/tabs.json index a6e930fe..5d450a79 100644 --- a/src/i18n/pl/screens/tabs.json +++ b/src/i18n/pl/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "" }, + "update": { + "heading": "" + }, "admin.sign_up": { "heading": "" }, diff --git a/src/i18n/pt_BR/screens/tabs.json b/src/i18n/pt_BR/screens/tabs.json index cc1800a1..6cead637 100644 --- a/src/i18n/pt_BR/screens/tabs.json +++ b/src/i18n/pt_BR/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Toot de usuários inscritos" }, + "update": { + "heading": "Toot foi editado" + }, "admin.sign_up": { "heading": "" }, @@ -348,7 +351,7 @@ "notInLists": "" }, "attachments": { - "name": "" + "name": "<0 /><1>\"s mídia" }, "hashtag": { "follow": "Seguir", diff --git a/src/i18n/sv/screens/tabs.json b/src/i18n/sv/screens/tabs.json index d7cad85a..6febc9c1 100644 --- a/src/i18n/sv/screens/tabs.json +++ b/src/i18n/sv/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Inlägg från följda användare" }, + "update": { + "heading": "Boosten har redigerats" + }, "admin.sign_up": { "heading": "Admin: registrera dig" }, diff --git a/src/i18n/uk/screens/tabs.json b/src/i18n/uk/screens/tabs.json index 7ebf23e2..aafa1ffc 100644 --- a/src/i18n/uk/screens/tabs.json +++ b/src/i18n/uk/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Дмух від підписників" }, + "update": { + "heading": "Передмух був відредагований" + }, "admin.sign_up": { "heading": "Адмін: реєстрація" }, diff --git a/src/i18n/vi/screens/tabs.json b/src/i18n/vi/screens/tabs.json index 342857ef..16318833 100644 --- a/src/i18n/vi/screens/tabs.json +++ b/src/i18n/vi/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "Tút từ người đã theo dõi" }, + "update": { + "heading": "Đăng lại đã được sửa" + }, "admin.sign_up": { "heading": "Admin: đăng ký" }, diff --git a/src/i18n/zh-Hans/screens/tabs.json b/src/i18n/zh-Hans/screens/tabs.json index 6f46a372..38d68b4c 100644 --- a/src/i18n/zh-Hans/screens/tabs.json +++ b/src/i18n/zh-Hans/screens/tabs.json @@ -231,6 +231,9 @@ "status": { "heading": "订阅用户的嘟文" }, + "update": { + "heading": "转嘟被编辑" + }, "admin.sign_up": { "heading": "管理员：用户注册" }, diff --git a/src/i18n/zh-Hant/components/timeline.json b/src/i18n/zh-Hant/components/timeline.json index f26ff232..fd803d67 100644 --- a/src/i18n/zh-Hant/components/timeline.json +++ b/src/i18n/zh-Hant/components/timeline.json @@ -31,8 +31,8 @@ "notification": "{{name}} 轉嘟了您的嘟文" }, "update": "轉嘟已編輯", - "admin.sign_up": "", - "admin.report": "" + "admin.sign_up": "{{name}} 加入了站點", + "admin.report": "{{name}} 檢舉：" }, "actions": { "reply": { @@ -55,7 +55,7 @@ "accessibilityLabel": "將嘟文加入書籤", "function": "加入書籤" }, - "openReport": "" + "openReport": "打開檢舉" }, "actionsUsers": { "reblogged_by": { diff --git a/src/i18n/zh-Hant/screens/tabs.json b/src/i18n/zh-Hant/screens/tabs.json index 04f2cd86..418f3268 100644 --- a/src/i18n/zh-Hant/screens/tabs.json +++ b/src/i18n/zh-Hant/screens/tabs.json @@ -231,11 +231,14 @@ "status": { "heading": "訂閱使用者的嘟文" }, + "update": { + "heading": "轉嘟被編輯" + }, "admin.sign_up": { - "heading": "管理員：註冊" + "heading": "管理員：使用者註冊" }, "admin.report": { - "heading": "管理員：回報" + "heading": "管理員：檢舉" }, "howitworks": "了解通知訊息轉發如何工作" }, @@ -396,7 +399,7 @@ "reblogged_by": "{{count}} 人轉嘟", "favourited_by": "{{count}} 人喜歡" }, - "resultIncomplete": "" + "resultIncomplete": "來自遠端站點的結果不完整" } } } \ No newline at end of file