Merge pull request #9 from peercoin/i18n-defect

I18n defect
peercoin · Mar 22, 2021 · 4a22089 · 4a22089
2 parents f0ce46a + 9c21476
commit 4a22089
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -55,5 +55,5 @@
   "transactions_all": "All",
   "transactions_out": "Out",
   "transactions_none": "No transactions yet",
-  "transactions_fee": "-&amount \nFee"
+  "transactions_fee": "-$amount \nFee"
 }
diff --git a/assets/translations/nl.json b/assets/translations/nl.json
@@ -55,5 +55,5 @@
   "transactions_all": "Alle",
   "transactions_out": "Uit",
   "transactions_none": "Geen transacties gevonden",
-  "transactions_fee": "-&amount \nContributie"
+  "transactions_fee": "-$amount \nContributie"
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,25 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:hive/hive.dart';
 import 'package:hive_flutter/hive_flutter.dart';
-import 'package:peercoin/app_localizations.dart';
-import 'package:peercoin/models/coinwallet.dart';
-import 'package:peercoin/models/walletaddress.dart';
-import 'package:peercoin/models/wallettransaction.dart';
-import 'package:peercoin/models/walletutxo.dart';
-import 'package:peercoin/providers/activewallets.dart';
-import 'package:peercoin/providers/electrumconnection.dart';
-import 'package:peercoin/screens/new_wallet.dart';
-import 'package:peercoin/screens/qrcodescanner.dart';
-import 'package:peercoin/screens/transaction_details.dart';
-import 'package:peercoin/screens/wallet_home.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:hive/hive.dart';
-import 'package:hive_flutter/hive_flutter.dart';
-import 'package:peercoin/models/notification.dart';
-import 'package:peercoin/screens/app_settings.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:provider/provider.dart';
 
 import './models/coinwallet.dart';
 import './models/walletaddress.dart';
@@ -37,6 +21,8 @@ import './screens/wallet_home.dart';
 import './screens/setup_save_seed.dart';
 import './screens/setup.dart';
 import './screens/wallet_list.dart';
+import './screens/app_settings.dart';
+import './app_localizations.dart';
 
 bool setupFinished;
 

diff --git a/lib/widgets/transactions_list.dart b/lib/widgets/transactions_list.dart
@@ -41,19 +41,23 @@ class _TransactionListState extends State<TransactionList> {
           children: <Widget>[
             ChoiceChip(
               visualDensity: VisualDensity(horizontal: 0.0, vertical: -4),
-              label: Container(child: Text(AppLocalizations.instance.translate('transactions_in',null))),
+              label: Container(
+                  child: Text(AppLocalizations.instance
+                      .translate('transactions_in', null))),
               selected: _filterChoice == "in",
               onSelected: (_) => _handleSelect("in"),
             ),
             ChoiceChip(
               visualDensity: VisualDensity(horizontal: 0.0, vertical: -4),
-              label: Text(AppLocalizations.instance.translate('transactions_all',null)),
+              label: Text(AppLocalizations.instance
+                  .translate('transactions_all', null)),
               selected: _filterChoice == "all",
               onSelected: (_) => _handleSelect("all"),
             ),
             ChoiceChip(
               visualDensity: VisualDensity(horizontal: 0.0, vertical: -4),
-              label: Text(AppLocalizations.instance.translate('transactions_out',null)),
+              label: Text(AppLocalizations.instance
+                  .translate('transactions_out', null)),
               selected: _filterChoice == "out",
               onSelected: (_) => _handleSelect("out"),
             ),
@@ -62,7 +66,8 @@ class _TransactionListState extends State<TransactionList> {
       Expanded(
         child: widget._walletTransactions.length == 0
             ? Center(
-                child: Text(AppLocalizations.instance.translate('transactions_none',null)),
+                child: Text(AppLocalizations.instance
+                    .translate('transactions_none', null)),
               )
             : GestureDetector(
                 onHorizontalDragEnd: (dragEndDetails) {
@@ -166,7 +171,11 @@ class _TransactionListState extends State<TransactionList> {
                                       : Colors.black),
                             ),
                             if (_filteredTx[i].direction == "out")
-                              Text(AppLocalizations.instance.translate('transactions_fee',{'amount': "${_filteredTx[i].fee / 1000000}"}),
+                              Text(
+                                AppLocalizations.instance.translate(
+                                    'transactions_fee', {
+                                  'amount': "${_filteredTx[i].fee / 1000000}"
+                                }),
                                 textAlign: TextAlign.center,
                                 style: TextStyle(
                                     fontSize: 12,