Merge pull request #414 from ardriveapp/PE-663

PE-663: Neutral Spanish translations
ardriveapp · Apr 11, 2022 · eb4e98b · eb4e98b
2 parents cdc9a06 + d9d986a
commit eb4e98b
Show file tree

Hide file tree

Showing 10 changed files with 1,275 additions and 48 deletions.
diff --git a/lib/components/app_drawer/app_drawer.dart b/lib/components/app_drawer/app_drawer.dart
@@ -140,7 +140,8 @@ class AppDrawer extends StatelessWidget {
                               return Padding(
                                 padding: const EdgeInsets.all(8.0),
                                 child: Text(
-                                  'Version ${snapshot.data!.version}',
+                                  appLocalizationsOf(context)
+                                      .appVersion(snapshot.data!.version),
                                   style: Theme.of(context)
                                       .textTheme
                                       .caption!
@@ -291,7 +292,7 @@ class AppDrawer extends StatelessWidget {
                         Padding(
                           padding: const EdgeInsets.all(8.0),
                           child: Text(
-                            R.insufficientARWarning,
+                            appLocalizationsOf(context).insufficientARWarning,
                             style: Theme.of(context)
                                 .textTheme
                                 .caption!

diff --git a/lib/components/fs_entry_move_form.dart b/lib/components/fs_entry_move_form.dart
@@ -5,7 +5,6 @@ import 'package:ardrive/services/services.dart';
 import 'package:ardrive/theme/theme.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:responsive_builder/responsive_builder.dart';
 
 import '../../../utils/app_localizations_wrapper.dart';
 import 'components.dart';
@@ -212,24 +211,15 @@ class FsEntryMoveForm extends StatelessWidget {
                         ),
                         Divider(),
                         Padding(
-                            padding: const EdgeInsets.only(right: 16),
-                            child: ScreenTypeLayout(
-                              desktop: Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
-                                children: [
-                                  _buildCreateFolderButton(),
-                                  _buildButtonBar(),
-                                ],
-                              ),
-                              mobile: Wrap(
-                                alignment: WrapAlignment.spaceBetween,
-                                children: [
-                                  _buildCreateFolderButton(),
-                                  _buildButtonBar(),
-                                ],
-                              ),
-                            )),
+                          padding: const EdgeInsets.only(right: 16),
+                          child: Wrap(
+                            alignment: WrapAlignment.spaceBetween,
+                            children: [
+                              _buildCreateFolderButton(),
+                              _buildButtonBar(),
+                            ],
+                          ),
+                        )
                       ],
                     ),
                   )

diff --git a/lib/components/upload_form.dart b/lib/components/upload_form.dart
@@ -117,12 +117,12 @@ class UploadForm extends StatelessWidget {
                     mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      Text(state.conflictingFileNames.length == 1
-                          ? appLocalizationsOf(context)
-                              .aFileWithSameNameAlreadyExists
-                          : appLocalizationsOf(context)
-                              .filesWithTheSameNameAlreadyExists(
-                                  state.conflictingFileNames.length)),
+                      Text(
+                        appLocalizationsOf(context)
+                            .filesWithTheSameNameAlreadyExists(
+                          state.conflictingFileNames.length,
+                        ),
+                      ),
                       const SizedBox(height: 16),
                       Text(appLocalizationsOf(context).conflictingFiles),
                       const SizedBox(height: 8),

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -1,14 +1,14 @@
 {
   "@@locale": "en",
-  "welcomeTo_body": "Welcome to your private and secure, decentralized, pay-as-you-go, censorship-resistant and permanent hard drive",
+  "welcomeTo_body": "WELCOME TO Your private and secure, decentralized, pay-as-you-go, censorship-resistant and permanent hard drive",
   "@welcomeTo_body": {
     "description": "Welcoming message just after the ArDrive logo"
   },
-  "welcomeTo_main": "Welcome to",
+  "welcomeTo_main": "WELCOME TO",
   "@welcomeTo_main": {
     "description": "Highly emphasized text giving welcome"
   },
-  "welcomeTo_description": "your private and secure, decentralized, pay-as-you-go, censorship-resistant and permanent hard drive",
+  "welcomeTo_description": "Your private and secure, decentralized, pay-as-you-go, censorship-resistant and permanent hard drive",
   "@welcomeTo_description": {
     "description": "Brief description of ArDrive as welcoming"
   },
@@ -144,6 +144,10 @@
   "@aggreeToTerms_body": {
     "description": "Checkbox for agreeing the terms of of service and privacy policy"
   },
+  "aggreeToTerms_main": "I agree to the ",
+  "@aggreeToTerms_main": {
+    "description": "Checkbox for agreeing the terms of of service and privacy policy"
+  },
   "aggreeToTerms_link": "ArDrive terms of service and privacy policy",
   "@aggreeToTerms_link": {
     "description": "Segment of text representing a link to the legal documents"
@@ -503,8 +507,8 @@
   "@help": {
     "description": "Link to a form for collecting feedback from the user"
   },
-  "appVersoin": "Version {version}.",
-  "@appVersoin": {
+  "appVersion": "Version {version}.",
+  "@appVersion": {
     "description": "App version number",
     "placeholders": {
       "version": {
@@ -800,11 +804,7 @@
       }
     }
   },
-  "aFileWithSameNameAlreadyExists": "A file with the same name already exists at this location. Do you want to continue and upload this file as a new version?",
-  "@aFileWithSameNameAlreadyExists": {
-    "description": "Asks the user what to do with the items conflicting name"
-  },
-  "filesWithTheSameNameAlreadyExists": "{numberOfFiles} files with the same name already exists at this location. Do you want to continue and upload these files as a new version?",
+  "filesWithTheSameNameAlreadyExists": "{numberOfFiles,plural, =1{A file with the same name already exists at this location. Do you want to continue and upload this file as a new version?} =other{{numberOfFiles} files with the same name already exists at this location. Do you want to continue and upload these files as a new version?}}",
   "@filesWithTheSameNameAlreadyExists": {
     "description": "Asks the user what to do with the items conflicting names",
     "placeholders": {
@@ -1028,7 +1028,7 @@
   },
   "folderCount": "{folderCount,plural, =0{No folders} =1{1 folder} other{{folderCount} folders}",
   "@folderCount": {
-    "description": "Plurals for the folder count",
+    "description": "Plurals for the folder count. First character in lower case",
     "placeholders": {
       "folderCount": {
         "type": "int",
@@ -1039,7 +1039,7 @@
   },
   "fileCount": "{fileCount,plural, =0{no files} =1{1 file} other{{fileCount} files}}",
   "@fileCount": {
-    "description": "Plurals for the file count",
+    "description": "Plurals for the file count. First character in lower case",
     "placeholders": {
       "fileCount": {
         "type": "int",
@@ -1106,7 +1106,7 @@
   },
   "conflictingNameFoundChooseNewName": "An entity with that name already exists at this location. Please choose a new name.",
   "@conflictingNameFoundChooseNewName": {
-    "description": "The user must type a non-conflicting name"
+    "description": "The given name is conflicting with some entity, the user must type a non-conflicting name"
   },
   "conflictingManifestFound": "Conflicting manifest was found",
   "@conflictingManifestFound": {
@@ -1187,5 +1187,30 @@
   "validationNameUnchanged": "This name is identical to the current name",
   "@validationNameUnchanged": {
     "description": "Input validation error: The given name is exactly the same"
+  },
+  "insufficientARWarning": "Insufficient Funds",
+  "@insufficientARWarning": {
+    "description": "Warns the user that the wallet balance is less than minimum AR required to make a transaction"
+  },
+  "displayedPaginatedData": "{from} - {to} of {total}",
+  "@displayedPaginatedData": {
+    "description": "Indicates the user what items of a list are being displayed. Example: 1 - 25 of 100",
+    "placeholders": {
+      "from": {
+        "type": "int",
+        "format": "decimalPattern",
+        "example": "1"
+      },
+      "to": {
+        "type": "int",
+        "format": "decimalPattern",
+        "example": "25"
+      },
+      "total": {
+        "type": "int",
+        "format": "decimalPattern",
+        "example": "100"
+      }
+    }
   }
 }