[taler-merchant-terminal-android] 07/08: Make fragment titles translatable

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a commit to branch master
in repository merchant-terminal-android.

commit ae9faac31f03b891b4ab3b20434dab532514c5f5
Author: Torsten Grote <address@hidden>
AuthorDate: Tue Feb 25 11:41:19 2020 -0300

    Make fragment titles translatable
---
 app/src/main/res/navigation/nav_graph.xml | 12 ++++++------
 app/src/main/res/values/strings.xml       |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/navigation/nav_graph.xml 
b/app/src/main/res/navigation/nav_graph.xml
index adaf1c4..35c2bf2 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -9,7 +9,7 @@
     <fragment
             android:id="@+id/order"
             android:name="net.taler.merchantpos.order.OrderFragment"
-            android:label="Order"
+            android:label="@string/order_label"
             tools:layout="@layout/fragment_order">
         <action
                 android:id="@+id/action_order_to_processPayment"
@@ -25,7 +25,7 @@
     <fragment
             android:id="@+id/processPayment"
             android:name="net.taler.merchantpos.payment.ProcessPaymentFragment"
-            android:label="Payment Prompt"
+            android:label="@string/payment_process_label"
             tools:layout="@layout/fragment_process_payment">
         <action
                 android:id="@+id/action_processPayment_to_paymentSuccess"
@@ -36,19 +36,19 @@
     <fragment
             android:id="@+id/merchantHistory"
             android:name="net.taler.merchantpos.MerchantHistory"
-            android:label="Payment History"
+            android:label="@string/history_label"
             tools:layout="@layout/fragment_merchant_history" />
 
     <fragment
             android:id="@+id/merchantSettings"
             android:name="net.taler.merchantpos.config.MerchantConfigFragment"
-            android:label="Merchant Settings"
+            android:label="@string/config_label"
             tools:layout="@layout/fragment_merchant_config" />
 
     <fragment
             android:id="@+id/configFetcher"
             android:name="net.taler.merchantpos.config.ConfigFetcherFragment"
-            android:label="Fetching Configuration"
+            android:label="@string/config_fetching_label"
             tools:layout="@layout/fragment_config_fetcher">
         <action
                 android:id="@+id/action_configFetcher_to_merchantSettings"
@@ -64,7 +64,7 @@
     <fragment
             android:id="@+id/paymentSuccess"
             android:name="net.taler.merchantpos.payment.PaymentSuccessFragment"
-            android:label="Payment Received"
+            android:label="@string/payment_received"
             tools:layout="@layout/fragment_payment_success" />
 
     <action
diff --git a/app/src/main/res/values/strings.xml 
b/app/src/main/res/values/strings.xml
index 1dad4de..d313f03 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
     <string name="menu_history">History</string>
     <string name="menu_settings">Settings</string>
 
+    <string name="order_label">Order</string>
     <!-- The first placeholder is the amount and the second the currency -->
     <string name="order_total">Total: %1$.2f %2$s</string>
     <string name="order_restart">Restart</string>
@@ -16,6 +17,7 @@
     <string name="button_logout">Logout</string>
     <string name="button_complete">Complete</string>
 
+    <string name="config_label">Merchant Settings</string>
     <string name="config_url">Configuration URL</string>
     <string name="config_username">Username</string>
     <string name="config_password">Password</string>
@@ -28,6 +30,7 @@
     <string name="config_save_password">Remember Password</string>
     <string name="config_forget_password">Forget</string>
     <string name="config_changed">Changed to new merchant using %s</string>
+    <string name="config_fetching_label">Fetching Configuration</string>
 
     <string name="payment_intro_nfc">Please scan QR Code or use NFC to 
pay</string>
     <string name="payment_intro">Please scan QR Code to pay</string>
@@ -35,8 +38,10 @@
     <string name="payment_received">Payment received</string>
     <string name="payment_back_button">Continue</string>
     <string name="payment_order_ref">Order Reference: %s</string>
+    <string name="payment_process_label">Customer Payment Required</string>
     <string name="payment_canceled">Payment Canceled</string>
 
+    <string name="history_label">Payment History</string>
     <string name="history_received_at">Received at</string>
     <string name="history_ref_no">Ref. No:</string>
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.