[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] branch master updated: Rename Purchase Reference t
From: |
gnunet |
Subject: |
[taler-taler-android] branch master updated: Rename Purchase Reference to Receipt # |
Date: |
Mon, 04 May 2020 16:39:39 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
The following commit(s) were added to refs/heads/master by this push:
new 3e13e7c Rename Purchase Reference to Receipt #
3e13e7c is described below
commit 3e13e7c84e4a093d4f681f1f071c59c4c96e1c22
Author: Torsten Grote <address@hidden>
AuthorDate: Mon May 4 11:39:15 2020 -0300
Rename Purchase Reference to Receipt #
---
.../main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt | 2 +-
merchant-terminal/src/main/res/layout/fragment_process_payment.xml | 2 +-
merchant-terminal/src/main/res/values/strings.xml | 4 ++--
wallet/src/main/res/values/strings.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
index e947ae2..9060fd3 100644
---
a/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
+++
b/merchant-terminal/src/main/java/net/taler/merchantpos/payment/ProcessPaymentFragment.kt
@@ -74,7 +74,7 @@ class ProcessPaymentFragment : Fragment() {
payIntroView.fadeIn()
amountView.text = payment.order.total.toString()
payment.orderId?.let {
- orderRefView.text = getString(R.string.payment_order_ref, it)
+ orderRefView.text = getString(R.string.payment_order_id, it)
orderRefView.fadeIn()
}
payment.talerPayUri?.let {
diff --git a/merchant-terminal/src/main/res/layout/fragment_process_payment.xml
b/merchant-terminal/src/main/res/layout/fragment_process_payment.xml
index cb69aa2..f84e041 100644
--- a/merchant-terminal/src/main/res/layout/fragment_process_payment.xml
+++ b/merchant-terminal/src/main/res/layout/fragment_process_payment.xml
@@ -91,7 +91,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toBottomOf="@+id/amountView"
- tools:text="@string/payment_order_ref"
+ tools:text="@string/payment_order_id"
tools:visibility="visible" />
<Button
diff --git a/merchant-terminal/src/main/res/values/strings.xml
b/merchant-terminal/src/main/res/values/strings.xml
index eabe816..a3e69f3 100644
--- a/merchant-terminal/src/main/res/values/strings.xml
+++ b/merchant-terminal/src/main/res/values/strings.xml
@@ -41,12 +41,12 @@
<string name="payment_cancel">Cancel payment</string>
<string name="payment_received">Payment received</string>
<string name="payment_back_button">Continue</string>
- <string name="payment_order_ref">Purchase reference: %s</string>
+ <string name="payment_order_id">Receipt #%s</string>
<string name="payment_process_label">Payment required</string>
<string name="payment_canceled">Payment canceled</string>
<string name="history_label">Payment history</string>
- <string name="history_ref_no">Ref. No: %s</string>
+ <string name="history_ref_no"
translatable="false">@string/payment_order_id</string>
<string name="history_refund">Refund</string>
<string name="refund_amount">Amount</string>
<string name="refund_reason">Refund reason</string>
diff --git a/wallet/src/main/res/values/strings.xml
b/wallet/src/main/res/values/strings.xml
index dd3a810..e01a0f0 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -74,7 +74,7 @@ GNU Taler is immune against many types of fraud, such as
phishing of credit card
<string name="transaction_paid">Paid</string>
<string name="transaction_order_total">Total</string>
<string name="transaction_order">Purchase</string>
- <string name="transaction_order_id">Purchase Reference: %1$s</string>
+ <string name="transaction_order_id">Receipt #%1$s</string>
<string name="transaction_order_accepted">Purchase Confirmed</string>
<string name="transaction_order_refused">Purchase Cancelled</string>
<string name="transaction_tip_accepted">Tip Accepted</string>
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-android] branch master updated: Rename Purchase Reference to Receipt #,
gnunet <=