From 2e78da732a70ecc38a66a6934bc660cda10cd65b Mon Sep 17 00:00:00 2001 From: Kieran Date: Tue, 28 Feb 2023 10:24:55 +0000 Subject: [PATCH] New Crowdin updates (#364) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (Arabic) * feat: add it lang * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Arabic) * New translations en.json (German) * New translations en.json (Hungarian) * New translations en.json (Japanese) * New translations en.json (Chinese Simplified) * New translations en.json (Indonesian) * New translations en.json (Korean) * New translations en.json (Italian) * New translations en.json (Arabic) * New translations en.json (Japanese) * New translations en.json (Indonesian) * New translations en.json (Indonesian) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (Italian) * New translations en.json (French) * New translations en.json (Spanish) * New translations en.json (Arabic) * New translations en.json (German) * New translations en.json (Hungarian) * New translations en.json (Japanese) * New translations en.json (Chinese Simplified) * New translations en.json (Indonesian) * New translations en.json (Korean) * New translations en.json (Italian) * New translations en.json (Arabic) * New translations en.json (Italian) * New translations en.json (Japanese) * New translations en.json (Indonesian) * New translations en.json (Italian) * Read preferences directly from localStorage * Add Indonesian to language picker * Update translators --- packages/app/src/IntlProvider.tsx | 13 +- packages/app/src/Pages/DonatePage.tsx | 7 +- .../app/src/Pages/settings/Preferences.tsx | 2 +- packages/app/src/State/Login.ts | 16 +- packages/app/src/translations/ar.json | 7 +- packages/app/src/translations/de.json | 5 + packages/app/src/translations/es.json | 5 + packages/app/src/translations/fr.json | 5 + packages/app/src/translations/hu.json | 5 + packages/app/src/translations/id.json | 223 +++++++------- packages/app/src/translations/it.json | 272 ++++++++++++++++++ packages/app/src/translations/ja.json | 5 + packages/app/src/translations/ko.json | 5 + packages/app/src/translations/zh.json | 5 + 14 files changed, 451 insertions(+), 124 deletions(-) create mode 100644 packages/app/src/translations/it.json diff --git a/packages/app/src/IntlProvider.tsx b/packages/app/src/IntlProvider.tsx index 6c9ad1c..1683c7e 100644 --- a/packages/app/src/IntlProvider.tsx +++ b/packages/app/src/IntlProvider.tsx @@ -1,9 +1,7 @@ import { type ReactNode } from "react"; -import { useSelector } from "react-redux"; import { IntlProvider as ReactIntlProvider } from "react-intl"; -import { RootState } from "State/Store"; - +import { ReadPreferences } from "State/Login"; import enMessages from "translations/en.json"; import esMessages from "translations/es.json"; import zhMessages from "translations/zh.json"; @@ -12,6 +10,7 @@ import frMessages from "translations/fr.json"; import huMessages from "translations/hu.json"; import idMessages from "translations/id.json"; import arMessages from "translations/ar.json"; +import itMessages from "translations/it.json"; const DEFAULT_LOCALE = "en-US"; @@ -19,8 +18,6 @@ const getMessages = (locale: string) => { const truncatedLocale = locale.toLowerCase().split(/[_-]+/)[0]; switch (truncatedLocale) { - case "en": - return enMessages; case "es": return esMessages; case "zh": @@ -35,14 +32,16 @@ const getMessages = (locale: string) => { return idMessages; case "ar": return arMessages; + case "it": + return itMessages; default: return enMessages; } }; export const IntlProvider = ({ children }: { children: ReactNode }) => { - const lang = useSelector((s: RootState) => s.login.preferences.language); - const locale = lang ?? getLocale(); + const { language } = ReadPreferences(); + const locale = language ?? getLocale(); return ( diff --git a/packages/app/src/Pages/DonatePage.tsx b/packages/app/src/Pages/DonatePage.tsx index 3fe7e45..f0277a9 100644 --- a/packages/app/src/Pages/DonatePage.tsx +++ b/packages/app/src/Pages/DonatePage.tsx @@ -17,7 +17,7 @@ const Contributors = [ bech32ToHex("npub148jmlutaa49y5wl5mcll003ftj59v79vf7wuv3apcwpf75hx22vs7kk9ay"), // liran cohen bech32ToHex("npub1xdtducdnjerex88gkg2qk2atsdlqsyxqaag4h05jmcpyspqt30wscmntxy"), // artur bech32ToHex("npub1vp8fdcyejd4pqjyrjk9sgz68vuhq7pyvnzk8j0ehlljvwgp8n6eqsrnpsw"), // samsamskies - bech32ToHex("npub179rec9sw2a5ngkr2wsjpjhwp2ksygjxn6uw5py9daj2ezhw3aw5swv3s6q"), // h3y6e - JA + bech32ToHex("npub179rec9sw2a5ngkr2wsjpjhwp2ksygjxn6uw5py9daj2ezhw3aw5swv3s6q"), // h3y6e - JA + other stuff bech32ToHex("npub17q5n2z8naw0xl6vu9lvt560lg33pdpe29k0k09umlfxm3vc4tqrq466f2y"), // w3irdrobot ]; @@ -25,12 +25,17 @@ const Translators = [ bech32ToHex("npub1s8zws5frm94esxnp9v6zf7vk60m3hum3305n78sr73t78kleus7q8zpwna"), // middlingphys - JA bech32ToHex("npub1z0ykz6lp3y8rjjntenns0ee02062g2f0n55u49w44xdemw35vcpsda5jhh"), // noraglyphs - JA bech32ToHex("npub13wa880se2h3l54k7x76edrkrt4p94sh4q090974mt0z6n09qtntqxp47uk"), // numpad0 - JA + bech32ToHex("npub147ccm75um0zkn0lr9fg9wrag2g6yxfw234fpmhdwuvaqjyegrhgs46t2td"), // ROBO358 - JA bech32ToHex("npub1ww8kjxz2akn82qptdpl7glywnchhkx3x04hez3d3rye397turrhssenvtp"), // Zoltan - HU bech32ToHex("npub1x8dzy9xegwmdk2vy30l8u08caspcqq2yzncxehdsa6kvnte9pr3qnt8pg4"), // solobalbo - FR bech32ToHex("npub1xwm9svxrlymymph0hka40zw9frg98m6adxmzcq26jhtm5gwlhjrshhgzfd"), // meitsjustme - ZH + + bech32ToHex("npub13tkge7eqeem5cz8gk7gdju76nytvvf064hm5mzmv3x26k2uvaxfqczet2j"), // Mendace - IT + + bech32ToHex("npub10529hxckjm5t5mchss5lnpsqrmavulglxhrmu5quuu4hs6yuyh3qc9gxd5"), // aadbitcoin - ID ]; interface Splits { diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx index 753daf5..fd174cb 100644 --- a/packages/app/src/Pages/settings/Preferences.tsx +++ b/packages/app/src/Pages/settings/Preferences.tsx @@ -39,7 +39,7 @@ const PreferencesPage = () => { ) } style={{ textTransform: "capitalize" }}> - {["en", "ja", "es", "hu", "zh", "fr", "ar"].sort().map(a => ( + {["en", "ja", "es", "hu", "zh", "fr", "ar", "it", "id"].sort().map(a => (