From 57bd5789d4ebfa5b566abf0cdf3ee5c1131e1079 Mon Sep 17 00:00:00 2001
From: FlyingP1g FlyingP1g <rukasmail@protonmail.com>
Date: Tue, 12 Jul 2022 17:07:28 +0300
Subject: [PATCH] About menu contribution fixes.

---
 .../briar/android/settings/AboutFragment.java      |  6 +++---
 .../src/main/res/layout/fragment_about.xml         | 14 ++++++++++++--
 briar-android/src/main/res/values/strings.xml      |  3 ++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
index 763279b66..f69c10405 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/AboutFragment.java
@@ -15,7 +15,6 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.BuildConfig;
 import org.briarproject.briar.R;
 
-import java.util.Locale;
 import java.util.logging.Logger;
 
 import androidx.annotation.NonNull;
@@ -26,6 +25,7 @@ import static android.widget.Toast.LENGTH_LONG;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
 import static org.briarproject.bramble.util.LogUtils.logException;
+import static java.util.Locale.*;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -82,8 +82,8 @@ public class AboutFragment extends Fragment {
 						R.string.error_start_activity, LENGTH_LONG).show();
 			}
 		});
-		if (!Locale.getDefault().getLanguage()
-				.equals(Locale.ENGLISH.toString())) {
+		if (!getDefault().getLanguage()
+				.equals(ENGLISH.toString())) {
 			translatedBy.setVisibility(View.VISIBLE);
 			translatedBy.setText(getString(
 					R.string.translated_by,
diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml
index 5a0bcc3d9..f5e8cb203 100644
--- a/briar-android/src/main/res/layout/fragment_about.xml
+++ b/briar-android/src/main/res/layout/fragment_about.xml
@@ -18,9 +18,9 @@
 		android:id="@+id/LinksTitle"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
 		android:text="@string/links"
 		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-		android:layout_marginTop="16dp"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/BriarVersion" />
 
@@ -49,8 +49,18 @@
 		android:layout_marginTop="16dp"
 		android:text="@string/translated_by"
 		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-		android:visibility="invisible"
+		android:visibility="gone"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" />
 
+	<TextView
+		android:id="@+id/TranslatorThanks"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:text="@string/translator_thanks"
+		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/TranslatedBy" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index f1f7bf8d7..f9e3e2f80 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -698,7 +698,8 @@
 	<string name="briar_website">\u2022 <a href="">Briar website</a></string>
 	<string name="briar_source_code">\u2022 <a href="">Briar source code</a></string>
 	<string name="translated_by">Translated by: %s</string>
-	<string name="translator_name">Your name</string>
+	<string name="translator_name">Your name</string> <!-- Here translators can add their names or Transifex usernames -->
+	<string name="translator_thanks">Thanks to all the unlisted contributors in the Localisation Lab</string>
 
 	<!-- Conversation Settings -->
 	<string name="disappearing_messages_title">Disappearing messages</string>