From 023336d46026d88db5add907797eba02038eef66 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Tue, 22 Dec 2020 20:42:30 +0200 Subject: [PATCH 1/7] CAKE-198 | applied ability to make a note with some details about transaction; added transactionNote property and note getter to transaction_description.dart; added multiline textfield for notes (send_page.dart); added transaction_details_list_item.dart, textfield_list_item.dart, textfield_list_row.dart, transaction_details_view_model.dart to the app --- lib/di.dart | 13 +- lib/entities/transaction_description.dart | 7 +- lib/src/screens/send/send_page.dart | 40 ++++++ .../standart_list_item.dart | 8 +- .../textfield_list_item.dart | 8 ++ .../transaction_details_list_item.dart | 6 + .../transaction_details_page.dart | 119 +++++------------- .../widgets/textfield_list_row.dart | 91 ++++++++++++++ lib/src/widgets/base_text_form_field.dart | 2 +- lib/view_model/send/send_view_model.dart | 8 +- .../transaction_details_view_model.dart | 105 ++++++++++++++++ 11 files changed, 312 insertions(+), 95 deletions(-) create mode 100644 lib/src/screens/transaction_details/textfield_list_item.dart create mode 100644 lib/src/screens/transaction_details/transaction_details_list_item.dart create mode 100644 lib/src/screens/transaction_details/widgets/textfield_list_row.dart create mode 100644 lib/view_model/transaction_details_view_model.dart diff --git a/lib/di.dart b/lib/di.dart index 12828300d..e08748171 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -55,6 +55,7 @@ import 'package:cake_wallet/view_model/node_list/node_list_view_model.dart'; import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart'; import 'package:cake_wallet/view_model/rescan_view_model.dart'; import 'package:cake_wallet/view_model/setup_pin_code_view_model.dart'; +import 'package:cake_wallet/view_model/transaction_details_view_model.dart'; import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart'; import 'package:cake_wallet/view_model/auth_view_model.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; @@ -415,11 +416,17 @@ Future setup( getIt.registerFactoryParam((type, _) => WalletRestorePage(getIt.get(param1: type))); + getIt.registerFactoryParam + ((TransactionInfo transactionInfo, _) => TransactionDetailsViewModel( + transactionInfo: transactionInfo, + transactionDescriptionBox: transactionDescriptionBox, + settingsStore: getIt.get() + )); + getIt.registerFactoryParam( (TransactionInfo transactionInfo, _) => TransactionDetailsPage( - transactionInfo, - getIt.get().shouldSaveRecipientAddress, - transactionDescriptionBox)); + transactionDetailsViewModel: getIt + .get(param1: transactionInfo))); getIt.registerFactoryParam( diff --git a/lib/entities/transaction_description.dart b/lib/entities/transaction_description.dart index 3f817fe4f..65f9d4263 100644 --- a/lib/entities/transaction_description.dart +++ b/lib/entities/transaction_description.dart @@ -4,7 +4,7 @@ part 'transaction_description.g.dart'; @HiveType(typeId: 2) class TransactionDescription extends HiveObject { - TransactionDescription({this.id, this.recipientAddress}); + TransactionDescription({this.id, this.recipientAddress, this.transactionNote}); static const boxName = 'TransactionDescriptions'; static const boxKey = 'transactionDescriptionsBoxKey'; @@ -14,4 +14,9 @@ class TransactionDescription extends HiveObject { @HiveField(1) String recipientAddress; + + @HiveField(2) + String transactionNote; + + String get note => transactionNote ?? ''; } diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index 1a18b5ba6..db943148d 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -31,6 +31,7 @@ class SendPage extends BasePage { : _addressController = TextEditingController(), _cryptoAmountController = TextEditingController(), _fiatAmountController = TextEditingController(), + _noteController = TextEditingController(), _formKey = GlobalKey(), _cryptoAmountFocus = FocusNode(), _fiatAmountFocus = FocusNode(), @@ -46,6 +47,7 @@ class SendPage extends BasePage { final TextEditingController _addressController; final TextEditingController _cryptoAmountController; final TextEditingController _fiatAmountController; + final TextEditingController _noteController; final GlobalKey _formKey; final FocusNode _cryptoAmountFocus; final FocusNode _fiatAmountFocus; @@ -304,6 +306,30 @@ class SendPage extends BasePage { fontWeight: FontWeight.w500, fontSize: 14), )), + Padding( + padding: EdgeInsets.only(top: 20), + child: BaseTextFormField( + controller: _noteController, + keyboardType: TextInputType.multiline, + maxLines: null, + borderColor: Theme.of(context) + .primaryTextTheme + .headline + .color, + textStyle: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w500, + color: Colors.white), + hintText: 'Note (optional)', + placeholderTextStyle: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w500, + color: Theme.of(context) + .primaryTextTheme + .headline + .decorationColor), + ), + ), Observer( builder: (_) => GestureDetector( onTap: () => @@ -534,6 +560,14 @@ class SendPage extends BasePage { } }); + _noteController.addListener(() { + final note = _noteController.text ?? ''; + + if (note != sendViewModel.note) { + sendViewModel.note = note; + } + }); + reaction((_) => sendViewModel.sendAll, (bool all) { if (all) { _cryptoAmountController.text = S.current.all; @@ -571,6 +605,12 @@ class SendPage extends BasePage { } }); + reaction((_) => sendViewModel.note, (String note) { + if (note != _noteController.text) { + _noteController.text = note; + } + }); + reaction((_) => sendViewModel.state, (ExecutionState state) { if (state is FailureState) { WidgetsBinding.instance.addPostFrameCallback((_) { diff --git a/lib/src/screens/transaction_details/standart_list_item.dart b/lib/src/screens/transaction_details/standart_list_item.dart index 9cf23eeb5..728ec5cc0 100644 --- a/lib/src/screens/transaction_details/standart_list_item.dart +++ b/lib/src/screens/transaction_details/standart_list_item.dart @@ -1,6 +1,6 @@ -class StandartListItem { - StandartListItem({this.title, this.value}); +import 'package:cake_wallet/src/screens/transaction_details/transaction_details_list_item.dart'; - final String title; - final String value; +class StandartListItem extends TransactionDetailsListItem { + StandartListItem({String title, String value}) + : super(title: title, value: value); } diff --git a/lib/src/screens/transaction_details/textfield_list_item.dart b/lib/src/screens/transaction_details/textfield_list_item.dart new file mode 100644 index 000000000..2bc6010c0 --- /dev/null +++ b/lib/src/screens/transaction_details/textfield_list_item.dart @@ -0,0 +1,8 @@ +import 'package:cake_wallet/src/screens/transaction_details/transaction_details_list_item.dart'; + +class TextFieldListItem extends TransactionDetailsListItem { + TextFieldListItem({String title, String value, this.onSubmitted}) + : super(title: title, value: value); + + final Function(String value) onSubmitted; +} \ No newline at end of file diff --git a/lib/src/screens/transaction_details/transaction_details_list_item.dart b/lib/src/screens/transaction_details/transaction_details_list_item.dart new file mode 100644 index 000000000..3f666ea34 --- /dev/null +++ b/lib/src/screens/transaction_details/transaction_details_list_item.dart @@ -0,0 +1,6 @@ +abstract class TransactionDetailsListItem { + TransactionDetailsListItem({this.title, this.value}); + + final String title; + final String value; +} \ No newline at end of file diff --git a/lib/src/screens/transaction_details/transaction_details_page.dart b/lib/src/screens/transaction_details/transaction_details_page.dart index 3a7c7e591..a0e1b3c7a 100644 --- a/lib/src/screens/transaction_details/transaction_details_page.dart +++ b/lib/src/screens/transaction_details/transaction_details_page.dart @@ -1,87 +1,21 @@ -import 'package:cake_wallet/entities/transaction_description.dart'; +import 'package:cake_wallet/src/screens/transaction_details/textfield_list_item.dart'; +import 'package:cake_wallet/src/screens/transaction_details/widgets/textfield_list_row.dart'; import 'package:cake_wallet/utils/show_bar.dart'; +import 'package:cake_wallet/view_model/transaction_details_view_model.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:cake_wallet/generated/i18n.dart'; -import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart'; -import 'package:cake_wallet/monero/monero_transaction_info.dart'; -import 'package:cake_wallet/entities/transaction_info.dart'; import 'package:cake_wallet/src/widgets/standart_list_row.dart'; import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; -import 'package:cake_wallet/utils/date_formatter.dart'; -import 'package:hive/hive.dart'; class TransactionDetailsPage extends BasePage { - TransactionDetailsPage(this.transactionInfo, bool showRecipientAddress, - Box transactionDescriptionBox) - : _items = [] { - final dateFormat = DateFormatter.withCurrentLocal(); - final tx = transactionInfo; - - if (tx is MoneroTransactionInfo) { - final items = [ - StandartListItem( - title: S.current.transaction_details_transaction_id, value: tx.id), - StandartListItem( - title: S.current.transaction_details_date, - value: dateFormat.format(tx.date)), - StandartListItem( - title: S.current.transaction_details_height, value: '${tx.height}'), - StandartListItem( - title: S.current.transaction_details_amount, - value: tx.amountFormatted()), - StandartListItem(title: S.current.send_fee, value: tx.feeFormatted()) - ]; - - if (tx.key?.isNotEmpty ?? null) { - // FIXME: add translation - items.add(StandartListItem(title: 'Transaction Key', value: tx.key)); - } - - _items.addAll(items); - } - - if (tx is BitcoinTransactionInfo) { - final items = [ - StandartListItem( - title: S.current.transaction_details_transaction_id, value: tx.id), - StandartListItem( - title: S.current.transaction_details_date, - value: dateFormat.format(tx.date)), - StandartListItem( - title: 'Confirmations', value: tx.confirmations?.toString()), - StandartListItem( - title: S.current.transaction_details_height, value: '${tx.height}'), - StandartListItem( - title: S.current.transaction_details_amount, - value: tx.amountFormatted()), - if (tx.feeFormatted()?.isNotEmpty) - StandartListItem(title: S.current.send_fee, value: tx.feeFormatted()) - ]; - - _items.addAll(items); - } - - if (showRecipientAddress) { - final recipientAddress = transactionDescriptionBox.values - .firstWhere((val) => val.id == transactionInfo.id, orElse: () => null) - ?.recipientAddress; - - if (recipientAddress?.isNotEmpty ?? false) { - _items.add(StandartListItem( - title: S.current.transaction_details_recipient_address, - value: recipientAddress)); - } - } - } + TransactionDetailsPage({this.transactionDetailsViewModel}); @override String get title => S.current.transaction_details_title; - final TransactionInfo transactionInfo; - - final List _items; + final TransactionDetailsViewModel transactionDetailsViewModel; @override Widget body(BuildContext context) { @@ -97,22 +31,37 @@ class TransactionDetailsPage extends BasePage { Theme.of(context).primaryTextTheme.title.backgroundColor, ), ), - itemCount: _items.length, + itemCount: transactionDetailsViewModel.items.length, itemBuilder: (context, index) { - final item = _items[index]; - final isDrawBottom = index == _items.length - 1 ? true : false; + final item = transactionDetailsViewModel.items[index]; + final isDrawBottom = + index == transactionDetailsViewModel.items.length - 1 + ? true : false; - return GestureDetector( - onTap: () { - Clipboard.setData(ClipboardData(text: item.value)); - showBar(context, - S.of(context).transaction_details_copied(item.title)); - }, - child: StandartListRow( - title: '${item.title}:', - value: item.value, - isDrawBottom: isDrawBottom), - ); + if (item is StandartListItem) { + return GestureDetector( + onTap: () { + Clipboard.setData(ClipboardData(text: item.value)); + showBar(context, + S.of(context).transaction_details_copied(item.title)); + }, + child: StandartListRow( + title: '${item.title}:', + value: item.value, + isDrawBottom: isDrawBottom), + ); + } + + if (item is TextFieldListItem) { + return TextFieldListRow( + title: item.title, + value: item.value, + onSubmitted: item.onSubmitted, + isDrawBottom: isDrawBottom, + ); + } + + return null; }), ); } diff --git a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart new file mode 100644 index 000000000..3f2f2d877 --- /dev/null +++ b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart @@ -0,0 +1,91 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; + +class TextFieldListRow extends StatelessWidget { + TextFieldListRow( + {this.title, + this.value, + this.titleFontSize = 14, + this.valueFontSize = 16, + this.onSubmitted, + this.isDrawBottom = false}) { + + _textController = TextEditingController(); + _textController.text = value; + } + + final String title; + final String value; + final double titleFontSize; + final double valueFontSize; + final Function(String value) onSubmitted; + final bool isDrawBottom; + + TextEditingController _textController; + + @override + Widget build(BuildContext context) { + return Column( + children: [ + Container( + width: double.infinity, + color: Theme.of(context).backgroundColor, + child: Padding( + padding: + const EdgeInsets.only(left: 24, top: 16, bottom: 16, right: 24), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(title, + style: TextStyle( + fontSize: titleFontSize, + fontWeight: FontWeight.w500, + color: + Theme.of(context).primaryTextTheme.overline.color), + textAlign: TextAlign.left), + TextField( + controller: _textController, + keyboardType: TextInputType.multiline, + textInputAction: TextInputAction.done, + maxLines: null, + textAlign: TextAlign.start, + style: TextStyle( + fontSize: valueFontSize, + fontWeight: FontWeight.w500, + color: Theme.of(context) + .primaryTextTheme + .title + .color), + decoration: InputDecoration( + isDense: true, + contentPadding: EdgeInsets.only(top: 12, bottom: 0), + hintText: 'Note', + hintStyle: TextStyle( + fontSize: valueFontSize, + fontWeight: FontWeight.w500, + color: Theme.of(context) + .primaryTextTheme + .title + .color), + border: InputBorder.none + ), + onSubmitted: (value) => onSubmitted.call(value), + ) + ]), + ), + ), + isDrawBottom + ? Container( + height: 1, + padding: EdgeInsets.only(left: 24), + color: Theme.of(context).backgroundColor, + child: Container( + height: 1, + color: Theme.of(context).primaryTextTheme.title.backgroundColor, + ), + ) + : Offstage(), + ], + ); + } +} diff --git a/lib/src/widgets/base_text_form_field.dart b/lib/src/widgets/base_text_form_field.dart index 2c296df25..b9148bf2c 100644 --- a/lib/src/widgets/base_text_form_field.dart +++ b/lib/src/widgets/base_text_form_field.dart @@ -51,7 +51,7 @@ class BaseTextFormField extends StatelessWidget { final FocusNode focusNode; final bool readOnly; final bool enableInteractiveSelection; - String initialValue; + final String initialValue; @override Widget build(BuildContext context) { diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart index f3d46ccb3..c56230c59 100644 --- a/lib/view_model/send/send_view_model.dart +++ b/lib/view_model/send/send_view_model.dart @@ -37,6 +37,7 @@ abstract class SendViewModelBase with Store { this._fiatConversationStore, this.transactionDescriptionBox) : state = InitialExecutionState(), _cryptoNumberFormat = NumberFormat(), + note = '', sendAll = false { _setCryptoNumMaximumFractionDigits(); } @@ -53,6 +54,9 @@ abstract class SendViewModelBase with Store { @observable String address; + @observable + String note; + @observable bool sendAll; @@ -105,6 +109,7 @@ abstract class SendViewModelBase with Store { cryptoAmount = ''; fiatAmount = ''; address = ''; + note = ''; } @action @@ -127,7 +132,8 @@ abstract class SendViewModelBase with Store { if (_settingsStore.shouldSaveRecipientAddress && (pendingTransaction.id?.isNotEmpty ?? false)) { await transactionDescriptionBox.add(TransactionDescription( - id: pendingTransaction.id, recipientAddress: address)); + id: pendingTransaction.id, recipientAddress: address, + transactionNote: note)); } state = TransactionCommitted(); diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart new file mode 100644 index 000000000..e3f57c9a3 --- /dev/null +++ b/lib/view_model/transaction_details_view_model.dart @@ -0,0 +1,105 @@ +import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart'; +import 'package:cake_wallet/entities/transaction_info.dart'; +import 'package:cake_wallet/monero/monero_transaction_info.dart'; +import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart'; +import 'package:cake_wallet/src/screens/transaction_details/textfield_list_item.dart'; +import 'package:cake_wallet/src/screens/transaction_details/transaction_details_list_item.dart'; +import 'package:cake_wallet/utils/date_formatter.dart'; +import 'package:cake_wallet/entities/transaction_description.dart'; +import 'package:hive/hive.dart'; +import 'package:mobx/mobx.dart'; +import 'package:cake_wallet/store/settings_store.dart'; +import 'package:cake_wallet/generated/i18n.dart'; + +part 'transaction_details_view_model.g.dart'; + +class TransactionDetailsViewModel = TransactionDetailsViewModelBase with _$TransactionDetailsViewModel; + +abstract class TransactionDetailsViewModelBase with Store { + TransactionDetailsViewModelBase({ + this.transactionInfo, + this.transactionDescriptionBox, + this.settingsStore}) : items = [] { + + showRecipientAddress = settingsStore?.shouldSaveRecipientAddress ?? false; + + final dateFormat = DateFormatter.withCurrentLocal(); + final tx = transactionInfo; + + if (tx is MoneroTransactionInfo) { + final _items = [ + StandartListItem( + title: S.current.transaction_details_transaction_id, value: tx.id), + StandartListItem( + title: S.current.transaction_details_date, + value: dateFormat.format(tx.date)), + StandartListItem( + title: S.current.transaction_details_height, value: '${tx.height}'), + StandartListItem( + title: S.current.transaction_details_amount, + value: tx.amountFormatted()), + StandartListItem(title: S.current.send_fee, value: tx.feeFormatted()), + ]; + + if (tx.key?.isNotEmpty ?? null) { + // FIXME: add translation + _items.add(StandartListItem(title: 'Transaction Key', value: tx.key)); + } + + items.addAll(_items); + } + + if (tx is BitcoinTransactionInfo) { + final _items = [ + StandartListItem( + title: S.current.transaction_details_transaction_id, value: tx.id), + StandartListItem( + title: S.current.transaction_details_date, + value: dateFormat.format(tx.date)), + // FIXME: add translation + StandartListItem( + title: 'Confirmations', value: tx.confirmations?.toString()), + StandartListItem( + title: S.current.transaction_details_height, value: '${tx.height}'), + StandartListItem( + title: S.current.transaction_details_amount, + value: tx.amountFormatted()), + if (tx.feeFormatted()?.isNotEmpty) + StandartListItem(title: S.current.send_fee, value: tx.feeFormatted()) + ]; + + items.addAll(_items); + } + + if (showRecipientAddress) { + final recipientAddress = transactionDescriptionBox.values + .firstWhere((val) => val.id == transactionInfo.id, orElse: () => null) + ?.recipientAddress; + + if (recipientAddress?.isNotEmpty ?? false) { + items.add(StandartListItem( + title: S.current.transaction_details_recipient_address, + value: recipientAddress)); + } + } + + final description = transactionDescriptionBox.values.firstWhere( + (val) => val.id == transactionInfo.id, orElse: () => null); + + if (description != null) { + // FIXME: add translation + items.add(TextFieldListItem(title: 'Note (tap to change)', + value: description.note, onSubmitted: (value) { + description.transactionNote = value; + description.save(); + })); + } + } + + final TransactionInfo transactionInfo; + final Box transactionDescriptionBox; + final SettingsStore settingsStore; + + final List items; + bool showRecipientAddress; +} \ No newline at end of file From 139f223de85ae1022738c88dbe8f89bec9f69b68 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Wed, 23 Dec 2020 10:39:59 +0200 Subject: [PATCH 2/7] CAKE-198 | fixed string resources --- lib/generated/i18n.dart | 161 +++++++++++++++--- .../exchange_trade/exchange_trade_page.dart | 6 +- lib/src/screens/send/send_page.dart | 6 +- .../widgets/textfield_list_row.dart | 3 +- .../transaction_details_view_model.dart | 15 +- res/values/strings_de.arb | 8 +- res/values/strings_en.arb | 8 +- res/values/strings_es.arb | 8 +- res/values/strings_hi.arb | 8 +- res/values/strings_ja.arb | 8 +- res/values/strings_ko.arb | 8 +- res/values/strings_nl.arb | 8 +- res/values/strings_pl.arb | 8 +- res/values/strings_pt.arb | 8 +- res/values/strings_ru.arb | 8 +- res/values/strings_uk.arb | 8 +- res/values/strings_zh.arb | 8 +- 17 files changed, 235 insertions(+), 52 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 2abfd2a18..be5d653c9 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -63,6 +63,7 @@ class S implements WidgetsLocalizations { String get confirm_delete_template => "This action will delete this template. Do you wish to continue?"; String get confirm_delete_wallet => "This action will delete this wallet. Do you wish to continue?"; String get confirm_sending => "Confirm sending"; + String get confirmations => "Confirmations"; String get contact => "Contact"; String get contact_name => "Contact Name"; String get continue_text => "Continue"; @@ -127,6 +128,9 @@ class S implements WidgetsLocalizations { String get node_test => "Test"; String get nodes => "Nodes"; String get nodes_list_reset_to_default_message => "Are you sure that you want to reset settings to default?"; + String get note => "Note"; + String get note_optional => "Note (optional)"; + String get note_tap_to_change => "Note (tap to change)"; String get offer_expires_in => "Offer expires in: "; String get ok => "OK"; String get openalias_alert_title => "XMR Recipient Detected"; @@ -212,13 +216,13 @@ class S implements WidgetsLocalizations { String get send_error_currency => "Currency can only contain numbers"; String get send_error_minimum_value => "Minimum value of amount is 0.01"; String get send_estimated_fee => "Estimated fee:"; - String get send_fee => "Fee"; + String get send_fee => "Fee:"; String get send_got_it => "Got it"; String get send_name => "Name"; String get send_new => "New"; String get send_payment_id => "Payment ID (optional)"; String get send_sending => "Sending..."; - String send_success(String crypto) => "Your ${crypto} was successfully sent"; + String get send_success => "Your Monero was successfully sent"; String get send_templates => "Templates"; String get send_title => "Send"; String get send_xmr => "Send XMR"; @@ -298,6 +302,7 @@ class S implements WidgetsLocalizations { String get transaction_details_recipient_address => "Recipient address"; String get transaction_details_title => "Transaction Details"; String get transaction_details_transaction_id => "Transaction ID"; + String get transaction_key => "Transaction Key"; String get transaction_priority_fast => "Fast"; String get transaction_priority_fastest => "Fastest"; String get transaction_priority_medium => "Medium"; @@ -402,7 +407,7 @@ class $de extends S { @override String get transaction_sent => "Transaktion gesendet!"; @override - String get send_fee => "Gebühr"; + String get send_fee => "Gebühr:"; @override String get password => "Passwort"; @override @@ -446,6 +451,8 @@ class $de extends S { @override String get placeholder_contacts => "Ihre Kontakte werden hier angezeigt"; @override + String get transaction_key => "Transaktionsschlüssel"; + @override String get card_address => "Adresse:"; @override String get seed_language_portuguese => "Portugiesisch"; @@ -518,6 +525,8 @@ class $de extends S { @override String get node_connection_successful => "Die Verbindung war erfolgreich"; @override + String get confirmations => "Bestätigungen"; + @override String get confirm => "Bestätigen"; @override String get settings_display_balance_as => "Kontostand anzeigen als"; @@ -554,6 +563,8 @@ class $de extends S { @override String get address_book_menu => "Adressbuch"; @override + String get note_optional => "Hinweis (optional)"; + @override String get wallet_restoration_store_incorrect_seed_length => "Falsche Samenlänge"; @override String get seed_language_spanish => "Spanisch"; @@ -642,7 +653,7 @@ class $de extends S { @override String get trade_details_created_at => "Hergestellt in"; @override - String send_success(String crypto) => "Ihr ${crypto} wurde erfolgreich gesendet"; + String get send_success => "Ihr Monero wurde erfolgreich gesendet"; @override String get settings_wallets => "Brieftaschen"; @override @@ -684,6 +695,8 @@ class $de extends S { @override String get transaction_details_date => "Datum"; @override + String get note_tap_to_change => "Hinweis (zum Ändern tippen)"; + @override String get show_seed => "Seed zeigen"; @override String get send_error_currency => "Die Währung kann nur Zahlen enthalten"; @@ -906,6 +919,8 @@ class $de extends S { @override String get settings_save_recipient_address => "Empfängeradresse speichern"; @override + String get note => "Hinweis"; + @override String get change_exchange_provider => "Wechseln Sie den Exchange-Anbieter"; @override String get send_payment_id => "Zahlungs ID (wahlweise)"; @@ -1146,6 +1161,8 @@ class $hi extends S { @override String get placeholder_contacts => "आपके संपर्क यहां प्रदर्शित होंगे"; @override + String get transaction_key => "लेन-देन की"; + @override String get card_address => "पता:"; @override String get seed_language_portuguese => "पुर्तगाली"; @@ -1218,6 +1235,8 @@ class $hi extends S { @override String get node_connection_successful => "कनेक्शन सफल रहा"; @override + String get confirmations => "पुष्टिकरण"; + @override String get confirm => "की पुष्टि करें"; @override String get settings_display_balance_as => "के रूप में संतुलन प्रदर्शित करें"; @@ -1254,6 +1273,8 @@ class $hi extends S { @override String get address_book_menu => "पता पुस्तिका"; @override + String get note_optional => "नोट (वैकल्पिक)"; + @override String get wallet_restoration_store_incorrect_seed_length => "गलत बीज की लंबाई"; @override String get seed_language_spanish => "स्पेनिश"; @@ -1342,7 +1363,7 @@ class $hi extends S { @override String get trade_details_created_at => "पर बनाया गया"; @override - String send_success(String crypto) => "आपका ${crypto} सफलतापूर्वक भेजा गया"; + String get send_success => "आपका Monero सफलतापूर्वक भेजा गया"; @override String get settings_wallets => "पर्स"; @override @@ -1384,6 +1405,8 @@ class $hi extends S { @override String get transaction_details_date => "तारीख"; @override + String get note_tap_to_change => "नोट (टैप टू चेंज)"; + @override String get show_seed => "बीज दिखाओ"; @override String get send_error_currency => "मुद्रा में केवल संख्याएँ हो सकती हैं"; @@ -1606,6 +1629,8 @@ class $hi extends S { @override String get settings_save_recipient_address => "प्राप्तकर्ता का पता सहेजें"; @override + String get note => "नोट"; + @override String get change_exchange_provider => "एक्सचेंज प्रदाता बदलें"; @override String get send_payment_id => "भुगतान ID (ऐच्छिक)"; @@ -1802,7 +1827,7 @@ class $ru extends S { @override String get transaction_sent => "Tранзакция отправлена!"; @override - String get send_fee => "Комиссия"; + String get send_fee => "Комиссия:"; @override String get password => "Пароль"; @override @@ -1846,6 +1871,8 @@ class $ru extends S { @override String get placeholder_contacts => "Ваши контакты будут отображаться здесь"; @override + String get transaction_key => "Ключ транзакции"; + @override String get card_address => "Адрес:"; @override String get seed_language_portuguese => "Португальский"; @@ -1918,6 +1945,8 @@ class $ru extends S { @override String get node_connection_successful => "Подключение прошло успешно"; @override + String get confirmations => "Подтверждения"; + @override String get confirm => "Подтвердить"; @override String get settings_display_balance_as => "Отображать баланс как"; @@ -1954,6 +1983,8 @@ class $ru extends S { @override String get address_book_menu => "Адресная книга"; @override + String get note_optional => "Примечание (необязательно)"; + @override String get wallet_restoration_store_incorrect_seed_length => "Неверная длина мнемонической фразы"; @override String get seed_language_spanish => "Испанский"; @@ -2042,7 +2073,7 @@ class $ru extends S { @override String get trade_details_created_at => "Создано"; @override - String send_success(String crypto) => "Ваш ${crypto} был успешно отправлен"; + String get send_success => "Ваш Monero был успешно отправлен"; @override String get settings_wallets => "Кошельки"; @override @@ -2084,6 +2115,8 @@ class $ru extends S { @override String get transaction_details_date => "Дата"; @override + String get note_tap_to_change => "Примечание (нажмите для изменения)"; + @override String get show_seed => "Показать мнемоническую фразу"; @override String get send_error_currency => "Валюта может содержать только цифры"; @@ -2306,6 +2339,8 @@ class $ru extends S { @override String get settings_save_recipient_address => "Сохранять адрес получателя"; @override + String get note => "Примечание"; + @override String get change_exchange_provider => "Изменить провайдера обмена"; @override String get send_payment_id => "ID платежа (опционально)"; @@ -2502,7 +2537,7 @@ class $ko extends S { @override String get transaction_sent => "거래가 전송되었습니다!"; @override - String get send_fee => "회비"; + String get send_fee => "회비:"; @override String get password => "암호"; @override @@ -2546,6 +2581,8 @@ class $ko extends S { @override String get placeholder_contacts => "연락처가 여기에 표시됩니다"; @override + String get transaction_key => "거래 키"; + @override String get card_address => "주소:"; @override String get seed_language_portuguese => "포르투갈 인"; @@ -2618,6 +2655,8 @@ class $ko extends S { @override String get node_connection_successful => "성공적으로 연결되었습니다."; @override + String get confirmations => "확인"; + @override String get confirm => "확인"; @override String get settings_display_balance_as => "잔액 표시"; @@ -2654,6 +2693,8 @@ class $ko extends S { @override String get address_book_menu => "주소록"; @override + String get note_optional => "참고 (선택 사항)"; + @override String get wallet_restoration_store_incorrect_seed_length => "시드 길이가 잘못되었습니다"; @override String get seed_language_spanish => "스페인의"; @@ -2742,7 +2783,7 @@ class $ko extends S { @override String get trade_details_created_at => "에 작성"; @override - String send_success(String crypto) => "${crypto}가 성공적으로 전송되었습니다"; + String get send_success => "Monero가 성공적으로 전송되었습니다"; @override String get settings_wallets => "지갑"; @override @@ -2784,6 +2825,8 @@ class $ko extends S { @override String get transaction_details_date => "날짜"; @override + String get note_tap_to_change => "메모 (변경하려면 탭하세요)"; + @override String get show_seed => "종자 표시"; @override String get send_error_currency => "통화는 숫자 만 포함 할 수 있습니다"; @@ -3006,6 +3049,8 @@ class $ko extends S { @override String get settings_save_recipient_address => "수신자 주소 저장"; @override + String get note => "노트"; + @override String get change_exchange_provider => "교환 공급자 변경"; @override String get send_payment_id => "지불 ID (optional)"; @@ -3202,7 +3247,7 @@ class $pt extends S { @override String get transaction_sent => "Transação enviada!"; @override - String get send_fee => "Taxa"; + String get send_fee => "Taxa:"; @override String get password => "Senha"; @override @@ -3246,6 +3291,8 @@ class $pt extends S { @override String get placeholder_contacts => "Seus contatos serão exibidos aqui"; @override + String get transaction_key => "Chave de transação"; + @override String get card_address => "Endereço:"; @override String get seed_language_portuguese => "Português"; @@ -3318,6 +3365,8 @@ class $pt extends S { @override String get node_connection_successful => "A conexão foi bem sucedida"; @override + String get confirmations => "Confirmações"; + @override String get confirm => "Confirmar"; @override String get settings_display_balance_as => "Saldo a exibir"; @@ -3354,6 +3403,8 @@ class $pt extends S { @override String get address_book_menu => "Livro de endereços"; @override + String get note_optional => "Nota (opcional)"; + @override String get wallet_restoration_store_incorrect_seed_length => "Comprimento de semente incorreto"; @override String get seed_language_spanish => "Espanhola"; @@ -3442,7 +3493,7 @@ class $pt extends S { @override String get trade_details_created_at => "Criada em"; @override - String send_success(String crypto) => "Seu ${crypto} foi enviado com sucesso"; + String get send_success => "Seu Monero foi enviado com sucesso"; @override String get settings_wallets => "Carteiras"; @override @@ -3484,6 +3535,8 @@ class $pt extends S { @override String get transaction_details_date => "Data"; @override + String get note_tap_to_change => "Nota (toque para alterar)"; + @override String get show_seed => "Mostrar semente"; @override String get send_error_currency => "A moeda só pode conter números"; @@ -3706,6 +3759,8 @@ class $pt extends S { @override String get settings_save_recipient_address => "Salvar endereço do destinatário"; @override + String get note => "Nota"; + @override String get change_exchange_provider => "Alterar o provedor de troca"; @override String get send_payment_id => "ID de pagamento (opcional)"; @@ -3902,7 +3957,7 @@ class $uk extends S { @override String get transaction_sent => "Tранзакцію відправлено!"; @override - String get send_fee => "Комісія"; + String get send_fee => "Комісія:"; @override String get password => "Пароль"; @override @@ -3946,6 +4001,8 @@ class $uk extends S { @override String get placeholder_contacts => "Тут будуть показані ваші контакти"; @override + String get transaction_key => "Ключ транзакції"; + @override String get card_address => "Адреса:"; @override String get seed_language_portuguese => "Португальська"; @@ -4018,6 +4075,8 @@ class $uk extends S { @override String get node_connection_successful => "З'єднання було успішним"; @override + String get confirmations => "Підтвердження"; + @override String get confirm => "Підтвердити"; @override String get settings_display_balance_as => "Відображати баланс як"; @@ -4054,6 +4113,8 @@ class $uk extends S { @override String get address_book_menu => "Адресна книга"; @override + String get note_optional => "Примітка (необов’язково)"; + @override String get wallet_restoration_store_incorrect_seed_length => "Невірна довжина мнемонічної фрази"; @override String get seed_language_spanish => "Іспанська"; @@ -4142,7 +4203,7 @@ class $uk extends S { @override String get trade_details_created_at => "Створено"; @override - String send_success(String crypto) => "Ваш ${crypto} успішно надісланий"; + String get send_success => "Ваш Monero успішно надісланий"; @override String get settings_wallets => "Гаманці"; @override @@ -4184,6 +4245,8 @@ class $uk extends S { @override String get transaction_details_date => "Дата"; @override + String get note_tap_to_change => "Примітка (натисніть для зміни)"; + @override String get show_seed => "Показати мнемонічну фразу"; @override String get send_error_currency => "Валюта може містити тільки цифри"; @@ -4406,6 +4469,8 @@ class $uk extends S { @override String get settings_save_recipient_address => "Зберігати адресу отримувача"; @override + String get note => "Примітка"; + @override String get change_exchange_provider => "Змінити провайдера обміну"; @override String get send_payment_id => "ID платежу (опційно)"; @@ -4602,7 +4667,7 @@ class $ja extends S { @override String get transaction_sent => "トランザクションが送信されました！"; @override - String get send_fee => "費用"; + String get send_fee => "費用："; @override String get password => "パスワード"; @override @@ -4646,6 +4711,8 @@ class $ja extends S { @override String get placeholder_contacts => "連絡先はここに表示されます"; @override + String get transaction_key => "トランザクションキー"; + @override String get card_address => "住所:"; @override String get seed_language_portuguese => "ポルトガル語"; @@ -4718,6 +4785,8 @@ class $ja extends S { @override String get node_connection_successful => "接続に成功しました"; @override + String get confirmations => "確認"; + @override String get confirm => "確認する"; @override String get settings_display_balance_as => "残高を表示"; @@ -4754,6 +4823,8 @@ class $ja extends S { @override String get address_book_menu => "住所録"; @override + String get note_optional => "注（オプション）"; + @override String get wallet_restoration_store_incorrect_seed_length => "誤ったシード長s"; @override String get seed_language_spanish => "スペイン語"; @@ -4842,7 +4913,7 @@ class $ja extends S { @override String get trade_details_created_at => "で作成"; @override - String send_success(String crypto) => "${crypto}が送信されました"; + String get send_success => "Moneroが送信されました"; @override String get settings_wallets => "財布"; @override @@ -4884,6 +4955,8 @@ class $ja extends S { @override String get transaction_details_date => "日付"; @override + String get note_tap_to_change => "注（タップして変更）"; + @override String get show_seed => "シードを表示"; @override String get send_error_currency => "通貨には数字のみを含めることができます"; @@ -5106,6 +5179,8 @@ class $ja extends S { @override String get settings_save_recipient_address => "受信者のアドレスを保存"; @override + String get note => "注意"; + @override String get change_exchange_provider => "Exchangeプロバイダーの変更"; @override String get send_payment_id => "支払いID (オプショナル)"; @@ -5306,7 +5381,7 @@ class $pl extends S { @override String get transaction_sent => "Transakcja wysłana!"; @override - String get send_fee => "Opłata"; + String get send_fee => "Opłata:"; @override String get password => "Hasło"; @override @@ -5350,6 +5425,8 @@ class $pl extends S { @override String get placeholder_contacts => "Twoje kontakty zostaną wyświetlone tutaj"; @override + String get transaction_key => "Klucz transakcji"; + @override String get card_address => "Adres:"; @override String get seed_language_portuguese => "Portugalski"; @@ -5422,6 +5499,8 @@ class $pl extends S { @override String get node_connection_successful => "Połączenie powiodło się"; @override + String get confirmations => "Potwierdzenia"; + @override String get confirm => "Potwierdzać"; @override String get settings_display_balance_as => "Wyświetl saldo jako"; @@ -5458,6 +5537,8 @@ class $pl extends S { @override String get address_book_menu => "Książka adresowa"; @override + String get note_optional => "Notatka (opcjonalnie)"; + @override String get wallet_restoration_store_incorrect_seed_length => "Nieprawidłowa długość nasion"; @override String get seed_language_spanish => "Hiszpański"; @@ -5546,7 +5627,7 @@ class $pl extends S { @override String get trade_details_created_at => "Utworzono w"; @override - String send_success(String crypto) => "Twoje ${crypto} zostało pomyślnie wysłane"; + String get send_success => "Twoje Monero zostało pomyślnie wysłane"; @override String get settings_wallets => "Portfele"; @override @@ -5588,6 +5669,8 @@ class $pl extends S { @override String get transaction_details_date => "Data"; @override + String get note_tap_to_change => "Notatka (dotknij, aby zmienić)"; + @override String get show_seed => "Pokaż nasiona"; @override String get send_error_currency => "Waluta może zawierać tylko cyfry"; @@ -5810,6 +5893,8 @@ class $pl extends S { @override String get settings_save_recipient_address => "Zapisz adres odbiorcy"; @override + String get note => "Notatka"; + @override String get change_exchange_provider => "Zmień dostawcę programu Exchange"; @override String get send_payment_id => "Identyfikator płatności (opcjonalny)"; @@ -6006,7 +6091,7 @@ class $es extends S { @override String get transaction_sent => "Transacción enviada!"; @override - String get send_fee => "Cuota"; + String get send_fee => "Cuota:"; @override String get password => "Contraseña"; @override @@ -6050,6 +6135,8 @@ class $es extends S { @override String get placeholder_contacts => "Tus contactos se mostrarán aquí"; @override + String get transaction_key => "Clave de transacción"; + @override String get card_address => "Dirección:"; @override String get seed_language_portuguese => "Portugués"; @@ -6122,6 +6209,8 @@ class $es extends S { @override String get node_connection_successful => "La conexión fue exitosa"; @override + String get confirmations => "Confirmaciones"; + @override String get confirm => "Confirmar"; @override String get settings_display_balance_as => "Mostrar saldo como"; @@ -6158,6 +6247,8 @@ class $es extends S { @override String get address_book_menu => "Libreta de direcciones"; @override + String get note_optional => "Nota (opcional)"; + @override String get wallet_restoration_store_incorrect_seed_length => "Longitud de semilla incorrecta"; @override String get seed_language_spanish => "Español"; @@ -6246,7 +6337,7 @@ class $es extends S { @override String get trade_details_created_at => "Creado en"; @override - String send_success(String crypto) => "Su ${crypto} fue enviado con éxito"; + String get send_success => "Su Monero fue enviado con éxito"; @override String get settings_wallets => "Carteras"; @override @@ -6288,6 +6379,8 @@ class $es extends S { @override String get transaction_details_date => "Fecha"; @override + String get note_tap_to_change => "Nota (toque para cambiar)"; + @override String get show_seed => "Mostrar semilla"; @override String get send_error_currency => "La moneda solo puede contener números"; @@ -6510,6 +6603,8 @@ class $es extends S { @override String get settings_save_recipient_address => "Guardar dirección del destinatario"; @override + String get note => "Nota"; + @override String get change_exchange_provider => "Cambiar proveedor de intercambio"; @override String get send_payment_id => "ID de pago (opcional)"; @@ -6706,7 +6801,7 @@ class $nl extends S { @override String get transaction_sent => "Transactie verzonden!"; @override - String get send_fee => "Vergoeding"; + String get send_fee => "Vergoeding:"; @override String get password => "Wachtwoord"; @override @@ -6750,6 +6845,8 @@ class $nl extends S { @override String get placeholder_contacts => "Je contacten worden hier weergegeven"; @override + String get transaction_key => "Transactiesleutel"; + @override String get card_address => "Adres:"; @override String get seed_language_portuguese => "Portugees"; @@ -6822,6 +6919,8 @@ class $nl extends S { @override String get node_connection_successful => "Verbinding is gelukt"; @override + String get confirmations => "Bevestigingen"; + @override String get confirm => "Bevestigen"; @override String get settings_display_balance_as => "Toon saldo als"; @@ -6858,6 +6957,8 @@ class $nl extends S { @override String get address_book_menu => "Adresboek"; @override + String get note_optional => "Opmerking (optioneel)"; + @override String get wallet_restoration_store_incorrect_seed_length => "Onjuiste zaadlengte"; @override String get seed_language_spanish => "Spaans"; @@ -6946,7 +7047,7 @@ class $nl extends S { @override String get trade_details_created_at => "Gemaakt bij"; @override - String send_success(String crypto) => "Uw ${crypto} is succesvol verzonden"; + String get send_success => "Uw Monero is succesvol verzonden"; @override String get settings_wallets => "Portemonnee"; @override @@ -6988,6 +7089,8 @@ class $nl extends S { @override String get transaction_details_date => "Datum"; @override + String get note_tap_to_change => "Opmerking (tik om te wijzigen)"; + @override String get show_seed => "Toon zaad"; @override String get send_error_currency => "Valuta kan alleen cijfers bevatten"; @@ -7210,6 +7313,8 @@ class $nl extends S { @override String get settings_save_recipient_address => "Adres ontvanger opslaan"; @override + String get note => "Opmerking"; + @override String get change_exchange_provider => "Wijzig Exchange Provider"; @override String get send_payment_id => "Betaling ID (facultatief)"; @@ -7406,7 +7511,7 @@ class $zh extends S { @override String get transaction_sent => "交易已发送"; @override - String get send_fee => "費用"; + String get send_fee => "費用:"; @override String get password => "密码"; @override @@ -7450,6 +7555,8 @@ class $zh extends S { @override String get placeholder_contacts => "您的聯繫人將顯示在這裡"; @override + String get transaction_key => "交易密碼"; + @override String get card_address => "地址:"; @override String get seed_language_portuguese => "葡萄牙語"; @@ -7522,6 +7629,8 @@ class $zh extends S { @override String get node_connection_successful => "連接成功"; @override + String get confirmations => "確認書"; + @override String get confirm => "确认"; @override String get settings_display_balance_as => "将余额显示为"; @@ -7558,6 +7667,8 @@ class $zh extends S { @override String get address_book_menu => "地址簿"; @override + String get note_optional => "注意（可選）"; + @override String get wallet_restoration_store_incorrect_seed_length => "种子长度错误"; @override String get seed_language_spanish => "西班牙文"; @@ -7646,7 +7757,7 @@ class $zh extends S { @override String get trade_details_created_at => "创建于"; @override - String send_success(String crypto) => "你${crypto}已成功發送"; + String get send_success => "你Monero已成功發送"; @override String get settings_wallets => "皮夹"; @override @@ -7688,6 +7799,8 @@ class $zh extends S { @override String get transaction_details_date => "日期"; @override + String get note_tap_to_change => "注意（輕按即可更改）"; + @override String get show_seed => "显示种子"; @override String get send_error_currency => "货币只能包含数字"; @@ -7910,6 +8023,8 @@ class $zh extends S { @override String get settings_save_recipient_address => "保存收件人地址"; @override + String get note => "注意"; + @override String get change_exchange_provider => "更改交易所提供商"; @override String get send_payment_id => "付款编号 (可选的)"; diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index e43b8d8f1..64ff65972 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -305,11 +305,7 @@ class ExchangeTradeState extends State { padding: EdgeInsets.only( top: 220, left: 24, right: 24), child: Text( - S.of(context).send_success(widget - .exchangeTradeViewModel - .wallet - .currency - .toString()), + S.of(context).send_success, textAlign: TextAlign.center, style: TextStyle( fontSize: 22, diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index db943148d..54bfd4a24 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -320,7 +320,7 @@ class SendPage extends BasePage { fontSize: 14, fontWeight: FontWeight.w500, color: Colors.white), - hintText: 'Note (optional)', + hintText: S.of(context).note_optional, placeholderTextStyle: TextStyle( fontSize: 14, fontWeight: FontWeight.w500, @@ -668,9 +668,7 @@ class SendPage extends BasePage { padding: EdgeInsets.only( top: 220, left: 24, right: 24), child: Text( - S.of(context).send_success( - sendViewModel.currency - .toString()), + S.of(context).send_success, textAlign: TextAlign.center, style: TextStyle( fontSize: 22, diff --git a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart index 3f2f2d877..560428ff9 100644 --- a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart +++ b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart @@ -1,5 +1,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:cake_wallet/generated/i18n.dart'; class TextFieldListRow extends StatelessWidget { TextFieldListRow( @@ -59,7 +60,7 @@ class TextFieldListRow extends StatelessWidget { decoration: InputDecoration( isDense: true, contentPadding: EdgeInsets.only(top: 12, bottom: 0), - hintText: 'Note', + hintText: S.of(context).note, hintStyle: TextStyle( fontSize: valueFontSize, fontWeight: FontWeight.w500, diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart index e3f57c9a3..b27e6816e 100644 --- a/lib/view_model/transaction_details_view_model.dart +++ b/lib/view_model/transaction_details_view_model.dart @@ -42,8 +42,9 @@ abstract class TransactionDetailsViewModelBase with Store { ]; if (tx.key?.isNotEmpty ?? null) { - // FIXME: add translation - _items.add(StandartListItem(title: 'Transaction Key', value: tx.key)); + _items.add(StandartListItem( + title: S.current.transaction_key, + value: tx.key)); } items.addAll(_items); @@ -56,9 +57,8 @@ abstract class TransactionDetailsViewModelBase with Store { StandartListItem( title: S.current.transaction_details_date, value: dateFormat.format(tx.date)), - // FIXME: add translation StandartListItem( - title: 'Confirmations', value: tx.confirmations?.toString()), + title: S.current.confirmations, value: tx.confirmations?.toString()), StandartListItem( title: S.current.transaction_details_height, value: '${tx.height}'), StandartListItem( @@ -87,9 +87,10 @@ abstract class TransactionDetailsViewModelBase with Store { (val) => val.id == transactionInfo.id, orElse: () => null); if (description != null) { - // FIXME: add translation - items.add(TextFieldListItem(title: 'Note (tap to change)', - value: description.note, onSubmitted: (value) { + items.add(TextFieldListItem( + title: S.current.note_tap_to_change, + value: description.note, + onSubmitted: (value) { description.transactionNote = value; description.save(); })); diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index ee47ace4c..8e08be734 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -428,5 +428,11 @@ "color_theme" : "Farbthema", "light_theme" : "Licht", "bright_theme" : "Hell", - "dark_theme" : "Dunkel" + "dark_theme" : "Dunkel", + + "note" : "Hinweis", + "note_optional" : "Hinweis (optional)", + "note_tap_to_change" : "Hinweis (zum Ändern tippen)", + "transaction_key" : "Transaktionsschlüssel", + "confirmations" : "Bestätigungen" } \ No newline at end of file diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index ee6925cc0..9ce7a6c81 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -428,5 +428,11 @@ "color_theme" : "Color theme", "light_theme" : "Light", "bright_theme" : "Bright", - "dark_theme" : "Dark" + "dark_theme" : "Dark", + + "note" : "Note", + "note_optional" : "Note (optional)", + "note_tap_to_change" : "Note (tap to change)", + "transaction_key" : "Transaction Key", + "confirmations" : "Confirmations" } \ No newline at end of file diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 7483b75e0..bf049df8d 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -428,5 +428,11 @@ "color_theme" : "Tema de color", "light_theme" : "Ligera", "bright_theme" : "Brillante", - "dark_theme" : "Oscura" + "dark_theme" : "Oscura", + + "note" : "Nota", + "note_optional" : "Nota (opcional)", + "note_tap_to_change" : "Nota (toque para cambiar)", + "transaction_key" : "Clave de transacción", + "confirmations" : "Confirmaciones" } \ No newline at end of file diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 21caa7c77..3933f1001 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -428,5 +428,11 @@ "color_theme" : "रंग विषय", "light_theme" : "रोशनी", "bright_theme" : "उज्ज्वल", - "dark_theme" : "अंधेरा" + "dark_theme" : "अंधेरा", + + "note" : "नोट", + "note_optional" : "नोट (वैकल्पिक)", + "note_tap_to_change" : "नोट (टैप टू चेंज)", + "transaction_key" : "लेन-देन की", + "confirmations" : "पुष्टिकरण" } \ No newline at end of file diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index eff9adf68..752af90a2 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -428,5 +428,11 @@ "color_theme" : "カラーテーマ", "light_theme" : "光", "bright_theme" : "明るい", - "dark_theme" : "闇" + "dark_theme" : "闇", + + "note" : "注意", + "note_optional" : "注（オプション）", + "note_tap_to_change" : "注（タップして変更）", + "transaction_key" : "トランザクションキー", + "confirmations" : "確認" } \ No newline at end of file diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index ed0e78da6..7a4707c6f 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -428,5 +428,11 @@ "color_theme" : "색상 테마", "light_theme" : "빛", "bright_theme" : "선명한", - "dark_theme" : "어두운" + "dark_theme" : "어두운", + + "note" : "노트", + "note_optional" : "참고 (선택 사항)", + "note_tap_to_change" : "메모 (변경하려면 탭하세요)", + "transaction_key" : "거래 키", + "confirmations" : "확인" } \ No newline at end of file diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index b8d6a9ab4..9d03ea080 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -428,5 +428,11 @@ "color_theme" : "Kleur thema", "light_theme" : "Licht", "bright_theme" : "Helder", - "dark_theme" : "Donker" + "dark_theme" : "Donker", + + "note" : "Opmerking", + "note_optional" : "Opmerking (optioneel)", + "note_tap_to_change" : "Opmerking (tik om te wijzigen)", + "transaction_key" : "Transactiesleutel", + "confirmations" : "Bevestigingen" } \ No newline at end of file diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 1fe58d723..7abca0b1d 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -428,5 +428,11 @@ "color_theme" : "Motyw kolorystyczny", "light_theme" : "Lekki", "bright_theme" : "Jasny", - "dark_theme" : "Ciemny" + "dark_theme" : "Ciemny", + + "note" : "Notatka", + "note_optional" : "Notatka (opcjonalnie)", + "note_tap_to_change" : "Notatka (dotknij, aby zmienić)", + "transaction_key" : "Klucz transakcji", + "confirmations" : "Potwierdzenia" } \ No newline at end of file diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 9049b824e..1e68ea62a 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -428,5 +428,11 @@ "color_theme" : "Tema de cor", "light_theme" : "Luz", "bright_theme" : "Brilhante", - "dark_theme" : "Sombria" + "dark_theme" : "Sombria", + + "note" : "Nota", + "note_optional" : "Nota (opcional)", + "note_tap_to_change" : "Nota (toque para alterar)", + "transaction_key" : "Chave de transação", + "confirmations" : "Confirmações" } diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index f3e633512..66a8efad6 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -428,5 +428,11 @@ "color_theme" : "Цветовая тема", "light_theme" : "Светлая", "bright_theme" : "Яркая", - "dark_theme" : "Темная" + "dark_theme" : "Темная", + + "note" : "Примечание", + "note_optional" : "Примечание (необязательно)", + "note_tap_to_change" : "Примечание (нажмите для изменения)", + "transaction_key" : "Ключ транзакции", + "confirmations" : "Подтверждения" } \ No newline at end of file diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index d0906da4b..28171cef9 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -428,5 +428,11 @@ "color_theme" : "Кольорова тема", "light_theme" : "Світла", "bright_theme" : "Яскрава", - "dark_theme" : "Темна" + "dark_theme" : "Темна", + + "note" : "Примітка", + "note_optional" : "Примітка (необов’язково)", + "note_tap_to_change" : "Примітка (натисніть для зміни)", + "transaction_key" : "Ключ транзакції", + "confirmations" : "Підтвердження" } \ No newline at end of file diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 890a3b502..7ab6221aa 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -428,5 +428,11 @@ "color_theme" : "顏色主題", "light_theme" : "光", "bright_theme" : "亮", - "dark_theme" : "黑暗" + "dark_theme" : "黑暗", + + "note" : "注意", + "note_optional" : "注意（可選）", + "note_tap_to_change" : "注意（輕按即可更改）", + "transaction_key" : "交易密碼", + "confirmations" : "確認書" } \ No newline at end of file From cf5f212f337c992a511d50c1e1cdd80e8c849743 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Wed, 23 Dec 2020 15:04:57 +0200 Subject: [PATCH 3/7] CAKE-198 | fixed string resources --- lib/generated/i18n.dart | 23 +++++++++++++++++++ .../transaction_details_view_model.dart | 8 +++++-- res/values/strings_de.arb | 1 + res/values/strings_en.arb | 1 + res/values/strings_es.arb | 1 + res/values/strings_hi.arb | 1 + res/values/strings_ja.arb | 1 + res/values/strings_ko.arb | 1 + res/values/strings_nl.arb | 1 + res/values/strings_pl.arb | 1 + res/values/strings_pt.arb | 1 + res/values/strings_ru.arb | 1 + res/values/strings_uk.arb | 1 + res/values/strings_zh.arb | 1 + 14 files changed, 41 insertions(+), 2 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index be5d653c9..4157b47b7 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -298,6 +298,7 @@ class S implements WidgetsLocalizations { String get trades => "Trades"; String get transaction_details_amount => "Amount"; String get transaction_details_date => "Date"; + String get transaction_details_fee => "Fee"; String get transaction_details_height => "Height"; String get transaction_details_recipient_address => "Recipient address"; String get transaction_details_title => "Transaction Details"; @@ -479,6 +480,8 @@ class $de extends S { @override String get send_your_wallet => "Deine Geldbörse"; @override + String get transaction_details_fee => "Gebühr"; + @override String get remove_node_message => "Möchten Sie den ausgewählten Knoten wirklich entfernen?"; @override String get error_text_account_name => "Der Kontoname darf nur Wallet und Zahlen enthalten\nund muss zwischen 1 und 15 Zeichen lang sein"; @@ -1189,6 +1192,8 @@ class $hi extends S { @override String get send_your_wallet => "आपका बटुआ"; @override + String get transaction_details_fee => "शुल्क"; + @override String get remove_node_message => "क्या आप वाकई चयनित नोड को निकालना चाहते हैं?"; @override String get error_text_account_name => "खाता नाम में केवल अक्षर, संख्याएं हो सकती हैं\nऔर 1 और 15 वर्णों के बीच लंबा होना चाहिए"; @@ -1899,6 +1904,8 @@ class $ru extends S { @override String get send_your_wallet => "Ваш кошелёк"; @override + String get transaction_details_fee => "Комиссия"; + @override String get remove_node_message => "Вы уверены, что хотите удалить текущую ноду?"; @override String get error_text_account_name => "Имя аккаунта может содержать только буквы, цифры\nи должно быть от 1 до 15 символов в длину"; @@ -2609,6 +2616,8 @@ class $ko extends S { @override String get send_your_wallet => "지갑"; @override + String get transaction_details_fee => "회비"; + @override String get remove_node_message => "선택한 노드를 제거 하시겠습니까?"; @override String get error_text_account_name => "계정 이름은 문자, 숫자 만 포함 할 수 있습니다\n1 ~ 15 자 사이 여야합니다"; @@ -3319,6 +3328,8 @@ class $pt extends S { @override String get send_your_wallet => "Sua carteira"; @override + String get transaction_details_fee => "Taxa"; + @override String get remove_node_message => "Você realmente deseja remover o nó selecionado?"; @override String get error_text_account_name => "O nome da conta só pode conter letras, números\ne deve ter entre 1 e 15 caracteres"; @@ -4029,6 +4040,8 @@ class $uk extends S { @override String get send_your_wallet => "Ваш гаманець"; @override + String get transaction_details_fee => "Комісія"; + @override String get remove_node_message => "Ви впевнені, що хочете видалити поточний вузол?"; @override String get error_text_account_name => "Ім'я акаунту може містити тільки букви, цифри\nі повинно бути від 1 до 15 символів в довжину"; @@ -4739,6 +4752,8 @@ class $ja extends S { @override String get send_your_wallet => "あなたの財布"; @override + String get transaction_details_fee => "費用"; + @override String get remove_node_message => "選択したノードを削除してもよろしいですか？"; @override String get error_text_account_name => "アカウント名には文字のみを含めることができます \n1〜15文字である必要があります"; @@ -5453,6 +5468,8 @@ class $pl extends S { @override String get send_your_wallet => "Twój portfel"; @override + String get transaction_details_fee => "Opłata"; + @override String get remove_node_message => "Czy na pewno chcesz usunąć wybrany węzeł?"; @override String get error_text_account_name => "Nazwa konta może zawierać tylko litery, cyfry\ni musi mieć od 1 do 15 znaków"; @@ -6163,6 +6180,8 @@ class $es extends S { @override String get send_your_wallet => "Tu billetera"; @override + String get transaction_details_fee => "Cuota"; + @override String get remove_node_message => "¿Está seguro de que desea eliminar el nodo seleccionado?"; @override String get error_text_account_name => "El nombre de la cuenta solo puede contener letras, números \ny debe tener entre 1 y 15 caracteres de longitud"; @@ -6873,6 +6892,8 @@ class $nl extends S { @override String get send_your_wallet => "Uw portemonnee"; @override + String get transaction_details_fee => "Vergoeding"; + @override String get remove_node_message => "Weet u zeker dat u het geselecteerde knooppunt wilt verwijderen?"; @override String get error_text_account_name => "Accountnaam mag alleen letters, cijfers bevatten\nen moet tussen de 1 en 15 tekens lang zijn"; @@ -7583,6 +7604,8 @@ class $zh extends S { @override String get send_your_wallet => "你的钱包"; @override + String get transaction_details_fee => "費用"; + @override String get remove_node_message => "您确定要删除所选节点吗？"; @override String get error_text_account_name => "帐户名称只能包含字母数字\n且必须介于1到15个字符之间"; diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart index b27e6816e..701071e6a 100644 --- a/lib/view_model/transaction_details_view_model.dart +++ b/lib/view_model/transaction_details_view_model.dart @@ -38,7 +38,9 @@ abstract class TransactionDetailsViewModelBase with Store { StandartListItem( title: S.current.transaction_details_amount, value: tx.amountFormatted()), - StandartListItem(title: S.current.send_fee, value: tx.feeFormatted()), + StandartListItem( + title: S.current.transaction_details_fee, + value: tx.feeFormatted()), ]; if (tx.key?.isNotEmpty ?? null) { @@ -65,7 +67,9 @@ abstract class TransactionDetailsViewModelBase with Store { title: S.current.transaction_details_amount, value: tx.amountFormatted()), if (tx.feeFormatted()?.isNotEmpty) - StandartListItem(title: S.current.send_fee, value: tx.feeFormatted()) + StandartListItem( + title: S.current.transaction_details_fee, + value: tx.feeFormatted()) ]; items.addAll(_items); diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 8e08be734..20bdffedd 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Datum", "transaction_details_height" : "Höhe", "transaction_details_amount" : "Menge", + "transaction_details_fee" : "Gebühr", "transaction_details_copied" : "${title} in die Zwischenablage kopiert", "transaction_details_recipient_address" : "Empfängeradresse", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 9ce7a6c81..fbedfb6af 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Date", "transaction_details_height" : "Height", "transaction_details_amount" : "Amount", + "transaction_details_fee" : "Fee", "transaction_details_copied" : "${title} copied to Clipboard", "transaction_details_recipient_address" : "Recipient address", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index bf049df8d..aa0d5836b 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Fecha", "transaction_details_height" : "Altura", "transaction_details_amount" : "Cantidad", + "transaction_details_fee" : "Cuota", "transaction_details_copied" : "${title} Copiado al portapapeles", "transaction_details_recipient_address" : "Dirección del receptor", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 3933f1001..8cb9229a3 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "तारीख", "transaction_details_height" : "ऊंचाई", "transaction_details_amount" : "रकम", + "transaction_details_fee" : "शुल्क", "transaction_details_copied" : "${title} क्लिपबोर्ड पर नकल", "transaction_details_recipient_address" : "प्राप्तकर्ता का पता", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 752af90a2..f04e90ab2 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "日付", "transaction_details_height" : "高さ", "transaction_details_amount" : "量", + "transaction_details_fee" : "費用", "transaction_details_copied" : "${title} クリップボードにコピーしました", "transaction_details_recipient_address" : "受取人の住所", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 7a4707c6f..a6b4098a2 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "날짜", "transaction_details_height" : "신장", "transaction_details_amount" : "양", + "transaction_details_fee" : "회비", "transaction_details_copied" : "${title} 클립 보드에 복사", "transaction_details_recipient_address" : "받는 사람 주소", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 9d03ea080..a6385c366 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Datum", "transaction_details_height" : "Hoogte", "transaction_details_amount" : "Bedrag", + "transaction_details_fee" : "Vergoeding", "transaction_details_copied" : "${title} gekopieerd naar het klembord", "transaction_details_recipient_address" : "Adres van de ontvanger", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 7abca0b1d..4cf9ea031 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Data", "transaction_details_height" : "Wysokość", "transaction_details_amount" : "Ilość", + "transaction_details_fee" : "Opłata", "transaction_details_copied" : "${title} skopiowane do schowka", "transaction_details_recipient_address" : "Adres odbiorcy", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 1e68ea62a..345bb9d6b 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Data", "transaction_details_height" : "Altura", "transaction_details_amount" : "Quantia", + "transaction_details_fee" : "Taxa", "transaction_details_copied" : "${title} copiados para a área de transferência", "transaction_details_recipient_address" : "Endereço do destinatário", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 66a8efad6..ca1e8af12 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Дата", "transaction_details_height" : "Высота", "transaction_details_amount" : "Сумма", + "transaction_details_fee" : "Комиссия", "transaction_details_copied" : "${title} скопировано в буфер обмена", "transaction_details_recipient_address" : "Адрес получателя", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 28171cef9..15f5d48da 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "Дата", "transaction_details_height" : "Висота", "transaction_details_amount" : "Сума", + "transaction_details_fee" : "Комісія", "transaction_details_copied" : "${title} скопійовано в буфер обміну", "transaction_details_recipient_address" : "Адреса отримувача", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 7ab6221aa..a63342b75 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -282,6 +282,7 @@ "transaction_details_date" : "日期", "transaction_details_height" : "高度", "transaction_details_amount" : "量", + "transaction_details_fee" : "費用", "transaction_details_copied" : "${title} 复制到剪贴板", "transaction_details_recipient_address" : "收件人地址", From d7cc595179a70ab6513d23844463af0caba9e61b Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Wed, 23 Dec 2020 19:14:11 +0200 Subject: [PATCH 4/7] CAKE-198 | changed hint text from "Note" to "Enter your note..."; changed color of the hint text in textfield_list_row --- lib/generated/i18n.dart | 46 +++++++++---------- .../widgets/textfield_list_row.dart | 14 ++---- res/values/strings_de.arb | 2 +- res/values/strings_en.arb | 2 +- res/values/strings_es.arb | 2 +- res/values/strings_hi.arb | 2 +- res/values/strings_ja.arb | 2 +- res/values/strings_ko.arb | 2 +- res/values/strings_nl.arb | 2 +- res/values/strings_pl.arb | 2 +- res/values/strings_pt.arb | 2 +- res/values/strings_ru.arb | 2 +- res/values/strings_uk.arb | 2 +- res/values/strings_zh.arb | 2 +- 14 files changed, 40 insertions(+), 44 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 4157b47b7..0aea9f9c9 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -78,6 +78,7 @@ class S implements WidgetsLocalizations { String get delete => "Delete"; String get digit_pin => "-digit PIN"; String get edit => "Edit"; + String get enter_your_note => "Enter your note…"; String get enter_your_pin => "Enter your PIN"; String get enter_your_pin_again => "Enter your pin again"; String get error => "Error"; @@ -128,7 +129,6 @@ class S implements WidgetsLocalizations { String get node_test => "Test"; String get nodes => "Nodes"; String get nodes_list_reset_to_default_message => "Are you sure that you want to reset settings to default?"; - String get note => "Note"; String get note_optional => "Note (optional)"; String get note_tap_to_change => "Note (tap to change)"; String get offer_expires_in => "Offer expires in: "; @@ -780,6 +780,8 @@ class $de extends S { @override String get template => "Vorlage"; @override + String get enter_your_note => "Geben Sie Ihre Notiz ein…"; + @override String get transaction_priority_medium => "Mittel"; @override String get transaction_details_transaction_id => "Transaktions-ID"; @@ -922,8 +924,6 @@ class $de extends S { @override String get settings_save_recipient_address => "Empfängeradresse speichern"; @override - String get note => "Hinweis"; - @override String get change_exchange_provider => "Wechseln Sie den Exchange-Anbieter"; @override String get send_payment_id => "Zahlungs ID (wahlweise)"; @@ -1492,6 +1492,8 @@ class $hi extends S { @override String get template => "खाका"; @override + String get enter_your_note => "अपना नोट दर्ज करें ..."; + @override String get transaction_priority_medium => "मध्यम"; @override String get transaction_details_transaction_id => "लेनदेन आईडी"; @@ -1634,8 +1636,6 @@ class $hi extends S { @override String get settings_save_recipient_address => "प्राप्तकर्ता का पता सहेजें"; @override - String get note => "नोट"; - @override String get change_exchange_provider => "एक्सचेंज प्रदाता बदलें"; @override String get send_payment_id => "भुगतान ID (ऐच्छिक)"; @@ -2204,6 +2204,8 @@ class $ru extends S { @override String get template => "Шаблон"; @override + String get enter_your_note => "Введите примечание…"; + @override String get transaction_priority_medium => "Средний"; @override String get transaction_details_transaction_id => "ID транзакции"; @@ -2346,8 +2348,6 @@ class $ru extends S { @override String get settings_save_recipient_address => "Сохранять адрес получателя"; @override - String get note => "Примечание"; - @override String get change_exchange_provider => "Изменить провайдера обмена"; @override String get send_payment_id => "ID платежа (опционально)"; @@ -2916,6 +2916,8 @@ class $ko extends S { @override String get template => "주형"; @override + String get enter_your_note => "메모를 입력하세요…"; + @override String get transaction_priority_medium => "매질"; @override String get transaction_details_transaction_id => "트랜잭션 ID"; @@ -3058,8 +3060,6 @@ class $ko extends S { @override String get settings_save_recipient_address => "수신자 주소 저장"; @override - String get note => "노트"; - @override String get change_exchange_provider => "교환 공급자 변경"; @override String get send_payment_id => "지불 ID (optional)"; @@ -3628,6 +3628,8 @@ class $pt extends S { @override String get template => "Modelo"; @override + String get enter_your_note => "Insira sua nota ..."; + @override String get transaction_priority_medium => "Média"; @override String get transaction_details_transaction_id => "ID da transação"; @@ -3770,8 +3772,6 @@ class $pt extends S { @override String get settings_save_recipient_address => "Salvar endereço do destinatário"; @override - String get note => "Nota"; - @override String get change_exchange_provider => "Alterar o provedor de troca"; @override String get send_payment_id => "ID de pagamento (opcional)"; @@ -4340,6 +4340,8 @@ class $uk extends S { @override String get template => "Шаблон"; @override + String get enter_your_note => "Введіть примітку…"; + @override String get transaction_priority_medium => "Середній"; @override String get transaction_details_transaction_id => "ID транзакції"; @@ -4482,8 +4484,6 @@ class $uk extends S { @override String get settings_save_recipient_address => "Зберігати адресу отримувача"; @override - String get note => "Примітка"; - @override String get change_exchange_provider => "Змінити провайдера обміну"; @override String get send_payment_id => "ID платежу (опційно)"; @@ -5052,6 +5052,8 @@ class $ja extends S { @override String get template => "テンプレート"; @override + String get enter_your_note => "メモを入力してください…"; + @override String get transaction_priority_medium => "中"; @override String get transaction_details_transaction_id => "トランザクションID"; @@ -5194,8 +5196,6 @@ class $ja extends S { @override String get settings_save_recipient_address => "受信者のアドレスを保存"; @override - String get note => "注意"; - @override String get change_exchange_provider => "Exchangeプロバイダーの変更"; @override String get send_payment_id => "支払いID (オプショナル)"; @@ -5768,6 +5768,8 @@ class $pl extends S { @override String get template => "Szablon"; @override + String get enter_your_note => "Wpisz notatkę…"; + @override String get transaction_priority_medium => "Średni"; @override String get transaction_details_transaction_id => "Transakcja ID"; @@ -5910,8 +5912,6 @@ class $pl extends S { @override String get settings_save_recipient_address => "Zapisz adres odbiorcy"; @override - String get note => "Notatka"; - @override String get change_exchange_provider => "Zmień dostawcę programu Exchange"; @override String get send_payment_id => "Identyfikator płatności (opcjonalny)"; @@ -6480,6 +6480,8 @@ class $es extends S { @override String get template => "Plantilla"; @override + String get enter_your_note => "Ingresa tu nota…"; + @override String get transaction_priority_medium => "Medio"; @override String get transaction_details_transaction_id => "ID de transacción"; @@ -6622,8 +6624,6 @@ class $es extends S { @override String get settings_save_recipient_address => "Guardar dirección del destinatario"; @override - String get note => "Nota"; - @override String get change_exchange_provider => "Cambiar proveedor de intercambio"; @override String get send_payment_id => "ID de pago (opcional)"; @@ -7192,6 +7192,8 @@ class $nl extends S { @override String get template => "Sjabloon"; @override + String get enter_your_note => "Voer uw notitie in ..."; + @override String get transaction_priority_medium => "Medium"; @override String get transaction_details_transaction_id => "Transactie ID"; @@ -7334,8 +7336,6 @@ class $nl extends S { @override String get settings_save_recipient_address => "Adres ontvanger opslaan"; @override - String get note => "Opmerking"; - @override String get change_exchange_provider => "Wijzig Exchange Provider"; @override String get send_payment_id => "Betaling ID (facultatief)"; @@ -7904,6 +7904,8 @@ class $zh extends S { @override String get template => "模板"; @override + String get enter_your_note => "輸入您的筆記..."; + @override String get transaction_priority_medium => "介质"; @override String get transaction_details_transaction_id => "交易编号"; @@ -8046,8 +8048,6 @@ class $zh extends S { @override String get settings_save_recipient_address => "保存收件人地址"; @override - String get note => "注意"; - @override String get change_exchange_provider => "更改交易所提供商"; @override String get send_payment_id => "付款编号 (可选的)"; diff --git a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart index 560428ff9..92e1fb601 100644 --- a/lib/src/screens/transaction_details/widgets/textfield_list_row.dart +++ b/lib/src/screens/transaction_details/widgets/textfield_list_row.dart @@ -41,8 +41,8 @@ class TextFieldListRow extends StatelessWidget { style: TextStyle( fontSize: titleFontSize, fontWeight: FontWeight.w500, - color: - Theme.of(context).primaryTextTheme.overline.color), + color: Theme.of(context) + .primaryTextTheme.overline.color), textAlign: TextAlign.left), TextField( controller: _textController, @@ -54,20 +54,16 @@ class TextFieldListRow extends StatelessWidget { fontSize: valueFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme - .title - .color), + .primaryTextTheme.title.color), decoration: InputDecoration( isDense: true, contentPadding: EdgeInsets.only(top: 12, bottom: 0), - hintText: S.of(context).note, + hintText: S.of(context).enter_your_note, hintStyle: TextStyle( fontSize: valueFontSize, fontWeight: FontWeight.w500, color: Theme.of(context) - .primaryTextTheme - .title - .color), + .primaryTextTheme.overline.color), border: InputBorder.none ), onSubmitted: (value) => onSubmitted.call(value), diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 20bdffedd..de7794eed 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -431,7 +431,7 @@ "bright_theme" : "Hell", "dark_theme" : "Dunkel", - "note" : "Hinweis", + "enter_your_note" : "Geben Sie Ihre Notiz ein…", "note_optional" : "Hinweis (optional)", "note_tap_to_change" : "Hinweis (zum Ändern tippen)", "transaction_key" : "Transaktionsschlüssel", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index fbedfb6af..7906de59e 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -431,7 +431,7 @@ "bright_theme" : "Bright", "dark_theme" : "Dark", - "note" : "Note", + "enter_your_note" : "Enter your note…", "note_optional" : "Note (optional)", "note_tap_to_change" : "Note (tap to change)", "transaction_key" : "Transaction Key", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index aa0d5836b..714dcebf8 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -431,7 +431,7 @@ "bright_theme" : "Brillante", "dark_theme" : "Oscura", - "note" : "Nota", + "enter_your_note" : "Ingresa tu nota…", "note_optional" : "Nota (opcional)", "note_tap_to_change" : "Nota (toque para cambiar)", "transaction_key" : "Clave de transacción", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 8cb9229a3..c8517f18c 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -431,7 +431,7 @@ "bright_theme" : "उज्ज्वल", "dark_theme" : "अंधेरा", - "note" : "नोट", + "enter_your_note" : "अपना नोट दर्ज करें ...", "note_optional" : "नोट (वैकल्पिक)", "note_tap_to_change" : "नोट (टैप टू चेंज)", "transaction_key" : "लेन-देन की", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index f04e90ab2..0cfa01abf 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -431,7 +431,7 @@ "bright_theme" : "明るい", "dark_theme" : "闇", - "note" : "注意", + "enter_your_note" : "メモを入力してください…", "note_optional" : "注（オプション）", "note_tap_to_change" : "注（タップして変更）", "transaction_key" : "トランザクションキー", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index a6b4098a2..d69ecec08 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -431,7 +431,7 @@ "bright_theme" : "선명한", "dark_theme" : "어두운", - "note" : "노트", + "enter_your_note" : "메모를 입력하세요…", "note_optional" : "참고 (선택 사항)", "note_tap_to_change" : "메모 (변경하려면 탭하세요)", "transaction_key" : "거래 키", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index a6385c366..1129e3c88 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -431,7 +431,7 @@ "bright_theme" : "Helder", "dark_theme" : "Donker", - "note" : "Opmerking", + "enter_your_note" : "Voer uw notitie in ...", "note_optional" : "Opmerking (optioneel)", "note_tap_to_change" : "Opmerking (tik om te wijzigen)", "transaction_key" : "Transactiesleutel", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 4cf9ea031..657aaf53c 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -431,7 +431,7 @@ "bright_theme" : "Jasny", "dark_theme" : "Ciemny", - "note" : "Notatka", + "enter_your_note" : "Wpisz notatkę…", "note_optional" : "Notatka (opcjonalnie)", "note_tap_to_change" : "Notatka (dotknij, aby zmienić)", "transaction_key" : "Klucz transakcji", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 345bb9d6b..4598ca8f4 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -431,7 +431,7 @@ "bright_theme" : "Brilhante", "dark_theme" : "Sombria", - "note" : "Nota", + "enter_your_note" : "Insira sua nota ...", "note_optional" : "Nota (opcional)", "note_tap_to_change" : "Nota (toque para alterar)", "transaction_key" : "Chave de transação", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index ca1e8af12..9c5e90809 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -431,7 +431,7 @@ "bright_theme" : "Яркая", "dark_theme" : "Темная", - "note" : "Примечание", + "enter_your_note" : "Введите примечание…", "note_optional" : "Примечание (необязательно)", "note_tap_to_change" : "Примечание (нажмите для изменения)", "transaction_key" : "Ключ транзакции", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 15f5d48da..a2168daba 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -431,7 +431,7 @@ "bright_theme" : "Яскрава", "dark_theme" : "Темна", - "note" : "Примітка", + "enter_your_note" : "Введіть примітку…", "note_optional" : "Примітка (необов’язково)", "note_tap_to_change" : "Примітка (натисніть для зміни)", "transaction_key" : "Ключ транзакції", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index a63342b75..71ad80264 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -431,7 +431,7 @@ "bright_theme" : "亮", "dark_theme" : "黑暗", - "note" : "注意", + "enter_your_note" : "輸入您的筆記...", "note_optional" : "注意（可選）", "note_tap_to_change" : "注意（輕按即可更改）", "transaction_key" : "交易密碼", From 44536a82318f5be082cdd284f593d55bdc73d2b6 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Thu, 24 Dec 2020 10:33:11 +0200 Subject: [PATCH 5/7] CAKE-198 | fixed string resources (send_success) --- lib/generated/i18n.dart | 46 +++++++++---------- .../exchange_trade/exchange_trade_page.dart | 6 ++- lib/src/screens/send/send_page.dart | 4 +- res/values/strings_de.arb | 2 +- res/values/strings_en.arb | 2 +- res/values/strings_es.arb | 2 +- res/values/strings_hi.arb | 2 +- res/values/strings_ja.arb | 2 +- res/values/strings_ko.arb | 2 +- res/values/strings_nl.arb | 2 +- res/values/strings_pl.arb | 2 +- res/values/strings_pt.arb | 2 +- res/values/strings_ru.arb | 2 +- res/values/strings_uk.arb | 2 +- res/values/strings_zh.arb | 2 +- 15 files changed, 43 insertions(+), 37 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 0aea9f9c9..05ab83fbb 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -222,7 +222,6 @@ class S implements WidgetsLocalizations { String get send_new => "New"; String get send_payment_id => "Payment ID (optional)"; String get send_sending => "Sending..."; - String get send_success => "Your Monero was successfully sent"; String get send_templates => "Templates"; String get send_title => "Send"; String get send_xmr => "Send XMR"; @@ -362,6 +361,7 @@ class S implements WidgetsLocalizations { String router_no_route(String name) => "No route defined for ${name}"; String send_address(String cryptoCurrency) => "${cryptoCurrency} address"; String send_priority(String transactionPriority) => "Currently the fee is set at ${transactionPriority} priority.\nTransaction priority can be adjusted in the settings"; + String send_success(String crypto) => "Your ${crypto} was successfully sent"; String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; String trade_details_copied(String title) => "${title} copied to Clipboard"; String trade_for_not_created(String title) => "Trade for ${title} is not created."; @@ -656,8 +656,6 @@ class $de extends S { @override String get trade_details_created_at => "Hergestellt in"; @override - String get send_success => "Ihr Monero wurde erfolgreich gesendet"; - @override String get settings_wallets => "Brieftaschen"; @override String get settings_only_transactions => "Nur Transaktionen"; @@ -1050,6 +1048,8 @@ class $de extends S { @override String change_wallet_alert_content(String wallet_name) => "Möchten Sie die aktuelle Brieftasche in ändern ${wallet_name}?"; @override + String send_success(String crypto) => "Ihr ${crypto} wurde erfolgreich gesendet"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "Max: ${value} ${currency}"; @@ -1368,8 +1368,6 @@ class $hi extends S { @override String get trade_details_created_at => "पर बनाया गया"; @override - String get send_success => "आपका Monero सफलतापूर्वक भेजा गया"; - @override String get settings_wallets => "पर्स"; @override String get settings_only_transactions => "केवल लेन-देन"; @@ -1762,6 +1760,8 @@ class $hi extends S { @override String change_wallet_alert_content(String wallet_name) => "क्या आप करंट वॉलेट को बदलना चाहते हैं ${wallet_name}?"; @override + String send_success(String crypto) => "आपका ${crypto} सफलतापूर्वक भेजा गया"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "मैक्स: ${value} ${currency}"; @@ -2080,8 +2080,6 @@ class $ru extends S { @override String get trade_details_created_at => "Создано"; @override - String get send_success => "Ваш Monero был успешно отправлен"; - @override String get settings_wallets => "Кошельки"; @override String get settings_only_transactions => "Транзакции"; @@ -2474,6 +2472,8 @@ class $ru extends S { @override String change_wallet_alert_content(String wallet_name) => "Вы хотите изменить текущий кошелек на ${wallet_name}?"; @override + String send_success(String crypto) => "Ваш ${crypto} был успешно отправлен"; + @override String time(String minutes, String seconds) => "${minutes}мин ${seconds}сек"; @override String max_value(String value, String currency) => "Макс: ${value} ${currency}"; @@ -2792,8 +2792,6 @@ class $ko extends S { @override String get trade_details_created_at => "에 작성"; @override - String get send_success => "Monero가 성공적으로 전송되었습니다"; - @override String get settings_wallets => "지갑"; @override String get settings_only_transactions => "거래 만"; @@ -3186,6 +3184,8 @@ class $ko extends S { @override String change_wallet_alert_content(String wallet_name) => "현재 지갑을 다음으로 변경 하시겠습니까 ${wallet_name}?"; @override + String send_success(String crypto) => "${crypto}가 성공적으로 전송되었습니다"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "맥스: ${value} ${currency}"; @@ -3504,8 +3504,6 @@ class $pt extends S { @override String get trade_details_created_at => "Criada em"; @override - String get send_success => "Seu Monero foi enviado com sucesso"; - @override String get settings_wallets => "Carteiras"; @override String get settings_only_transactions => "Somente transações"; @@ -3898,6 +3896,8 @@ class $pt extends S { @override String change_wallet_alert_content(String wallet_name) => "Quer mudar a carteira atual para ${wallet_name}?"; @override + String send_success(String crypto) => "Seu ${crypto} foi enviado com sucesso"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "Máx: ${value} ${currency}"; @@ -4216,8 +4216,6 @@ class $uk extends S { @override String get trade_details_created_at => "Створено"; @override - String get send_success => "Ваш Monero успішно надісланий"; - @override String get settings_wallets => "Гаманці"; @override String get settings_only_transactions => "Транзакції"; @@ -4610,6 +4608,8 @@ class $uk extends S { @override String change_wallet_alert_content(String wallet_name) => "Ви хочете змінити поточний гаманець на ${wallet_name}?"; @override + String send_success(String crypto) => "Ваш ${crypto} успішно надісланий"; + @override String time(String minutes, String seconds) => "${minutes}хв ${seconds}сек"; @override String max_value(String value, String currency) => "Макс: ${value} ${currency}"; @@ -4928,8 +4928,6 @@ class $ja extends S { @override String get trade_details_created_at => "で作成"; @override - String get send_success => "Moneroが送信されました"; - @override String get settings_wallets => "財布"; @override String get settings_only_transactions => "トランザクションのみ"; @@ -5322,6 +5320,8 @@ class $ja extends S { @override String change_wallet_alert_content(String wallet_name) => "現在のウォレットをに変更しますか ${wallet_name}?"; @override + String send_success(String crypto) => "${crypto}が送信されました"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "マックス: ${value} ${currency}"; @@ -5644,8 +5644,6 @@ class $pl extends S { @override String get trade_details_created_at => "Utworzono w"; @override - String get send_success => "Twoje Monero zostało pomyślnie wysłane"; - @override String get settings_wallets => "Portfele"; @override String get settings_only_transactions => "Tylko transakcje"; @@ -6038,6 +6036,8 @@ class $pl extends S { @override String change_wallet_alert_content(String wallet_name) => "Czy chcesz zmienić obecny portfel na ${wallet_name}?"; @override + String send_success(String crypto) => "Twoje ${crypto} zostało pomyślnie wysłane"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "Max: ${value} ${currency}"; @@ -6356,8 +6356,6 @@ class $es extends S { @override String get trade_details_created_at => "Creado en"; @override - String get send_success => "Su Monero fue enviado con éxito"; - @override String get settings_wallets => "Carteras"; @override String get settings_only_transactions => "Solo transacciones"; @@ -6750,6 +6748,8 @@ class $es extends S { @override String change_wallet_alert_content(String wallet_name) => "¿Quieres cambiar la billetera actual a ${wallet_name}?"; @override + String send_success(String crypto) => "Su ${crypto} fue enviado con éxito"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "Max: ${value} ${currency}"; @@ -7068,8 +7068,6 @@ class $nl extends S { @override String get trade_details_created_at => "Gemaakt bij"; @override - String get send_success => "Uw Monero is succesvol verzonden"; - @override String get settings_wallets => "Portemonnee"; @override String get settings_only_transactions => "Alleen transacties"; @@ -7462,6 +7460,8 @@ class $nl extends S { @override String change_wallet_alert_content(String wallet_name) => "Wilt u de huidige portemonnee wijzigen in ${wallet_name}?"; @override + String send_success(String crypto) => "Uw ${crypto} is succesvol verzonden"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "Max: ${value} ${currency}"; @@ -7780,8 +7780,6 @@ class $zh extends S { @override String get trade_details_created_at => "创建于"; @override - String get send_success => "你Monero已成功發送"; - @override String get settings_wallets => "皮夹"; @override String get settings_only_transactions => "仅交易"; @@ -8174,6 +8172,8 @@ class $zh extends S { @override String change_wallet_alert_content(String wallet_name) => "您要將當前的錢包更改為 ${wallet_name}?"; @override + String send_success(String crypto) => "你${crypto}已成功發送"; + @override String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; @override String max_value(String value, String currency) => "最高: ${value} ${currency}"; diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index 64ff65972..e43b8d8f1 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -305,7 +305,11 @@ class ExchangeTradeState extends State { padding: EdgeInsets.only( top: 220, left: 24, right: 24), child: Text( - S.of(context).send_success, + S.of(context).send_success(widget + .exchangeTradeViewModel + .wallet + .currency + .toString()), textAlign: TextAlign.center, style: TextStyle( fontSize: 22, diff --git a/lib/src/screens/send/send_page.dart b/lib/src/screens/send/send_page.dart index 54bfd4a24..4ee195e16 100644 --- a/lib/src/screens/send/send_page.dart +++ b/lib/src/screens/send/send_page.dart @@ -668,7 +668,9 @@ class SendPage extends BasePage { padding: EdgeInsets.only( top: 220, left: 24, right: 24), child: Text( - S.of(context).send_success, + S.of(context).send_success( + sendViewModel.currency + .toString()), textAlign: TextAlign.center, style: TextStyle( fontSize: 22, diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index de7794eed..a77793b8e 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -212,7 +212,7 @@ "send_name" : "Name", "send_got_it" : "Ich habs", "send_sending" : "Senden...", - "send_success" : "Ihr Monero wurde erfolgreich gesendet", + "send_success" : "Ihr ${crypto} wurde erfolgreich gesendet", "settings_title" : "die Einstellungen", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 7906de59e..2581192d7 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -212,7 +212,7 @@ "send_name" : "Name", "send_got_it" : "Got it", "send_sending" : "Sending...", - "send_success" : "Your Monero was successfully sent", + "send_success" : "Your ${crypto} was successfully sent", "settings_title" : "Settings", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 714dcebf8..c504cdcdd 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -212,7 +212,7 @@ "send_name" : "Nombre", "send_got_it" : "Entendido", "send_sending" : "Enviando...", - "send_success" : "Su Monero fue enviado con éxito", + "send_success" : "Su ${crypto} fue enviado con éxito", "settings_title" : "Configuraciones", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index c8517f18c..897dc46a6 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -212,7 +212,7 @@ "send_name" : "नाम", "send_got_it" : "समझ गया", "send_sending" : "भेजना...", - "send_success" : "आपका Monero सफलतापूर्वक भेजा गया", + "send_success" : "आपका ${crypto} सफलतापूर्वक भेजा गया", "settings_title" : "सेटिंग्स", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 0cfa01abf..5d8e9b446 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -212,7 +212,7 @@ "send_name" : "名前", "send_got_it" : "とった", "send_sending" : "送信...", - "send_success" : "Moneroが送信されました", + "send_success" : "${crypto}が送信されました", "settings_title" : "設定", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index d69ecec08..083e8b7d3 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -212,7 +212,7 @@ "send_name" : "이름", "send_got_it" : "알았다", "send_sending" : "배상...", - "send_success" : "Monero가 성공적으로 전송되었습니다", + "send_success" : "${crypto}가 성공적으로 전송되었습니다", "settings_title" : "설정", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 1129e3c88..35177bcd0 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -212,7 +212,7 @@ "send_name" : "Naam", "send_got_it" : "Ik snap het", "send_sending" : "Bezig met verzenden...", - "send_success" : "Uw Monero is succesvol verzonden", + "send_success" : "Uw ${crypto} is succesvol verzonden", "settings_title" : "Instellingen", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 657aaf53c..1b60656a7 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -212,7 +212,7 @@ "send_name" : "Imię", "send_got_it" : "Rozumiem", "send_sending" : "Wysyłanie...", - "send_success" : "Twoje Monero zostało pomyślnie wysłane", + "send_success" : "Twoje ${crypto} zostało pomyślnie wysłane", "settings_title" : "Ustawienia", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 4598ca8f4..229bf3171 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -212,7 +212,7 @@ "send_name" : "Nome", "send_got_it" : "Entendi", "send_sending" : "Enviando...", - "send_success" : "Seu Monero foi enviado com sucesso", + "send_success" : "Seu ${crypto} foi enviado com sucesso", "settings_title" : "Configurações", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 9c5e90809..6f8a6a6bf 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -212,7 +212,7 @@ "send_name" : "Имя", "send_got_it" : "Понял", "send_sending" : "Отправка...", - "send_success" : "Ваш Monero был успешно отправлен", + "send_success" : "Ваш ${crypto} был успешно отправлен", "settings_title" : "Настройки", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index a2168daba..feea0f34d 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -212,7 +212,7 @@ "send_name" : "Ім'я", "send_got_it" : "Зрозумів", "send_sending" : "Відправлення...", - "send_success" : "Ваш Monero успішно надісланий", + "send_success" : "Ваш ${crypto} успішно надісланий", "settings_title" : "Налаштування", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 71ad80264..bec7f068b 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -212,7 +212,7 @@ "send_name" : "名稱", "send_got_it" : "得到它了", "send_sending" : "正在發送...", - "send_success" : "你Monero已成功發送", + "send_success" : "你${crypto}已成功發送", "settings_title" : "设定值", From ac883f3b16833a423809de5a3d137980851f8069 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Thu, 24 Dec 2020 11:01:27 +0200 Subject: [PATCH 6/7] CAKE-198 | fixed saving transaction description in the send_view_model.dart --- lib/view_model/send/send_view_model.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart index c56230c59..d61ac3f96 100644 --- a/lib/view_model/send/send_view_model.dart +++ b/lib/view_model/send/send_view_model.dart @@ -129,8 +129,7 @@ abstract class SendViewModelBase with Store { state = TransactionCommitting(); await pendingTransaction.commit(); - if (_settingsStore.shouldSaveRecipientAddress && - (pendingTransaction.id?.isNotEmpty ?? false)) { + if (pendingTransaction.id?.isNotEmpty ?? false) { await transactionDescriptionBox.add(TransactionDescription( id: pendingTransaction.id, recipientAddress: address, transactionNote: note)); From 2d49d4f093b1a900e95dc15a92d6d59a1238770d Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Thu, 24 Dec 2020 12:04:23 +0200 Subject: [PATCH 7/7] CAKE-198 | fixed saving transaction description in the send_view_model.dart --- lib/view_model/send/send_view_model.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart index d61ac3f96..a3f84fcd4 100644 --- a/lib/view_model/send/send_view_model.dart +++ b/lib/view_model/send/send_view_model.dart @@ -130,9 +130,12 @@ abstract class SendViewModelBase with Store { await pendingTransaction.commit(); if (pendingTransaction.id?.isNotEmpty ?? false) { - await transactionDescriptionBox.add(TransactionDescription( + _settingsStore.shouldSaveRecipientAddress + ? await transactionDescriptionBox.add(TransactionDescription( id: pendingTransaction.id, recipientAddress: address, - transactionNote: note)); + transactionNote: note)) + : await transactionDescriptionBox.add(TransactionDescription( + id: pendingTransaction.id, transactionNote: note)); } state = TransactionCommitted();