make basic strings translatable

deltachat · Mar 21, 2023 · d3d5e0f · d3d5e0f
1 parent e6b55a5
commit d3d5e0f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -469,7 +469,18 @@
     <!-- Multi Device -->
     <string name="multidevice_title">Add Another Device</string>
     <string name="multidevice_receiver_scanning_ask">Copy the account from the other device to this device? Both devices will work independently afterwards.</string>
-    <string name="multidevice_same_network_hint">During copying, both devices must be on the same wifi or network.</string>
+    <string name="multidevice_same_network_hint">Both devices must be on the same Wi-Fi or network.</string>
+    <string name="multidevice_exporting_database">Exporting database…</string>
+    <string name="multidevice_creating_collection">Creating collection…</string>
+    <string name="multidevice_collection_created">Collection created.</string>
+    <string name="multidevice_waiting_for_receiver">Waiting for receiver…</string>
+    <string name="multidevice_connecting">Connecting…</string>
+    <string name="multidevice_receiving_collection">Receiving collection…</string>
+    <string name="multidevice_collection_received">Collection received.</string>
+    <string name="multidevice_receiver_connected">Receiver connected…</string>
+    <string name="multidevice_transferring">Transferring…</string>
+    <string name="multidevice_abort">Abort transfer?</string>
+    <string name="multidevice_abort_will_invalidate_copied_qr">This will invalidate the QR code copied to clipboard.</string>
 
     <!-- Connectivity -->
     <!-- Headline for the "Inbox" eg. in the "Connectivity" view -->

diff --git a/src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java b/src/org/thoughtcrime/securesms/qr/BackupProviderFragment.java
@@ -131,23 +131,23 @@ public void handleEvent(@NonNull DcEvent event) {
                 ((BackupTransferActivity)getActivity()).showLastErrorAlert("Sending Error");
                 hideQrCode = true;
             } else if(permille <= 100) {
-                statusLineText = "Exporting database...";
+                statusLineText = getString(R.string.multidevice_exporting_database);
             } else if(permille <= 300) {
-                statusLineText = "Creating collection...";
+                statusLineText = getString(R.string.multidevice_creating_collection);
             } else if(permille <= 350) {
-                statusLineText = "Collection created.";
+                statusLineText = getString(R.string.multidevice_collection_created);
             } else if(permille <= 400) {
-                statusLineText = "Waiting for receiver...";
+                statusLineText = getString(R.string.multidevice_waiting_for_receiver);
             } else if(permille <= 450) {
-                statusLineText = "Receiver connected...";
+                statusLineText = getString(R.string.multidevice_receiver_connected);
                 hideQrCode = true;
             } else if (permille < 1000) {
                 percent = (permille-450)/5;
                 percentMax = 100;
-                statusLineText = String.format(Locale.getDefault(), "Transfer... %d%%", percent);
+                statusLineText = getString(R.string.multidevice_transferring) + String.format(Locale.getDefault(), " %d%%", percent);
                 hideQrCode = true;
             } else if (permille == 1000) {
-                statusLineText = "Done.";
+                statusLineText = getString(R.string.done);
                 ((BackupTransferActivity)getActivity()).setTransferState(BackupTransferActivity.TransferState.TRANSFER_SUCCESS);
                 hideQrCode = true;
             }

diff --git a/src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java b/src/org/thoughtcrime/securesms/qr/BackupReceiverFragment.java
@@ -39,7 +39,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         View view = inflater.inflate(R.layout.backup_provider_fragment, container, false);
         statusLine = view.findViewById(R.id.status_line);
 
-        statusLine.setText("Connecting...");
+        statusLine.setText(R.string.multidevice_connecting);
 
         dcContext = DcHelper.getContext(getActivity());
         DcHelper.getEventCenter(getActivity()).addObserver(DcContext.DC_EVENT_IMEX_PROGRESS, this);
@@ -75,13 +75,13 @@ public void handleEvent(@NonNull DcEvent event) {
                 ((BackupTransferActivity)getActivity()).setTransferState(BackupTransferActivity.TransferState.TRANSFER_ERROR);
                 ((BackupTransferActivity)getActivity()).showLastErrorAlert("Receiving Error");
             } else if (permille <= 50) {
-              statusLineText = "Receiving collection..."; // "Connected"
+              statusLineText = getString(R.string.multidevice_receiving_collection); // "Connected"
             } else if (permille <= 100) {
-              statusLineText = "Collection received.";
+              statusLineText = getString(R.string.multidevice_collection_received);
             } else if (permille <= 950 ) {
                 percent = ((permille-100)*100)/850;
                 percentMax = 100;
-                statusLineText = String.format(Locale.getDefault(), "Transfer... %d%%", percent);
+                statusLineText = getString(R.string.multidevice_transferring) + String.format(Locale.getDefault(), " %d%%", percent);
             } else if (permille < 1000) {
               statusLineText = "Finishing..."; // range not used, should not happen
             } else if (permille == 1000) {

diff --git a/src/org/thoughtcrime/securesms/qr/BackupTransferActivity.java b/src/org/thoughtcrime/securesms/qr/BackupTransferActivity.java
@@ -145,9 +145,9 @@ private void finishOrAskToFinish() {
               break;
 
           default:
-              String msg = "Abort transfer?";
+              String msg = getString(R.string.multidevice_abort);
               if (warnAboutCopiedQrCodeOnAbort) {
-                  msg += "\n\n" + "This will invalidate the QR code copied to clipboard.";
+                  msg += "\n\n" + getString(R.string.multidevice_abort_will_invalidate_copied_qr);
               }
               new AlertDialog.Builder(this)
                     .setMessage(msg)