diff --git a/assets/onBoarding/gecko-oublie-aussi.png b/assets/onBoarding/gecko_also_can_forget_en.png similarity index 100% rename from assets/onBoarding/gecko-oublie-aussi.png rename to assets/onBoarding/gecko_also_can_forget_en.png diff --git a/assets/translations/en.json b/assets/translations/en.json index 3bdc2a6..28c9745 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -54,8 +54,12 @@ "keepThisMnemonicSecure": "Keep this sentence carefully, because without it Ğecko will not be able to rebuild your wallets the day you change your phone.", "geckoGeneratedYourMnemonicKeepItSecret": "Ğecko generated your mnemonic successfully! Keep it secret, because anyone who knows it can access all your wallets.", "newWallet": "New Wallet", - "itsTimeToUseAPenAndPaper": "Il est temps de vous munir d’**un papier et d’un crayon** afin de pouvoir noter votre phrase de restauration." + "itsTimeToUseAPenAndPaper": "It's time to take a **pen and paper** in order to write down your mnemonic.", + "yourMnemonic": "Your mnemonic", + "gecko_also_can_forget.png": "gecko_also_can_forget_en.png", + "didYouNoteMnemonicToBeSureTypeWord": "Did you write down your menmonic?\n\n To be sure, please type the **{}th word** of your restoration phrase in the field below:", + "geckoWillGenerateAPassword": "Gecko will now generate for you a short password that will allow you to quickly access your wallets, without having to type your recovery sentence every time.", + "myPassword": "My password" - } \ No newline at end of file diff --git a/assets/translations/fr.json b/assets/translations/fr.json index 1140dc8..5036212 100644 --- a/assets/translations/fr.json +++ b/assets/translations/fr.json @@ -55,9 +55,11 @@ "keepThisMnemonicSecure": "Conservez cette phrase précieusement, car sans elle Ğecko ne pourra pas reconstruire vos portefeuilles le jour où vous changez de téléphone.", "geckoGeneratedYourMnemonicKeepItSecret": "Gecko a généré votre phrase de restauration ! Tâchez de la garder bien secrète, car elle permet à quiconque la connaît d’accéder à tous vos portefeuilles.", "newWallet": "Nouveau portefeuille", - "itsTimeToUseAPenAndPaper": "Il est temps de vous munir d’**un papier et d’un crayon** afin de pouvoir noter votre phrase de restauration." - - - + "itsTimeToUseAPenAndPaper": "Il est temps de vous munir d’**un papier et d’un crayon** afin de pouvoir noter votre phrase de restauration.", + "yourMnemonic": "Votre phrase de restauration", + "gecko_also_can_forget.png": "gecko_also_can_forget_fr.png", + "didYouNoteMnemonicToBeSureTypeWord": "Avez-vous bien noté votre phrase de restauration ?\n\nPour en être sûr, veuillez taper dans le champ ci-dessous le **{}ème mot** de votre phrase de restauration :", + "geckoWillGenerateAPassword": "Gecko va maintenant générer pour vous un code secret court qui vous permettra d’accéder rapidement à vos portefeuilles, sans avoir à taper votre phrase de restauration à chaque fois.", + "myPassword": "Mon code secret" } \ No newline at end of file diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart index ce08c80..6185f24 100644 --- a/lib/screens/onBoarding/10.dart +++ b/lib/screens/onBoarding/10.dart @@ -39,11 +39,11 @@ class OnboardingStepTen extends StatelessWidget { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Mon code secret', - style: TextStyle(fontWeight: FontWeight.w600), + 'myPassword'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), diff --git a/lib/screens/onBoarding/2.dart b/lib/screens/onBoarding/2.dart index dd1cc79..ee16d16 100644 --- a/lib/screens/onBoarding/2.dart +++ b/lib/screens/onBoarding/2.dart @@ -19,11 +19,11 @@ class OnboardingStepTwo extends StatelessWidget { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Votre phrase de restauration', - style: TextStyle(fontWeight: FontWeight.w600), + 'yourMnemonic'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), diff --git a/lib/screens/onBoarding/3.dart b/lib/screens/onBoarding/3.dart index 1f581a4..8a261d9 100644 --- a/lib/screens/onBoarding/3.dart +++ b/lib/screens/onBoarding/3.dart @@ -19,11 +19,11 @@ class OnboardingStepThree extends StatelessWidget { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Votre phrase de restauration', - style: TextStyle(fontWeight: FontWeight.w600), + 'yourMnemonic'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), diff --git a/lib/screens/onBoarding/4.dart b/lib/screens/onBoarding/4.dart index 837de46..946f3db 100644 --- a/lib/screens/onBoarding/4.dart +++ b/lib/screens/onBoarding/4.dart @@ -19,11 +19,11 @@ class OnboardingStepFor extends StatelessWidget { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Votre phrase de restauration', - style: TextStyle(fontWeight: FontWeight.w600), + 'yourMnemonic'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), @@ -32,7 +32,7 @@ class OnboardingStepFor extends StatelessWidget { child: common.infoIntro( context, 'itsTimeToUseAPenAndPaper'.tr(), - 'gecko-oublie-aussi.png', + 'gecko_also_can_forget.png'.tr(), '>', const OnboardingStepFive(), 3, diff --git a/lib/screens/onBoarding/5.dart b/lib/screens/onBoarding/5.dart index 8961136..de736fc 100644 --- a/lib/screens/onBoarding/5.dart +++ b/lib/screens/onBoarding/5.dart @@ -38,11 +38,11 @@ class _ChooseChestState extends State { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Votre phrase de restauration', - style: TextStyle(fontWeight: FontWeight.w600), + 'yourMnemonic'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), @@ -52,8 +52,7 @@ class _ChooseChestState extends State { SizedBox(height: isTall ? 40 : 20), common.buildProgressBar(4), SizedBox(height: isTall ? 40 : 20), - common.buildText( - 'geckoGeneratedYourMnemonicKeepItSecret'.tr()), + common.buildText('geckoGeneratedYourMnemonicKeepItSecret'.tr()), SizedBox(height: 35 * ratio), sentanceArray(context), SizedBox(height: 17 * ratio), diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart index a4fa2aa..a86b909 100644 --- a/lib/screens/onBoarding/6.dart +++ b/lib/screens/onBoarding/6.dart @@ -1,5 +1,6 @@ // ignore_for_file: file_names +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; import 'package:gecko/globals.dart'; @@ -41,11 +42,11 @@ class OnboardingStepSix extends StatelessWidget { extendBodyBehindAppBar: true, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Votre phrase de restauration', - style: TextStyle(fontWeight: FontWeight.w600), + 'yourMnemonic'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), @@ -57,7 +58,8 @@ class OnboardingStepSix extends StatelessWidget { common.buildProgressBar(5), SizedBox(height: isTall ? 40 : 20), common.buildText( - "Avez-vous bien noté votre phrase de restauration ?\n\nPour en être sûr, veuillez taper dans le champ ci-dessous le **${_generateWalletProvider.nbrWord + 1}ème mot** de votre phrase de restauration :", + "didYouNoteMnemonicToBeSureTypeWord".tr( + args: [(_generateWalletProvider.nbrWord + 1).toString()]), 20, true), SizedBox(height: isTall ? 70 : 20), diff --git a/lib/screens/onBoarding/7.dart b/lib/screens/onBoarding/7.dart index 1c7b6ee..b266009 100644 --- a/lib/screens/onBoarding/7.dart +++ b/lib/screens/onBoarding/7.dart @@ -1,4 +1,5 @@ // ignore_for_file: file_names +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; import 'package:gecko/globals.dart'; @@ -18,11 +19,11 @@ class OnboardingStepSeven extends StatelessWidget { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Mon code secret', - style: TextStyle(fontWeight: FontWeight.w600), + 'myPassword'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), @@ -30,7 +31,7 @@ class OnboardingStepSeven extends StatelessWidget { body: SafeArea( child: common.infoIntro( context, - 'Gecko va maintenant générer pour vous un code secret court qui vous permettra d’accéder rapidement à vos portefeuilles, sans avoir à taper votre phrase de restauration à chaque fois.', + 'geckoWillGenerateAPassword'.tr(), 'coffre-fort-code-secret-dans-telephone.png', '>', OnboardingStepEight(scanDerivation: scanDerivation), diff --git a/lib/screens/onBoarding/8.dart b/lib/screens/onBoarding/8.dart index ff7a401..f9234e3 100644 --- a/lib/screens/onBoarding/8.dart +++ b/lib/screens/onBoarding/8.dart @@ -1,4 +1,5 @@ // ignore_for_file: file_names +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; import 'package:gecko/globals.dart'; @@ -18,11 +19,11 @@ class OnboardingStepEight extends StatelessWidget { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Mon code secret', - style: TextStyle(fontWeight: FontWeight.w600), + 'myPassword'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ), diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart index 8f26873..647d834 100644 --- a/lib/screens/onBoarding/9.dart +++ b/lib/screens/onBoarding/9.dart @@ -1,4 +1,5 @@ // ignore_for_file: file_names +import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/services.dart'; import 'package:flutter/material.dart'; import 'package:gecko/globals.dart'; @@ -30,11 +31,11 @@ class OnboardingStepNine extends StatelessWidget { backgroundColor: backgroundColor, appBar: AppBar( toolbarHeight: 60 * ratio, - title: const SizedBox( + title: SizedBox( height: 22, child: Text( - 'Mon code secret', - style: TextStyle(fontWeight: FontWeight.w600), + 'myPassword'.tr(), + style: const TextStyle(fontWeight: FontWeight.w600), ), ), ),