From e585d9489289f98db9eef52a4ed3febdf1ede658 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 25 May 2020 15:46:53 +1000
Subject: [PATCH] Prepare home screen for localization

---
 res/layout-sw400dp/activity_seed.xml          |  8 +++---
 res/layout/activity_home.xml                  |  4 +--
 res/layout/activity_seed.xml                  |  8 +++---
 res/values/strings.xml                        | 27 ++++++++++++++-----
 .../securesms/loki/activities/HomeActivity.kt |  6 ++---
 .../securesms/loki/activities/SeedActivity.kt | 12 ++++-----
 6 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/res/layout-sw400dp/activity_seed.xml b/res/layout-sw400dp/activity_seed.xml
index caa3272d57..f5bc0db14e 100644
--- a/res/layout-sw400dp/activity_seed.xml
+++ b/res/layout-sw400dp/activity_seed.xml
@@ -25,7 +25,7 @@
         android:textSize="@dimen/very_large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Meet your recovery phrase" />
+        android:text="@string/activity_seed_title_2" />
 
     <TextView
         android:layout_width="match_parent"
@@ -35,7 +35,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
-        android:text="Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session." />
+        android:text="@string/activity_seed_explanation" />
 
     <TextView
         style="@style/SessionIDTextView"
@@ -59,7 +59,7 @@
         android:textSize="@dimen/medium_font_size"
         android:textColor="@color/text"
         android:alpha="0.6"
-        android:text="Hold to reveal" />
+        android:text="@string/activity_seed_reveal_button_title" />
 
     <View
         android:layout_width="match_parent"
@@ -72,6 +72,6 @@
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="Copy" />
+        android:text="@string/copy" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 4079874f8a..1bafe1d074 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -87,7 +87,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/medium_font_size"
                 android:textColor="@color/text"
-                android:text="You don't have any contacts yet" />
+                android:text="@string/activity_home_empty_state_message" />
 
             <Button
                 style="@style/MediumProminentOutlineButton"
@@ -95,7 +95,7 @@
                 android:layout_width="196dp"
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_marginTop="@dimen/medium_spacing"
-                android:text="Start a Session" />
+                android:text="@string/activity_home_empty_state_button_title" />
 
         </LinearLayout>
 
diff --git a/res/layout/activity_seed.xml b/res/layout/activity_seed.xml
index db9e3df0d3..72583ef0a9 100644
--- a/res/layout/activity_seed.xml
+++ b/res/layout/activity_seed.xml
@@ -25,7 +25,7 @@
         android:textSize="19sp"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Meet your recovery phrase" />
+        android:text="@string/activity_seed_title_2" />
 
     <TextView
         android:layout_width="match_parent"
@@ -35,7 +35,7 @@
         android:layout_marginRight="@dimen/very_large_spacing"
         android:textSize="14sp"
         android:textColor="@color/text"
-        android:text="Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session." />
+        android:text="@string/activity_seed_explanation" />
 
     <TextView
         style="@style/SessionIDTextView"
@@ -59,7 +59,7 @@
         android:textSize="14sp"
         android:textColor="@color/text"
         android:alpha="0.6"
-        android:text="Hold to reveal" />
+        android:text="@string/activity_seed_reveal_button_title" />
 
     <View
         android:layout_width="match_parent"
@@ -72,6 +72,6 @@
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
         android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="Copy" />
+        android:text="@string/copy" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f14d2b0354..486745bc12 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1719,30 +1719,43 @@
     <string name="activity_pn_mode_title">Push Notifications</string>
     <string name="activity_pn_mode_explanation">There are two ways Session can handle push notifications. Make sure to read the descriptions carefully before you choose.</string>
     <string name="activity_pn_mode_fcm_option_title">Firebase Cloud Messaging</string>
-    <string name="activity_pn_mode_fcm_option_explanation">Session will use the Firebase Cloud Messaging service to receive push notifications. You’ll be notified of new messages reliably and immediately. Using FCM means that this device will communicate directly with Google’s servers to retrieve push notifications, which will expose your IP address to Google. Your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.</string>
+    <string name="activity_pn_mode_fcm_option_explanation">Session will use the Firebase Cloud Messaging service to receive push notifications. You\’ll be notified of new messages reliably and immediately. Using FCM means that this device will communicate directly with Google\’s servers to retrieve push notifications, which will expose your IP address to Google. Your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.</string>
     <string name="activity_pn_mode_background_polling_option_title">Background Polling</string>
     <string name="activity_pn_mode_background_polling_option_explanation">Session will occasionally check for new messages in the background. This guarantees full privacy protection, but message notifications may be significantly delayed.</string>
     <string name="activity_pn_mode_recommended_option_tag">Recommended</string>
     <string name="activity_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
 
-
-
+    <string name="activity_home_empty_state_message">You don\'t have any contacts yet</string>
+    <string name="activity_home_empty_state_button_title">Start a Session</string>
     <string name="activity_home_leave_group_dialog_message">Are you sure you want to leave this group?</string>
+    <string name="activity_home_leaving_group_failed_message">"Couldn\'t leave group"</string>
     <string name="activity_home_delete_conversation_dialog_message">Are you sure you want to delete this conversation?</string>
     <string name="activity_home_conversation_deleted_message">Conversation deleted</string>
-    <string name="fragment_contact_selection_contacts_title">Contacts</string>
-    <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
-    <string name="fragment_contact_selection_open_groups_title">Open Groups</string>
+
     <string name="sheet_pn_mode_title">Push Notifications</string>
     <string name="sheet_pn_mode_explanation">Session now features two ways to handle push notifications. Make sure to read the descriptions carefully before you choose.</string>
     <string name="sheet_pn_mode_fcm_option_title">Firebase Cloud Messaging</string>
-    <string name="sheet_pn_mode_fcm_option_explanation">Session will use the Firebase Cloud Messaging service to receive push notifications. You’ll be notified of new messages reliably and immediately. Using FCM means that this device will communicate directly with Google’s servers to retrieve push notifications, which will expose your IP address to Google. Your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.</string>
+    <string name="sheet_pn_mode_fcm_option_explanation">Session will use the Firebase Cloud Messaging service to receive push notifications. You\’ll be notified of new messages reliably and immediately. Using FCM means that this device will communicate directly with Google\’s servers to retrieve push notifications, which will expose your IP address to Google. Your messages will still be onion-routed and end-to-end encrypted, so the contents of your messages will remain completely private.</string>
     <string name="sheet_pn_mode_background_polling_option_title">Background Polling</string>
     <string name="sheet_pn_mode_background_polling_option_explanation">Session will occasionally check for new messages in the background. This guarantees full privacy protection, but message notifications may be significantly delayed.</string>
     <string name="sheet_pn_mode_recommended_option_tag">Recommended</string>
     <string name="sheet_pn_mode_no_option_picked_dialog_title">Please Pick an Option</string>
     <string name="sheet_pn_mode_confirm_button_title">Confirm</string>
     <string name="sheet_pn_mode_skip_button_title">Skip</string>
+
+    <string name="activity_seed_title">Your Recovery Phrase</string>
+    <string name="activity_seed_title_2">Meet your recovery phrase</string>
+    <string name="activity_seed_explanation">Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don\’t give it to anyone. To restore your Session ID, launch Session and tap Continue your Session.</string>
+    <string name="activity_seed_reveal_button_title">Hold to reveal</string>
+
+    <string name="view_seed_reminder_subtitle_1">Secure your account by saving your recovery phrase</string>
+    <string name="view_seed_reminder_subtitle_2">Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID.</string>
+    <string name="view_seed_reminder_subtitle_3">Make sure to store your recovery phrase in a safe place</string>
+
+    <string name="fragment_contact_selection_contacts_title">Contacts</string>
+    <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
+    <string name="fragment_contact_selection_open_groups_title">Open Groups</string>
+
     <string name="preferences_notifications_strategy_category_title">Notification Strategy</string>
     <string name="preferences_notifications_use_fcm_option_title">Use FCM</string>
     <string name="preferences_notifications_use_fcm_option_explanation">Using Firebase Cloud Messaging allows for more reliable push notifications, but exposes your IP to Google.</string>
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 48d287280d..f7180d6ba4 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -105,10 +105,10 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
         val hasViewedSeed = TextSecurePreferences.getHasViewedSeed(this)
         if (!hasViewedSeed && isMasterDevice) {
-            val seedReminderViewTitle = SpannableString("You're almost finished! 80%")
+            val seedReminderViewTitle = SpannableString("You're almost finished! 80%") // Intentionally not yet translated
             seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
             seedReminderView.title = seedReminderViewTitle
-            seedReminderView.subtitle = "Secure your account by saving your recovery phrase"
+            seedReminderView.subtitle = resources.getString(R.string.view_seed_reminder_subtitle_1)
             seedReminderView.setProgress(80, false)
             seedReminderView.delegate = this
         } else {
@@ -313,7 +313,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
                 // Send a leave group message if this is an active closed group
                 if (isClosedGroup && DatabaseFactory.getGroupDatabase(activity).isActive(recipient.address.toGroupString())) {
                     if (!ClosedGroupsProtocol.leaveGroup(activity, recipient)) {
-                        Toast.makeText(activity, "Couldn't leave group", Toast.LENGTH_LONG).show()
+                        Toast.makeText(activity, R.string.activity_home_leaving_group_failed_message, Toast.LENGTH_LONG).show()
                         clearView(activity.recyclerView, viewHolder)
                         return@setPositiveButton
                     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
index e30edcf618..50f2a64b22 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
@@ -34,11 +34,11 @@ class SeedActivity : BaseActionBarActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_seed)
-        supportActionBar!!.title = "Your Recovery Phrase"
-        val seedReminderViewTitle = SpannableString("You're almost finished! 90%")
+        supportActionBar!!.title = resources.getString(R.string.activity_seed_title)
+        val seedReminderViewTitle = SpannableString("You're almost finished! 90%") // Intentionally not yet translated
         seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 24, 27, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         seedReminderView.title = seedReminderViewTitle
-        seedReminderView.subtitle = "Tap and hold the redacted words to reveal your recovery phrase, then store it safely to secure your Session ID."
+        seedReminderView.subtitle = resources.getString(R.string.view_seed_reminder_subtitle_2)
         seedReminderView.setProgress(90, false)
         seedReminderView.hideContinueButton()
         var redactedSeed = seed
@@ -59,10 +59,10 @@ class SeedActivity : BaseActionBarActivity() {
 
     // region Updating
     private fun revealSeed() {
-        val seedReminderViewTitle = SpannableString("Account secured! 100%")
+        val seedReminderViewTitle = SpannableString("Account secured! 100%") // Intentionally not yet translated
         seedReminderViewTitle.setSpan(ForegroundColorSpan(resources.getColorWithID(R.color.accent, theme)), 17, 21, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         seedReminderView.title = seedReminderViewTitle
-        seedReminderView.subtitle = "Make sure to store your recovery phrase in a safe place"
+        seedReminderView.subtitle = resources.getString(R.string.view_seed_reminder_subtitle_3)
         seedReminderView.setProgress(100, true)
         val seedTextViewLayoutParams = seedTextView.layoutParams as LinearLayout.LayoutParams
         seedTextViewLayoutParams.height = seedTextView.height
@@ -79,7 +79,7 @@ class SeedActivity : BaseActionBarActivity() {
         val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText("Seed", seed)
         clipboard.primaryClip = clip
-        Toast.makeText(this, R.string.activity_register_public_key_copied_message, Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
     }
     // endregion
 }
\ No newline at end of file