From e561d8e4136f926436cc59974fe78846f286e918 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Fri, 23 Apr 2021 19:42:32 +0200 Subject: [PATCH 1/8] should be almost set --- packages/files-ui/.linguirc | 2 +- packages/files-ui/src/App.tsx | 112 ++-- .../Modules/FileBrowsers/FileInfoModal.tsx | 20 +- .../Components/Modules/FilePreviewModal.tsx | 16 +- .../Modules/LoginModule/ConciseExplainer.tsx | 2 +- .../Modules/LoginModule/MissingShares.tsx | 2 +- .../Modules/Settings/LanguageSelection.tsx | 37 + .../Components/Modules/Settings/Profile.tsx | 2 + .../Modules/Settings/Security/index.tsx | 6 +- .../files-ui/src/Contexts/LanguageContext.tsx | 103 +-- packages/files-ui/src/locales/en/messages.po | 12 +- packages/files-ui/src/locales/fr/messages.mo | Bin 0 -> 8964 bytes packages/files-ui/src/locales/fr/messages.po | 630 ++++++++++++++++++ 13 files changed, 814 insertions(+), 130 deletions(-) create mode 100644 packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx create mode 100644 packages/files-ui/src/locales/fr/messages.mo create mode 100644 packages/files-ui/src/locales/fr/messages.po diff --git a/packages/files-ui/.linguirc b/packages/files-ui/.linguirc index 1b7ae61f54..2c705d1e0d 100644 --- a/packages/files-ui/.linguirc +++ b/packages/files-ui/.linguirc @@ -9,6 +9,6 @@ "formatOptions": { "origins": false }, - "locales": ["en"], + "locales": ["en", "fr"], "sourceLocale": "en" } \ No newline at end of file diff --git a/packages/files-ui/src/App.tsx b/packages/files-ui/src/App.tsx index d95f81cfe1..73f8394c4d 100644 --- a/packages/files-ui/src/App.tsx +++ b/packages/files-ui/src/App.tsx @@ -1,4 +1,4 @@ -import React, { useEffect } from "react" +import React, { useCallback, useEffect } from "react" import { init as initSentry, ErrorBoundary, showReportDialog } from "@sentry/react" import { Web3Provider } from "@chainsafe/web3-context" import { ImployApiProvider, UserProvider, BillingProvider } from "@chainsafe/common-contexts" @@ -25,13 +25,42 @@ if ( environment: process.env.REACT_APP_SENTRY_ENV }) } + +const availableLanguages = [ + { id: "en", label: "English" }, + { id: "fr", label: "Français" } +] + +const onboardConfig = { + dappId: process.env.REACT_APP_BLOCKNATIVE_ID || "", + walletSelect: { + wallets: [ + { walletName: "coinbase" }, + { + walletName: "trust", + rpcUrl: + "https://mainnet.infura.io/v3/a7e16429d2254d488d396710084e2cd3" + }, + { walletName: "metamask", preferred: true }, + { walletName: "authereum" }, + { walletName: "opera" }, + { walletName: "operaTouch" }, + { walletName: "torus" }, + { walletName: "status" }, + { + walletName: "walletConnect", + infuraKey: "a7e16429d2254d488d396710084e2cd3", + preferred: true + } + ] + } +} + const App: React.FC<{}> = () => { const { initHotjar } = useHotjar() const { canUseLocalStorage } = useLocalStorage() const hotjarId = process.env.REACT_APP_HOTJAR_ID - const apiUrl = - process.env.REACT_APP_API_URL || "https://stage.imploy.site/api/v1" - + const apiUrl = process.env.REACT_APP_API_URL || "https://stage.imploy.site/api/v1" // This will default to testnet unless mainnet is specifically set in the ENV const directAuthNetwork = (process.env.REACT_APP_DIRECT_AUTH_NETWORK === "mainnet") ? "mainnet" : "testnet" @@ -41,64 +70,43 @@ const App: React.FC<{}> = () => { } }, [hotjarId, initHotjar]) + const fallBack = useCallback(({ error, componentStack, eventId, resetError }) => ( + + + An error occurred and has been logged. If you would like to + provide additional info to help us debug and resolve the issue, + click the `"`Provide Additional Details`"` button + + {error?.message.toString()} + {componentStack} + {eventId} + + + + ), []) + return ( ( - - - An error occurred and has been logged. If you would like to - provide additional info to help us debug and resolve the issue, - click the `"`Provide Additional Details`"` button - - {error?.message.toString()} - {componentStack} - {eventId} - - - - )} + fallback={fallBack} onReset={() => window.location.reload()} > - - + + diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx index 2d3a293401..db294e147a 100644 --- a/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx +++ b/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx @@ -206,7 +206,7 @@ const FileInfoModal: React.FC = ({ > General - {fullFileInfo.persistent?.uploaded ? ( + {fullFileInfo.persistent?.uploaded && (
= ({ {fullFileInfo.persistent?.uploaded}
- ) : null} - {fullFileInfo.content?.size !== undefined ? ( + )} + {fullFileInfo.content?.size !== undefined && (
= ({ {formatBytes(fullFileInfo.content?.size)}
- ) : null} + )}
= ({ > Technical - {fullFileInfo.persistent?.stored_cid !== undefined ? ( + {fullFileInfo.persistent?.stored_cid !== undefined && (
= ({ {fullFileInfo.persistent?.stored_cid}
- ) : null} - {fullFileInfo.persistent?.stored_cid !== undefined ? ( + )} + {fullFileInfo.persistent?.stored_cid !== undefined && (
= ({ {fullFileInfo.persistent?.stored_cid}
- ) : null} + )}
= ({ > CID (Content Identifier) - {copied ? ( + {copied && ( = ({ > copied ! - ) : null} + )} + // <> // // Move - // + // // ), // onClick: () => console.log, // }, // { // contents: ( - // + // <> // // Share - // + // // ), // onClick: () => console.log, // }, // { // contents: ( - // + // <> // // Rename - // + // // ), // onClick: () => console.log, // }, // { // contents: ( - // + // <> // // Delete - // + // // ), // onClick: () => console.log, // }, diff --git a/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx b/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx index f5dfd11dc9..ccac24b5c6 100644 --- a/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx +++ b/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx @@ -158,7 +158,7 @@ const ConciseExplainer: React.FC = ({ className, onConti alt="password and keys" /> - Enter a password + Enter password
diff --git a/packages/files-ui/src/Components/Modules/LoginModule/MissingShares.tsx b/packages/files-ui/src/Components/Modules/LoginModule/MissingShares.tsx index 6130ad13f1..72501688cf 100644 --- a/packages/files-ui/src/Components/Modules/LoginModule/MissingShares.tsx +++ b/packages/files-ui/src/Components/Modules/LoginModule/MissingShares.tsx @@ -190,7 +190,7 @@ const MissingShares = ({ className }: IMissingShares) => { size="large" onClick={() => setWithPassword(true)} > - Enter a password + Enter password )}
+
diff --git a/packages/files-ui/src/Components/Modules/Settings/Security/index.tsx b/packages/files-ui/src/Components/Modules/Settings/Security/index.tsx index c53756e9cf..a4714772cf 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Security/index.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Security/index.tsx @@ -325,8 +325,8 @@ const Security = ({ className }: SecurityProps) => { - A backup phrase will be generated for your account.
- We do not store it and it can only be displayed once. Please save it somewhere safe! + A backup phrase will be generated and used for your account.
+ We do not store it and it can only be displayed once. Save it somewhere safe! {
- Backup Phrase + Backup phrase diff --git a/packages/files-ui/src/Contexts/LanguageContext.tsx b/packages/files-ui/src/Contexts/LanguageContext.tsx index 26d6812af8..9e930d20ed 100644 --- a/packages/files-ui/src/Contexts/LanguageContext.tsx +++ b/packages/files-ui/src/Contexts/LanguageContext.tsx @@ -1,8 +1,8 @@ -import React, { useState, useEffect } from "react" +import React, { useState, useEffect, useCallback } from "react" import { i18n } from "@lingui/core" -import { messages as catalogEn } from "../locales/en/messages" import { I18nProvider } from "@lingui/react" import * as plurals from "make-plural/plurals" +import { useLocalStorage } from "@chainsafe/browser-storage-hooks" export type LanguageContext = { availableLanguages: Language[] @@ -22,29 +22,39 @@ type LanguageProviderProps = { availableLanguages: Language[] } -const LanguageContext = React.createContext( - undefined -) +const DEFAULT_LANGUAGE = "en" +const DEFAULT_LOCALE = "en-GB" +const PREFERED_LANGUAGE_KEY = "csf.preferedLanguage" -const getLanguages = (): string[] => { - // eslint-disable-next-line @typescript-eslint/ban-ts-ignore - // @ts-ignore - const { languages, language, userLanguage } = window.navigator +const defaultContext: LanguageContext = { + availableLanguages: [], + selectedLanguage: DEFAULT_LANGUAGE, + selectedLocale: DEFAULT_LOCALE, + setActiveLanguage: () => {console.error("setActiveLanguage not implemented")}, + formatLocaleDate: () => {console.error("formatLocaleDate not implemented"); return ""} +} + +const LanguageContext = React.createContext(defaultContext) + +const getLanguages = (prefered = ""): string[] => { + const { languages, language } = window.navigator if (Array.isArray(languages)) { // Dedupe array of languages - return [...new Set(languages.map((l) => l.split("-")[0]))] + const deduped = [...new Set(languages.map((l) => l.split("-")[0]))] + const preferedFirst = prefered + ? [prefered, ...deduped.filter((lang) => prefered !== lang)] + : deduped + + return preferedFirst } if (language) { - return [language.split("-")[0]] + return [prefered, language.split("-")[0]] } - if (userLanguage) { - return [userLanguage.split("-")[0]] - } // If language not detected use english - return ["en"] + return [prefered, DEFAULT_LANGUAGE] } const getLocales = (): string[] => { @@ -65,30 +75,45 @@ const getLocales = (): string[] => { return [userLanguage] } // If language not detected use english - return ["en-GB"] + return [DEFAULT_LOCALE] } -const LanguageProvider = ({ - children, - availableLanguages -}: LanguageProviderProps) => { - const [selectedLanguage, setSelectedLanguage] = useState("") +const LanguageProvider = ({ children, availableLanguages }: LanguageProviderProps) => { + const [selectedLanguage, setSelectedLanguage] = useState("") + const { localStorageGet, localStorageSet } = useLocalStorage() const userLocales = getLocales() - useEffect(() => { - const userLanguages = getLanguages() + const setLanguage = useCallback((newLanguage: string, setPrefered = true) => { + if (!availableLanguages.find((l) => l.id === newLanguage)) { + console.error("Locale is not available, evalutaing:", newLanguage) + return + } + import(`../locales/${newLanguage}/messages.js`) + .then((newCatalog) => { + i18n.load(newLanguage, newCatalog.default.messages) + i18n.loadLocaleData(newLanguage, { plurals: (plurals as Record)[newLanguage] }) + i18n.activate(newLanguage) + setSelectedLanguage(newLanguage) + setPrefered && localStorageSet(PREFERED_LANGUAGE_KEY, newLanguage) + }) + .catch(console.error) + }, [availableLanguages, localStorageSet]) + + + useEffect(() => { + const prefered = localStorageGet(PREFERED_LANGUAGE_KEY) + const userLanguages = getLanguages(prefered || "") const matchingLanguages = [...new Set(userLanguages)].filter((x) => new Set(availableLanguages.map((l) => l.id)).has(x) ) - const defaultLanguage = matchingLanguages[0] || "en" - // eslint-disable-next-line @typescript-eslint/ban-ts-ignore - //@ts-ignore - i18n.loadLocaleData(defaultLanguage, { plurals: plurals[defaultLanguage] }) - i18n.load(defaultLanguage, catalogEn) - i18n.activate(defaultLanguage) - setSelectedLanguage(defaultLanguage) - }, [availableLanguages]) + + const defaultLanguage = matchingLanguages[0] || DEFAULT_LANGUAGE + + // passing false because this language wasn't + // set explicitely by the user + setLanguage(defaultLanguage, false) + }, [availableLanguages, localStorageGet, setLanguage]) const formatLocaleDate = (date: Date) => { const result = new Intl.DateTimeFormat(userLocales[0], { @@ -105,23 +130,11 @@ const LanguageProvider = ({ return result } - const setLanguage = async (newLanguage: string) => { - if (!availableLanguages.map((l) => l.id).includes(newLanguage)) { - console.log("This locale is not available") - return - } - - // const newCatalog = await import(`../locales/${newLanguage}/messages.js`) - // i18n.load(newLanguage, neimport { messagesascatalogEn } from "locales/en/messages.mjs"; - // i18n.activate(newLanguage) - setSelectedLanguage(newLanguage) - } - return ( We do not store it and <1>it can only be displayed once. Save it somewhere safe!" msgstr "A backup phrase will be generated and used for your account.<0/>We do not store it and <1>it can only be displayed once. Save it somewhere safe!" -msgid "A backup phrase will be generated for your account.<0/>We do not store it and <1>it can only be displayed once. Please save it somewhere safe!" -msgstr "A backup phrase will be generated for your account.<0/>We do not store it and <1>it can only be displayed once. Please save it somewhere safe!" - msgid "A file with the same name already exists" msgstr "A file with the same name already exists" @@ -40,9 +37,6 @@ msgstr "Approve" msgid "Are you sure?" msgstr "Are you sure?" -msgid "Backup Phrase" -msgstr "Backup Phrase" - msgid "Backup phrase" msgstr "Backup phrase" @@ -163,12 +157,12 @@ msgstr "Drop to upload files" msgid "Encryption Password" msgstr "Encryption Password" -msgid "Enter a password" -msgstr "Enter a password" - msgid "Enter backup phrase:" msgstr "Enter backup phrase:" +msgid "Enter password" +msgstr "Enter password" + msgid "Enter password:" msgstr "Enter password:" diff --git a/packages/files-ui/src/locales/fr/messages.mo b/packages/files-ui/src/locales/fr/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..94bc25cf8865a356cba17de1becbd75c973aae85 GIT binary patch literal 8964 zcmbuETZ|;vS;vn}638TRurVeCLe66FtYLcgVlK{Py=HdyN_KX~JL5}2?6{`;ba(Ak zSM}CqW_w=}f#bv^AURi|B#IHl@eqj^6h}dk5Tb=*UeLbqfV@}&0Rkeh1X0KX0)GE< zs=9l29luc8GyghOr@r%j-}$b+FW>gMPaCdFjGtuu{tp=QS#aS8`NQ?mHyZOp;8WnI zz)yht!TC93v}6tZ4e$~07VujA{M+DLnEz*uH@(T2RpxI6*}^;uif#lx3SI<10KN#m z4cz}`W8MHRgKq^-*Z2td4(5IE_284B=zJU$Kc5C~1-}6P82DB2cJN#E^J}2i|2udG z_+Rz=TVPh}?gW1vycZO`3!v7&4-`LbkbmZ4jh8`0G*8y^r$O!iMNsSi2o(R{0Hxm- z!5;?y5ft6;f?EH-;E#g0qD1jA5B>;vq@J&V{4zGeg<3s{}3#|m%!J7 z=UL2=nGNvm;A5cHk3h-!bp8G-p!E3ycmVt+DE_|<{sj0Rp!9JI%=f`NK=JoMP|rUJ zN}rztS!(_mL?rX)AV+Ghf?9VC)V}`!ehB;@a3Ap&Crs=8U7+Y50CisP z0!3#7lpS3H`NaGd=;Z;~(mW4J&o9>aGAKX)4ygTagP6|q?V$GC4@#Z`H7?ih*Fl|k z1oF=${Lwxi0a3kq8oU$y5~zLu5)|FP1KG;FQonyA%-+Sk1?u?*DEml3>FdLwzWW5o z(U@mI*~JUsFM%(CPk^@}y!ihtD8Kk3Xu+?7KLuU|CFd)kG5_@cJ&TW-`@v9 z(wwN@N8rbpUj(JM?}D=XH$zn4-CE-zQ2agsN)L~L+NTe)rOCiAfgcCuZ-@C<`#lJX z-lL%GcN3Jpp8)x1KEof;{d$dKPdZ$$?ei=+4}J|q1al1(U;ho>1iqdD33Gw5#aLyWVm!jo`TPn)m%e!~W0A4W zkd5f-G9F@_WyqcmF-|fRGsLGZ%SadxGBUYmFhhl}|U>iUHMK8EO4wkG?~ndlk>FlWG&@$P!wz+K#&V7!O1pP{pBuKSxCu+5Mi z9AvzoaWkXC(Dep}Y)IEH2k@~&_M__o#+{7wjC&Zz8NbN5$dGLiD$K7jy(mr> z&9OK&$MS54@0QH5k!@#bij;BM3xe)MN#e={&rQ_Jos%#+&m#wqZn%6<*sN>UT`qBs z95{HiImop<-j3QMyOt$!d!&;Sb*!Q1N>9D)$A#StI|uUKiX;jLAHlG8LLRK6uu)ND z?bw@E?%Jpb3AP-H4oYrGl$A5b?f#W4Ejd1WrlUjb#xB3xtV9@3VuJPBHE8W*d8e5V zCv!O6ve;`Uk9vOdVUk6dus@oWBrBX*$p$F3)J@ur^Ff0Xs!Mtz4cdpj=0wMz{p5Ls zne5o0*XE%ttsAiqTp>W5R(=P66D;~<)OMR$wl#Sl9-qS6tIg{lW?3(}p1{Ly^PZX~ zmJegs*(V%X)Mi$25DDeMp3IVt%bQs@%#KI-mfh&PfiuThYb&oD7(VXW`Do~!r5541 z^C}8p3ubL%0t;m%Hrk0|ZvpL~Lhonhc<^*g$(u)Ej%Pcm)IYhwG;7^Auk5TTnB#di zyy4VNq!Z>Q=Y9eU$@fOEB@-S_Y+>(|*F_`C0fob<<~4Y6qN=~0Qd&O9H) zJq5!i@=e@v#`~s3wxcBOXtiR7r?fbCrW@RjU{DqE$Vl#4<`LG__+{$SHcE`Us=eBi#p=fYA>X>LQHzr>M+2L!PWxUwl~M?xA03KjiVN>UFC5( z!Vsb&ON#}p5>Ju}r7j}xjw3pgoT6gOD@N%^p`M_n9D!{o*^bu2Pi>EZrP#-hawMJ< zvsgZjSLT#YbV-ez+MawkeH`**GiRU0#YJYNT`wc)*qqAzr{F4#TjN53D6tc zBzY)QJHjjspl~){K$kXxwIu8Hq%q|u!Y%@xCKDTPOlQ#cz%#DX)v5t`d{6p1>!KXC zp>C$P#C!2TgpSj7vN^BH`NDgaPlITz8ZMf%aj#$2LFg>8K^qKVGj==XEWxp`NsJ%x z34Flnj3I=~>qBp2ZFViB$96xH(q6+Xd>mdft4huKGmU9}R%X(|>d1ybe-6Je=ZNuj z^x|LjvmO7Sws77RD2uF~yP`_Sf}DvKaJ=bOVa`>9 zO#&GQ*H%0)?EVXGNDd2y3kieT>TYxXJ?1=TkE<+5pFZ;Xj3%e)jKul*p{h11vltbn z8!Vag`NSJGM>A?f0PnC~P&DRinOdK<+R=_L{5G8|XwgiHt&4>$x;bBuVtku@H z8V_9SA(t0q@+Es{@!*{DI4PsGF&erhTVewTC}rdH-L~D2a<;v%D!Z+Fr|a@4ExImm zk+L#b_L9AKGcM;IX@y|JVJ=Zkxeg`r;l+FA&Qgk3Q4iYPd~PkzE|O$hXF5|R=GM-) zF5nwtsil;?WcjFoBkhz#p5TN`Yr{nYR;->`Ju#&rK`<)vL2I?>#huo%s#ml&G8V2S zRURcRqT`@o+B64P+=G}~-58*(+WV<5BikGArsLgwyz8tyx{Q;!81LGl>Pg&#!zrC_ z5YA;4RV}e5B92sqp|SN_>5w%qYs2s`<(re8rk>78jvy zI0Xeyu!HorO07#fd4@8J@i+5*FpVR&`_zk;wA2x^fWyL6oZv}3DrQ1cYEv*WQEkC-KfY-RJ;Y0$dUH&l#>65 zwrRXeHD<@pgz& zgWGGqH=I-5k2HOVL}e@0Z!WE9q0T_iz$*b(pLylsj)2 zb^V>2lXPJaQZp9gU1;5RCOn$lk@+!I&wwJAn=~nbY^V$;7N+lXI^kuS;eVKV-LPO9 z$dKX}ivAYO^|J~c=_8*e{kGvQcoK?!pCWtBq}mwv8ph*Y z-@nLVkuEeb@S(OvAa!-JqTv0jJlW`vpW}xCenQx!4)Gqt;bW+0y{{7ox?P$;h5AN9 zGqI}a9S)=3234qY_x?v%;YS5Uekl3#R-5Rf0J$ZP2IJ?vSK^*s9VeTZjqxs)sI)+E z*fSeIhul%0?4EUd3|KKzA=0-WGd8owQW^`AN>*pA!SmTjJR1!rRB_tb5B5y1>y1v~ z!DvcIZ(5w$Rgn$-l3zx2@}YLYZilFFWlvz4As*Sfb9xo> zi*xI--Bv0IzUr<>1(@&N7OL4|ZW_oGApD2qf-9ks!alY$C7Nj;<M;^}i%y24OdgIg;Fn5ER_hrIaZ?+o?9921v3?MAD!bI3bOr zZIaw1`=B(XA0mray^qk81EKr8l|u=NWxQzWc-y7`CLH@f=R=#~f$AmnG5&Hj zNjz7Si~OgUql~CYLNk`lR@8PBLMrxTvzh-5YGPqLX-q6+qa|}ZI2=bkxs!P}A$}!&Uu0=(@{~4cI=wF49mSL$;n0(=&$oLwoc>TtBJYyh)KfK2Ucz-6KA#FZ^G-Ed zTzXTb1Dq6Lir8w=sCsG^n)LtLl_We do not store it and <1>it can only be displayed once. Save it somewhere safe!" +msgstr "Une phrase de backup sera générée et utilisé pour ce comte.<0/>Nous ne la sauvergardons pas <1>elle ne peut être montrée qu'une seule fois. Garde la dans un endroit sûr!" + +msgid "A file with the same name already exists" +msgstr "Un fichier avec ce nom existe déjà" + +msgid "Account" +msgstr "Compte" + +msgid "Add at least one more authentication method to protect your account. You’d only need any two to sign in to Files from any device." +msgstr "Ajoute au moins une méthode d’authentification pour protéger ce compte. Tu as besoin de 2 méthode pour accéder à Files depuis n'importe quel appareil." + +msgid "Add more files" +msgstr "Ajoute d'autres fichiers" + +msgid "Approve" +msgstr "Accepter" + +msgid "Are you sure?" +msgstr "Es-tu certain?" + +msgid "Backup phrase" +msgstr "Phrase de secours" + +msgid "Backup phrase does not match user account, please double-check and try again." +msgstr "La phrase de secours est incorrecte, merci de vérifier et réessayer." + +msgid "Bin" +msgstr "Corbeille" + +msgid "Browser:" +msgstr "Explorateur:" + +msgid "By connecting your wallet, you agree to our <0>Terms of Service and <1>Privacy Policy" +msgstr "En connectant ton portefeuille, tu acceptes nos <0>Terms of Service et <1>Privacy Policy" + +msgid "By forgetting this browser, you will not be able to use its associated recovery key to sign-in." +msgstr "Supprimer ce navigateur implique que la clé de sécurité qui lui est associée ne pourra plus être utilisé pour accéder à Files." + +msgid "CID (Content Identifier)" +msgstr "CID (Identifiant de contenu)" + +msgid "Cancel" +msgstr "Annuler" + +msgid "Change Password" +msgstr "Modifier" + +msgid "Change password" +msgstr "Modifier" + +msgid "Click or drag to upload files" +msgstr "Clique ou faire glisser un ficher pour uploader" + +msgid "Close" +msgstr "Fermer" + +msgid "Complete" +msgstr "Terminé" + +msgid "Confirm" +msgstr "Confirmer" + +msgid "Confirm Password:" +msgstr "Confirmer le mot de passe:" + +msgid "Connect Wallet to Files" +msgstr "Connecter un wallet à Files" + +msgid "Connect a new wallet" +msgstr "Connecter un nouveau wallet" + +msgid "Connection failed" +msgstr "La connexion a échouée" + +msgid "Continue" +msgstr "Continuer" + +msgid "Continue with Facebook" +msgstr "Continuer avec Facebook" + +msgid "Continue with Github" +msgstr "Continuer avec GitHub" + +msgid "Continue with Google" +msgstr "Continuer avec Google" + +msgid "Continue with Web3 Wallet" +msgstr "Continuer avec un wallet Web3" + +msgid "Copied!" +msgstr "Copié!" + +msgid "Copy CID" +msgstr "Copier le CID" + +msgid "Create" +msgstr "Créer" + +msgid "Create Folder" +msgstr "Créer un dossier" + +msgid "Create folder" +msgstr "Créer un dossier" + +msgid "Dark Theme" +msgstr "Thème sombre" + +msgid "Date uploaded" +msgstr "Ajouté le" + +msgid "Decryption failed" +msgstr "Le déchiffrage a échoué" + +msgid "Delete" +msgstr "Supprimer" + +msgid "Delete selected" +msgstr "Supprimer selection" + +msgid "Device awaiting confirmation" +msgstr "Appareil en attente de confirmation" + +msgid "Display Settings" +msgstr "Paramètres d'affichage" + +msgid "Download" +msgstr "Télécharger" + +msgid "Download complete" +msgstr "Téléchargement terminé" + +msgid "Download recovery key" +msgstr "Télécharger la clé de sauvegarde" + +msgid "Drop to upload files" +msgstr "Faire glisser pour uploader un fichier" + +msgid "Encryption Password" +msgstr "Mot de passe de chiffrage" + +msgid "Enter backup phrase:" +msgstr "Phrase de sauvegarder:" + +msgid "Enter password" +msgstr "Mot de passe" + +msgid "Enter password:" +msgstr "Mot de passe:" + +msgid "Essentials - Free" +msgstr "Essentials - Gratuit" + +msgid "Failed to get signature" +msgstr "Échec de l'obtention de la signature" + +msgid "Failed to migrate account, please try again." +msgstr "Échec de la migration du compte, veuillez réessayer." + +msgid "" +"Failed to validate signature.\n" +"If you are using a contract wallet, please make \n" +"sure you have activated your wallet." +msgstr "" +"Échec de la validation de la signature.\n" +"Si vous utilisez un contract wallet, veuillez\n" +"vérifier que vous avez activé votre wallet." + +msgid "File" +msgstr "Fichier" + +msgid "File Info" +msgstr "Info du fichier" + +msgid "File format not supported." +msgstr "Format de fichier non supporté." + +msgid "File moved successfully" +msgstr "Fichier déplacé avec succès" + +msgid "File renamed successfully" +msgstr "Fichier renommé avec succès" + +msgid "File size" +msgstr "Taille" + +msgid "Files" +msgstr "Fichiers" + +msgid "Files uses device backups to save your browser." +msgstr "Files enregistre ce navigateur." + +msgid "Folder" +msgstr "Dossier" + +msgid "Folder created successfully" +msgstr "Dossier créé avec succès" + +msgid "Folders" +msgstr "Dossiers" + +msgid "For security reasons, upon signing in we’ll ask you for one of the following to confirm your identity." +msgstr "Pour des raisons de sécurité, lors de votre connexion, nous vous demanderons l'un des éléments suivants pour confirmer votre identité." + +msgid "Forget this browser" +msgstr "Oublier ce navigateur" + +msgid "General" +msgstr "Info" + +msgid "Generate backup phrase" +msgstr "Créer une phrase de sauvegarde" + +msgid "Generate phrase" +msgstr "Créer une phrase de sauvegarde" + +msgid "Generating..." +msgstr "Création..." + +msgid "Get Started" +msgstr "Commencer" + +msgid "Go back" +msgstr "Retour" + +msgid "Great! You’re all done." +msgstr "Génial! Vous avez terminé." + +msgid "Hey! You only have two sign-in methods. If you lose that and have only one left, you will be locked out of your account forever." +msgstr "Hey! Tu ne disposes que de deux méthodes d'authentification. Si tu en perds une, tu seras bloqué pour toujours et ne pourras plus te connecter à ton compte Files." + +msgid "Hold on, we are logging you in..." +msgstr "Un instant, nous te connectons ..." + +msgid "Home" +msgstr "Accueil" + +msgid "Info" +msgstr "Info" + +msgid "I’m done saving my backup phrase" +msgstr "Phrase de sauvegarde enregistrée" + +msgid "Learn more" +msgstr "En apprendre plus" + +msgid "Learn more about ChainSafe" +msgstr "En apprendre plus sur ChainSafe" + +msgid "Let's get you set up." +msgstr "C'est parti." + +msgid "Light Theme" +msgstr "Thème clair" + +msgid "Loading preview" +msgstr "Chargement de l’aperçu" + +msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:" +msgstr "Connectez à partir d'un nouveau navigateur. Choisis une des options suivantes pour continuer:" + +msgid "Move" +msgstr "Déplacer" + +msgid "Move selected" +msgstr "Déplacer sélection" + +msgid "Move to..." +msgstr "Déplacer vers..." + +msgid "My Files" +msgstr "Mes Fichiers" + +msgid "Name" +msgstr "Nom" + +msgid "New folder" +msgstr "Nouveau dossier" + +msgid "Next" +msgstr "Suivant" + +msgid "Nice to see you again!" +msgstr "Ravi de te revoir!" + +msgid "No files to show" +msgstr "Aucun fichier à afficher" + +msgid "No folders" +msgstr "Aucun dossier" + +msgid "No search results for" +msgstr "Aucun fichier à afficher" + +msgid "No thanks" +msgstr "Non merci" + +msgid "Number of copies (Replication Factor)" +msgstr "Nombre de copies (facteur de réplication)" + +msgid "OK" +msgstr "OK" + +msgid "One sec, getting files ready..." +msgstr "Un instant, nous préparons vos fichiers..." + +msgid "Operating system:" +msgstr "Système d'exploitation:" + +msgid "Or confirm by signing into your Files on any browser you’ve used before." +msgstr "Ou accepte la requête de connexion depuis n'importe quel appareil ou navigateur utilisé auparavant." + +msgid "Password" +msgstr "Mot de passe" + +msgid "Password confirmation is required" +msgstr "La confirmation du mot de passe est requise" + +msgid "Password does not match user account, please double-check and try again." +msgstr "Le mot de passe ne correspond pas au compte, merci de vérifier et réessayer." + +msgid "Password needs to be more complex" +msgstr "Le mot de passe n'est pas assez sûr" + +msgid "Password setup" +msgstr "Configuration du mot de passe" + +msgid "Password:" +msgstr "Mot de Passe:" + +msgid "Passwords must match" +msgstr "Les mots de passes de correspondent pas" + +msgid "Please provide a password" +msgstr "Merci de donner un mot de passe" + +msgid "Preview" +msgstr "Aperçu" + +msgid "Previous" +msgstr "" + +msgid "Privacy Policy" +msgstr "" + +msgid "Profile and Display" +msgstr "" + +msgid "Profile updated" +msgstr "" + +msgid "Recover" +msgstr "" + +msgid "Recover with passphrase" +msgstr "" + +msgid "Reject" +msgstr "" + +msgid "Reject all" +msgstr "" + +msgid "Remind me later" +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "Rename File/Folder" +msgstr "" + +msgid "Requested from" +msgstr "" + +msgid "Resources" +msgstr "" + +msgid "Restore with backup phrase" +msgstr "" + +msgid "Save changes" +msgstr "" + +msgid "Save this browser for next time?" +msgstr "" + +msgid "Saved" +msgstr "" + +msgid "Saved Browser" +msgstr "" + +msgid "Saved Browsers" +msgstr "" + +msgid "Saved browser" +msgstr "" + +msgid "Saved on:" +msgstr "" + +msgid "Search results" +msgstr "" + +msgid "Search..." +msgstr "" + +msgid "Security" +msgstr "" + +msgid "Select a wallet" +msgstr "" + +msgid "Send Feedback" +msgstr "" + +msgid "Set Password" +msgstr "" + +msgid "Set it up now" +msgstr "" + +msgid "Set up" +msgstr "" + +msgid "Set up a password" +msgstr "" + +msgid "Set up password" +msgstr "" + +msgid "Set up sign in methods" +msgstr "" + +msgid "Settings" +msgstr "" + +msgid "Share" +msgstr "" + +msgid "Sign Out" +msgstr "" + +msgid "Sign in" +msgstr "" + +msgid "Sign in with a different account" +msgstr "" + +msgid "Sign-in methods" +msgstr "" + +msgid "Sign-in with {0}" +msgstr "" + +msgid "Size" +msgstr "" + +msgid "Social Sign-in Wallet" +msgstr "" + +msgid "Social Sign-in or Wallet" +msgstr "" + +msgid "Social sign in or wallet" +msgstr "" + +msgid "Something went wrong. We couldn't upload your file" +msgstr "" + +msgid "Start Upload" +msgstr "" + +msgid "Storage Plan" +msgstr "" + +msgid "Stored by miner" +msgstr "" + +msgid "Technical" +msgstr "" + +msgid "Terms and Conditions" +msgstr "" + +msgid "Thanks for taking care of that. You can <0/> adjust these anytime in security settings." +msgstr "" + +msgid "The authentication popup was closed" +msgstr "" + +msgid "The system is undergoing maintenance, thank you for being patient." +msgstr "" + +msgid "Theme" +msgstr "" + +msgid "There was an error authenticating" +msgstr "" + +msgid "There was an error connecting your wallet" +msgstr "" + +msgid "There was an error creating this folder" +msgstr "" + +msgid "There was an error deleting this" +msgstr "" + +msgid "There was an error getting file info" +msgstr "" + +msgid "There was an error getting folder info" +msgstr "" + +msgid "There was an error getting search results" +msgstr "" + +msgid "There was an error getting the preview." +msgstr "" + +msgid "There was an error moving this file" +msgstr "" + +msgid "There was an error recovering this" +msgstr "" + +msgid "There was an error renaming this file" +msgstr "" + +msgid "Try again" +msgstr "" + +msgid "Try another method" +msgstr "" + +msgid "Update" +msgstr "" + +msgid "Upload" +msgstr "" + +msgid "Upload complete" +msgstr "" + +msgid "Use a different login method" +msgstr "" + +msgid "Use a saved browser" +msgstr "" + +msgid "View folder" +msgstr "" + +msgid "Wallet address" +msgstr "" + +msgid "Web3: {0}" +msgstr "" + +msgid "What a fine day it is." +msgstr "" + +msgid "What a fine night it is." +msgstr "" + +msgid "Without setting up at least three authentication factors, you risk getting locked out of your account.<0/><1/>Remember, you need a minimum of two factors to sign in. If you only have one, you’ll lose access to your account forever." +msgstr "" + +msgid "Yes I understand" +msgstr "" + +msgid "Yes, save it" +msgstr "" + +msgid "You are about to delete {0} file(s)." +msgstr "" + +msgid "You can change this later." +msgstr "" + +msgid "You will need to sign a message in your wallet to complete sign in." +msgstr "" + +msgid "Your Authentication Factors" +msgstr "" + +msgid "Your recovery key can be used to restore your account in place of your backup phrase." +msgstr "" + +msgid "copied !" +msgstr "" + +msgid "deleted successfully" +msgstr "" + +msgid "file" +msgstr "" + +msgid "folder" +msgstr "" + +msgid "on" +msgstr "" + +msgid "recovered successfully" +msgstr "" + +msgid "storage-plan-desc" +msgstr "" From 8e657e9548a261f0d80cd44f71c9998f8e779c9c Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 26 Apr 2021 11:02:38 +0100 Subject: [PATCH 2/8] dropdown styling --- .../Modules/Settings/LanguageSelection.tsx | 68 +++++++++++++------ .../Components/Modules/Settings/Profile.tsx | 7 ++ 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx b/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx index e194235475..419156f63b 100644 --- a/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx @@ -1,36 +1,62 @@ import React, { useMemo } from "react" import { useLanguageContext } from "../../../Contexts/LanguageContext" import { MenuDropdown } from "@chainsafe/common-components" +import { createStyles, makeStyles } from "@chainsafe/common-theme" +import { CSFTheme } from "../../../Themes/types" + +const useStyles = makeStyles( + ({ constants, palette }: CSFTheme) => { + return createStyles({ + root: { + border: `1px solid ${palette.additional["gray"][6]}`, + minWidth: 145, + backgroundColor: palette.additional["gray"][1] + }, + options: { + backgroundColor: constants.header.optionsBackground, + color: constants.header.optionsTextColor, + border: `1px solid ${constants.header.optionsBorder}` + }, + icon: { + position: "absolute", + right: constants.generalUnit * 2, + "& svg": { + fill: constants.header.iconColor + } + } + }) + } +) const LanguageSelection = () => { + const classes = useStyles() const { availableLanguages, selectedLanguage, setActiveLanguage } = useLanguageContext() const currentLanguage = useMemo( () => availableLanguages.find((land) => land.id === selectedLanguage)?.label , [availableLanguages, selectedLanguage] ) - console.log("availableLanguages", availableLanguages) - console.log("selectedLanguage", selectedLanguage) return ( -
- ( - { - contents: ( - - {lang.label} - - ), - onClick: () => setActiveLanguage(lang.id) - } - ))} - title={currentLanguage} - /> -
+ ( + { + contents: ( + + {lang.label} + + ), + onClick: () => setActiveLanguage(lang.id) + } + ))} + title={currentLanguage} + /> ) } diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index 1e6bfa5af2..39eb8c5943 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -365,6 +365,13 @@ const ProfileView = () => {
+ + Language + From ea32b85933835415f643d4fb02788a3e5c85c267 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 26 Apr 2021 11:44:47 +0100 Subject: [PATCH 3/8] done with translation --- .../src/Components/Modules/Settings/Plan.tsx | 2 +- packages/files-ui/src/locales/en/messages.po | 9 +- packages/files-ui/src/locales/fr/messages.mo | Bin 8964 -> 16349 bytes packages/files-ui/src/locales/fr/messages.po | 189 +++++++++--------- 4 files changed, 103 insertions(+), 97 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/Settings/Plan.tsx b/packages/files-ui/src/Components/Modules/Settings/Plan.tsx index cf4c35db7b..f863d05244 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Plan.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Plan.tsx @@ -102,7 +102,7 @@ const PlanView: React.FC = () => { component="p" className={clsx(classes.margins, classes.subtitle)} > - + Lorem ipsum aenean et rutrum magna. Morbi nec placerat erat. Nunc elementum sed libero sit amet convallis. Quisque non arcu vitae ex fringilla molestie. diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po index fd5e3323ab..aabd634fb4 100644 --- a/packages/files-ui/src/locales/en/messages.po +++ b/packages/files-ui/src/locales/en/messages.po @@ -259,6 +259,9 @@ msgstr "Info" msgid "I’m done saving my backup phrase" msgstr "I’m done saving my backup phrase" +msgid "Language" +msgstr "Language" + msgid "Learn more" msgstr "Learn more" @@ -277,6 +280,9 @@ msgstr "Loading preview" msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:" msgstr "Looks like you’re signing in from a new browser. Please choose one of the following to continue:" +msgid "Lorem ipsum aenean et rutrum magna. Morbi nec placerat erat. Nunc elementum sed libero sit amet convallis. Quisque non arcu vitae ex fringilla molestie." +msgstr "Lorem ipsum aenean et rutrum magna. Morbi nec placerat erat. Nunc elementum sed libero sit amet convallis. Quisque non arcu vitae ex fringilla molestie." + msgid "Move" msgstr "Move" @@ -624,6 +630,3 @@ msgstr "on" msgid "recovered successfully" msgstr "recovered successfully" - -msgid "storage-plan-desc" -msgstr "Lorem ipsum aenean et rutrum magna. Morbi nec placerat erat. Nunc elementum sed libero sit amet convallis. Quisque non arcu vitae ex fringilla molestie." diff --git a/packages/files-ui/src/locales/fr/messages.mo b/packages/files-ui/src/locales/fr/messages.mo index 94bc25cf8865a356cba17de1becbd75c973aae85..70febed150e348b7d9c96650865908790c580efe 100644 GIT binary patch literal 16349 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 A^Z)<= diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index 3aa2a78ceb..3198680493 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -260,6 +260,9 @@ msgstr "Info" msgid "I’m done saving my backup phrase" msgstr "Phrase de sauvegarde enregistrée" +msgid "Language" +msgstr "Langue de l'interface" + msgid "Learn more" msgstr "En apprendre plus" @@ -278,6 +281,9 @@ msgstr "Chargement de l’aperçu" msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:" msgstr "Connectez à partir d'un nouveau navigateur. Choisis une des options suivantes pour continuer:" +msgid "Lorem ipsum aenean et rutrum magna. Morbi nec placerat erat. Nunc elementum sed libero sit amet convallis. Quisque non arcu vitae ex fringilla molestie." +msgstr "Lorem ipsum aenean et rutrum magna. Morbi nec placerat erat. Nunc elementum sed libero sit amet convallis. Quisque non arcu vitae ex fringilla molestie." + msgid "Move" msgstr "Déplacer" @@ -357,274 +363,271 @@ msgid "Preview" msgstr "Aperçu" msgid "Previous" -msgstr "" +msgstr "Précédent" msgid "Privacy Policy" -msgstr "" +msgstr "Politique de Confidentialité" msgid "Profile and Display" -msgstr "" +msgstr "Profil et Affichage" msgid "Profile updated" -msgstr "" +msgstr "Profile mis à jour" msgid "Recover" -msgstr "" +msgstr "Récupérer" msgid "Recover with passphrase" -msgstr "" +msgstr "Récupérer avec un mot de passe" msgid "Reject" -msgstr "" +msgstr "Refuser" msgid "Reject all" -msgstr "" +msgstr "Refuser tous" msgid "Remind me later" -msgstr "" +msgstr "Plus tard" msgid "Rename" -msgstr "" +msgstr "Renommer" msgid "Rename File/Folder" -msgstr "" +msgstr "Renommer Ficher/Dossier" msgid "Requested from" -msgstr "" +msgstr "Envoyé par" msgid "Resources" -msgstr "" +msgstr "Ressources" msgid "Restore with backup phrase" -msgstr "" +msgstr "Récupérer avec la phrase de sauvegarde" msgid "Save changes" -msgstr "" +msgstr "Enregistrer les changements" msgid "Save this browser for next time?" -msgstr "" +msgstr "Enregistrer ce navigateur?" msgid "Saved" -msgstr "" +msgstr "Enregistré" msgid "Saved Browser" -msgstr "" +msgstr "Navigateur enregistré" msgid "Saved Browsers" -msgstr "" +msgstr "Navigateurs enregistrés" msgid "Saved browser" -msgstr "" +msgstr "Navigateur enregistré" msgid "Saved on:" -msgstr "" +msgstr "Enregistré sur:" msgid "Search results" -msgstr "" +msgstr "Résultats de recherche" msgid "Search..." -msgstr "" +msgstr "Rechercher..." msgid "Security" -msgstr "" +msgstr "Sécurité" msgid "Select a wallet" -msgstr "" +msgstr "Sélectionner un wallet" msgid "Send Feedback" -msgstr "" +msgstr "Envoyer des commentaires" msgid "Set Password" -msgstr "" +msgstr "Définir un Mot de Passe" msgid "Set it up now" -msgstr "" +msgstr "Définir" msgid "Set up" -msgstr "" +msgstr "Définir" msgid "Set up a password" -msgstr "" +msgstr "Définir un mot de passe" msgid "Set up password" -msgstr "" +msgstr "Définir un mot de passe" msgid "Set up sign in methods" -msgstr "" +msgstr "Définir les méthodes d'authentifiction" msgid "Settings" -msgstr "" +msgstr "Paramètres" msgid "Share" -msgstr "" +msgstr "Partager" msgid "Sign Out" -msgstr "" +msgstr "Se Déconnecter" msgid "Sign in" -msgstr "" +msgstr "Se connecter" msgid "Sign in with a different account" -msgstr "" +msgstr "Se connecter avec un autre compte" msgid "Sign-in methods" -msgstr "" +msgstr "Méthodes de connections" msgid "Sign-in with {0}" -msgstr "" +msgstr "Se connecter avec {0}" msgid "Size" -msgstr "" +msgstr "Taille" msgid "Social Sign-in Wallet" -msgstr "" +msgstr "Connecté avec un réseau social ou wallet" msgid "Social Sign-in or Wallet" -msgstr "" +msgstr "Connecté avec un réseau social ou wallet" msgid "Social sign in or wallet" -msgstr "" +msgstr "Connecté avec un réseau social ou wallet" msgid "Something went wrong. We couldn't upload your file" -msgstr "" +msgstr "Un problème est survenu. Nous n'avons pas pu uploader votre fichier" msgid "Start Upload" -msgstr "" +msgstr "Démarrer l'upload" msgid "Storage Plan" -msgstr "" +msgstr "Plan de stockage" msgid "Stored by miner" -msgstr "" +msgstr "Sauvegardé par le mineur" msgid "Technical" -msgstr "" +msgstr "Technique" msgid "Terms and Conditions" -msgstr "" +msgstr "Termes et conditions" msgid "Thanks for taking care of that. You can <0/> adjust these anytime in security settings." -msgstr "" +msgstr "Vous pouvez <0 /> les ajuster à tout moment dans les paramètres de sécurité." msgid "The authentication popup was closed" -msgstr "" +msgstr "Le popup d'authentification a été fermé" msgid "The system is undergoing maintenance, thank you for being patient." -msgstr "" +msgstr "Le système est en cours de maintenance, merci d'être patient." msgid "Theme" -msgstr "" +msgstr "Thème" msgid "There was an error authenticating" -msgstr "" +msgstr "Une erreur s'est produite lors de l'authentification" msgid "There was an error connecting your wallet" -msgstr "" +msgstr "Une erreur s'est produite lors de la connexion de votre wallet" msgid "There was an error creating this folder" -msgstr "" +msgstr "Une erreur s'est produite lors de la création de ce dossier" msgid "There was an error deleting this" -msgstr "" +msgstr "Une erreur s'est produite lors de la suppression" msgid "There was an error getting file info" -msgstr "" +msgstr "Une erreur s'est produite lors de l'obtention des informations sur le fichier" msgid "There was an error getting folder info" -msgstr "" +msgstr "Une erreur s'est produite lors de l'obtention des informations sur le dossier" msgid "There was an error getting search results" -msgstr "" +msgstr "Une erreur s'est produite lors de l'obtention des résultats de recherche" msgid "There was an error getting the preview." -msgstr "" +msgstr "Une erreur s'est produite lors de la génération de l’aperçu." msgid "There was an error moving this file" -msgstr "" +msgstr "Une erreur s'est produite lors du déplacement de ce fichier" msgid "There was an error recovering this" -msgstr "" +msgstr "Une erreur s'est produite lors de la récupération" msgid "There was an error renaming this file" -msgstr "" +msgstr "Une erreur s'est produite lors de renommage de ce fichier" msgid "Try again" -msgstr "" +msgstr "Essayer de nouveau" msgid "Try another method" -msgstr "" +msgstr "Essayer une autre méthode" msgid "Update" -msgstr "" +msgstr "Mettre à jour" msgid "Upload" -msgstr "" +msgstr "Uploader" msgid "Upload complete" -msgstr "" +msgstr "Upload terminé" msgid "Use a different login method" -msgstr "" +msgstr "Utilisez une méthode de connexion différente" msgid "Use a saved browser" -msgstr "" +msgstr "Utiliser un navigateur enregistré" msgid "View folder" -msgstr "" +msgstr "Voir le dossier" msgid "Wallet address" -msgstr "" +msgstr "Addresse du wallet" msgid "Web3: {0}" -msgstr "" +msgstr "Web3: {0}" msgid "What a fine day it is." -msgstr "" +msgstr "Une belle journée." msgid "What a fine night it is." -msgstr "" +msgstr "Une belle nuit." msgid "Without setting up at least three authentication factors, you risk getting locked out of your account.<0/><1/>Remember, you need a minimum of two factors to sign in. If you only have one, you’ll lose access to your account forever." -msgstr "" +msgstr "Si vous ne configurez pas au moins trois facteurs d'authentification, vous risquez de ne plus pouvoir accéder à votre compte. <0 /> <1 /> N'oubliez pas que vous avez besoin d'au moins deux facteurs pour vous connecter. Si vous n'en avez qu'un, vous perdrez l'accès à votre compte pour toujours." msgid "Yes I understand" -msgstr "" +msgstr "Oui, je comprends" msgid "Yes, save it" -msgstr "" +msgstr "Oui, l'enregistrer" msgid "You are about to delete {0} file(s)." -msgstr "" +msgstr "Suppression de {0} fichier(s)." msgid "You can change this later." -msgstr "" +msgstr "Vous pouvez en changer plus tard." msgid "You will need to sign a message in your wallet to complete sign in." -msgstr "" +msgstr "Vous devrez signer un message avec votre wallet pour terminer la procédure connexion." msgid "Your Authentication Factors" -msgstr "" +msgstr "Vos Facteurs d'Authentification" msgid "Your recovery key can be used to restore your account in place of your backup phrase." -msgstr "" +msgstr "Votre clé de récupération peut être utilisée pour restaurer votre compte à la place de votre phrase de sauvegarde." msgid "copied !" -msgstr "" +msgstr "copié !" msgid "deleted successfully" -msgstr "" +msgstr "supprimé avec succès" msgid "file" -msgstr "" +msgstr "fichier" msgid "folder" -msgstr "" +msgstr "dossier" msgid "on" -msgstr "" +msgstr "le" msgid "recovered successfully" -msgstr "" - -msgid "storage-plan-desc" -msgstr "" +msgstr "récupéré avec succès" From a4374af11d29e1ba3401dcf79fdbaa0593d9394c Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 26 Apr 2021 12:15:52 +0100 Subject: [PATCH 4/8] nits here and there --- .../Modules/FileBrowsers/views/FilesTable.view.tsx | 2 +- .../Components/Modules/Settings/LanguageSelection.tsx | 6 +++++- packages/files-ui/src/locales/en/messages.po | 3 +++ packages/files-ui/src/locales/fr/messages.po | 9 ++++++--- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesTable.view.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesTable.view.tsx index f33f2a7fe9..c7ff3db4d6 100644 --- a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesTable.view.tsx +++ b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesTable.view.tsx @@ -770,7 +770,7 @@ const FilesTableView = ({ {uploadInProgress.noOfFiles > 1 - ? `Uploading ${uploadInProgress.noOfFiles} files` + ? t`Uploading ${uploadInProgress.noOfFiles} files` : uploadInProgress.fileName} diff --git a/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx b/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx index 419156f63b..4b29484a9e 100644 --- a/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/LanguageSelection.tsx @@ -23,6 +23,9 @@ const useStyles = makeStyles( "& svg": { fill: constants.header.iconColor } + }, + title: { + width: "100%" } }) } @@ -43,7 +46,8 @@ const LanguageSelection = () => { className={classes.root} classNames={{ icon: classes.icon, - options: classes.options + options: classes.options, + title: classes.title }} menuItems={availableLanguages.map((lang) => ( { diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po index aabd634fb4..540790412b 100644 --- a/packages/files-ui/src/locales/en/messages.po +++ b/packages/files-ui/src/locales/en/messages.po @@ -568,6 +568,9 @@ msgstr "Upload" msgid "Upload complete" msgstr "Upload complete" +msgid "Uploading {0} files" +msgstr "Uploading {0} files" + msgid "Use a different login method" msgstr "Use a different login method" diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index 3198680493..cce427e85a 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -69,7 +69,7 @@ msgid "Change password" msgstr "Modifier" msgid "Click or drag to upload files" -msgstr "Clique ou faire glisser un ficher pour uploader" +msgstr "Cliquer ou faire glisser un ficher pour uploader" msgid "Close" msgstr "Fermer" @@ -405,7 +405,7 @@ msgid "Restore with backup phrase" msgstr "Récupérer avec la phrase de sauvegarde" msgid "Save changes" -msgstr "Enregistrer les changements" +msgstr "Enregistrer" msgid "Save this browser for next time?" msgstr "Enregistrer ce navigateur?" @@ -438,7 +438,7 @@ msgid "Select a wallet" msgstr "Sélectionner un wallet" msgid "Send Feedback" -msgstr "Envoyer des commentaires" +msgstr "Donner son avis" msgid "Set Password" msgstr "Définir un Mot de Passe" @@ -569,6 +569,9 @@ msgstr "Uploader" msgid "Upload complete" msgstr "Upload terminé" +msgid "Uploading {0} files" +msgstr "Upload de {0} fichiers" + msgid "Use a different login method" msgstr "Utilisez une méthode de connexion différente" From a10aebaf9512acb4d60df6a54d661eb9c5c8242e Mon Sep 17 00:00:00 2001 From: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> Date: Mon, 26 Apr 2021 14:41:35 +0200 Subject: [PATCH 5/8] Apply suggestions from code review Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com> --- packages/files-ui/src/Contexts/LanguageContext.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/files-ui/src/Contexts/LanguageContext.tsx b/packages/files-ui/src/Contexts/LanguageContext.tsx index 9e930d20ed..f9985285a4 100644 --- a/packages/files-ui/src/Contexts/LanguageContext.tsx +++ b/packages/files-ui/src/Contexts/LanguageContext.tsx @@ -42,19 +42,19 @@ const getLanguages = (prefered = ""): string[] => { if (Array.isArray(languages)) { // Dedupe array of languages const deduped = [...new Set(languages.map((l) => l.split("-")[0]))] - const preferedFirst = prefered - ? [prefered, ...deduped.filter((lang) => prefered !== lang)] + const preferredFirst = preferred + ? [preferred, ...deduped.filter((lang) => preferred !== lang)] : deduped - return preferedFirst + return preferredFirst } if (language) { - return [prefered, language.split("-")[0]] + return [preferred, language.split("-")[0]] } // If language not detected use english - return [prefered, DEFAULT_LANGUAGE] + return [preferred, DEFAULT_LANGUAGE] } const getLocales = (): string[] => { From 584a53ef1f9e74ed20682e3eb409b5a086ace680 Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 26 Apr 2021 14:45:59 +0100 Subject: [PATCH 6/8] missing translations --- .../Components/Modules/Settings/Profile.tsx | 8 ++++---- packages/files-ui/src/locales/en/messages.po | 6 ++++++ packages/files-ui/src/locales/fr/messages.mo | Bin 16349 -> 16449 bytes packages/files-ui/src/locales/fr/messages.po | 6 ++++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx index 39eb8c5943..24860ba8b0 100644 --- a/packages/files-ui/src/Components/Modules/Settings/Profile.tsx +++ b/packages/files-ui/src/Components/Modules/Settings/Profile.tsx @@ -243,22 +243,22 @@ const ProfileView = () => { ) : null}
{/*
diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po index 540790412b..3344a58282 100644 --- a/packages/files-ui/src/locales/en/messages.po +++ b/packages/files-ui/src/locales/en/messages.po @@ -208,6 +208,9 @@ msgstr "Files" msgid "Files uses device backups to save your browser." msgstr "Files uses device backups to save your browser." +msgid "First name" +msgstr "First name" + msgid "Folder" msgstr "Folder" @@ -262,6 +265,9 @@ msgstr "I’m done saving my backup phrase" msgid "Language" msgstr "Language" +msgid "Last name" +msgstr "Last name" + msgid "Learn more" msgstr "Learn more" diff --git a/packages/files-ui/src/locales/fr/messages.mo b/packages/files-ui/src/locales/fr/messages.mo index 70febed150e348b7d9c96650865908790c580efe..a602c61a711898941c1d5744989dc732d76ab8ab 100644 GIT binary patch delta 4587 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 AtN;K2 diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index cce427e85a..1f689b57b4 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -209,6 +209,9 @@ msgstr "Fichiers" msgid "Files uses device backups to save your browser." msgstr "Files enregistre ce navigateur." +msgid "First name" +msgstr "Prénom" + msgid "Folder" msgstr "Dossier" @@ -263,6 +266,9 @@ msgstr "Phrase de sauvegarde enregistrée" msgid "Language" msgstr "Langue de l'interface" +msgid "Last name" +msgstr "Nom" + msgid "Learn more" msgstr "En apprendre plus" From efffa394ba0e34c76e899417b2bce911b29bcdbd Mon Sep 17 00:00:00 2001 From: Thibaut Sardan Date: Mon, 26 Apr 2021 15:00:25 +0100 Subject: [PATCH 7/8] add locale with dayjs --- .../files-ui/src/Contexts/LanguageContext.tsx | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/packages/files-ui/src/Contexts/LanguageContext.tsx b/packages/files-ui/src/Contexts/LanguageContext.tsx index f9985285a4..b9fcd1d17b 100644 --- a/packages/files-ui/src/Contexts/LanguageContext.tsx +++ b/packages/files-ui/src/Contexts/LanguageContext.tsx @@ -3,13 +3,13 @@ import { i18n } from "@lingui/core" import { I18nProvider } from "@lingui/react" import * as plurals from "make-plural/plurals" import { useLocalStorage } from "@chainsafe/browser-storage-hooks" +import dayjs from "dayjs" export type LanguageContext = { availableLanguages: Language[] selectedLanguage: string selectedLocale: string setActiveLanguage(newLanguage: string): void | Promise - formatLocaleDate(date: Date): string } type Language = { @@ -30,13 +30,12 @@ const defaultContext: LanguageContext = { availableLanguages: [], selectedLanguage: DEFAULT_LANGUAGE, selectedLocale: DEFAULT_LOCALE, - setActiveLanguage: () => {console.error("setActiveLanguage not implemented")}, - formatLocaleDate: () => {console.error("formatLocaleDate not implemented"); return ""} + setActiveLanguage: () => {console.error("setActiveLanguage not implemented")} } const LanguageContext = React.createContext(defaultContext) -const getLanguages = (prefered = ""): string[] => { +const getLanguages = (preferred = ""): string[] => { const { languages, language } = window.navigator if (Array.isArray(languages)) { @@ -96,6 +95,7 @@ const LanguageProvider = ({ children, availableLanguages }: LanguageProviderProp i18n.activate(newLanguage) setSelectedLanguage(newLanguage) setPrefered && localStorageSet(PREFERED_LANGUAGE_KEY, newLanguage) + dayjs.locale(newLanguage) }) .catch(console.error) }, [availableLanguages, localStorageSet]) @@ -115,29 +115,13 @@ const LanguageProvider = ({ children, availableLanguages }: LanguageProviderProp setLanguage(defaultLanguage, false) }, [availableLanguages, localStorageGet, setLanguage]) - const formatLocaleDate = (date: Date) => { - const result = new Intl.DateTimeFormat(userLocales[0], { - timeZone: "UTC", - timeZoneName: "short", - hour: "numeric", - minute: "numeric", - hour12: false, - month: "numeric", - day: "numeric", - year: "numeric" - }).format(date) - - return result - } - return ( {children} From ddc4dc6315ee33c8cc88cf0375550eba8d948195 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 27 Apr 2021 09:17:29 +0000 Subject: [PATCH 8/8] lingui extract --- packages/files-ui/src/locales/en/messages.po | 3 --- packages/files-ui/src/locales/fr/messages.po | 9 ++++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po index 094aeeae85..a05b658a97 100644 --- a/packages/files-ui/src/locales/en/messages.po +++ b/packages/files-ui/src/locales/en/messages.po @@ -154,9 +154,6 @@ msgstr "Download recovery key" msgid "Drop to upload files" msgstr "Drop to upload files" -msgid "Encryption Password" -msgstr "Encryption Password" - msgid "Enter backup phrase:" msgstr "Enter backup phrase:" diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po index 1f689b57b4..8334b009fa 100644 --- a/packages/files-ui/src/locales/fr/messages.po +++ b/packages/files-ui/src/locales/fr/messages.po @@ -155,9 +155,6 @@ msgstr "Télécharger la clé de sauvegarde" msgid "Drop to upload files" msgstr "Faire glisser pour uploader un fichier" -msgid "Encryption Password" -msgstr "Mot de passe de chiffrage" - msgid "Enter backup phrase:" msgstr "Phrase de sauvegarder:" @@ -248,6 +245,9 @@ msgstr "Retour" msgid "Great! You’re all done." msgstr "Génial! Vous avez terminé." +msgid "Hello again!" +msgstr "" + msgid "Hey! You only have two sign-in methods. If you lose that and have only one left, you will be locked out of your account forever." msgstr "Hey! Tu ne disposes que de deux méthodes d'authentification. Si tu en perds une, tu seras bloqué pour toujours et ne pourras plus te connecter à ton compte Files." @@ -593,6 +593,9 @@ msgstr "Addresse du wallet" msgid "Web3: {0}" msgstr "Web3: {0}" +msgid "We’ve got a new authentication system in place. All you need to do is enter your password again to migrate your credentials over to the new system." +msgstr "" + msgid "What a fine day it is." msgstr "Une belle journée."