From 6ec382cfc4ca52276a086fc26ba2b2d60755313e Mon Sep 17 00:00:00 2001
From: FlyingP1g FlyingP1g <rukasmail@protonmail.com>
Date: Tue, 12 Jul 2022 20:35:53 +0300
Subject: [PATCH] About menu: Thanks to translators redesign

---
 .../briar/android/settings/AboutFragment.java       | 12 ------------
 .../src/main/res/layout/fragment_about.xml          | 13 +------------
 briar-android/src/main/res/values/strings.xml       |  4 +---
 3 files changed, 2 insertions(+), 27 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 41535e22c..bd3d8acb9 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
@@ -25,7 +25,6 @@ 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
@@ -37,7 +36,6 @@ public class AboutFragment extends Fragment {
 	private TextView briarVersion;
 	private TextView briarWebsite;
 	private TextView briarSourceCode;
-	private TextView translatedBy;
 
 	@Nullable
 	@Override
@@ -57,7 +55,6 @@ public class AboutFragment extends Fragment {
 				getString(R.string.briar_version, BuildConfig.VERSION_NAME));
 		briarWebsite = requireActivity().findViewById(R.id.BriarWebsite);
 		briarSourceCode = requireActivity().findViewById(R.id.BriarSourceCode);
-		translatedBy = requireActivity().findViewById(R.id.TranslatedBy);
 		briarWebsite.setOnClickListener(View -> {
 			String url = "https://briarproject.org/";
 			Intent i = new Intent(Intent.ACTION_VIEW);
@@ -82,15 +79,6 @@ public class AboutFragment extends Fragment {
 						R.string.error_start_activity, LENGTH_LONG).show();
 			}
 		});
-		if (!getDefault().getLanguage()
-				.equals(ENGLISH.toString()) &&
-				getString(R.string.translated_by).length() != 0 &&
-				getString(R.string.translator_name).length() != 0) {
-			translatedBy.setVisibility(View.VISIBLE);
-			translatedBy.setText(getString(
-					R.string.translated_by,
-					getString(R.string.translator_name)));
-		}
 	}
 
 }
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/fragment_about.xml b/briar-android/src/main/res/layout/fragment_about.xml
index f5e8cb203..c37d695eb 100644
--- a/briar-android/src/main/res/layout/fragment_about.xml
+++ b/briar-android/src/main/res/layout/fragment_about.xml
@@ -42,17 +42,6 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@+id/BriarWebsite" />
 
-	<TextView
-		android:id="@+id/TranslatedBy"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_marginTop="16dp"
-		android:text="@string/translated_by"
-		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
-		android:visibility="gone"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" />
-
 	<TextView
 		android:id="@+id/TranslatorThanks"
 		android:layout_width="match_parent"
@@ -61,6 +50,6 @@
 		android:text="@string/translator_thanks"
 		android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/TranslatedBy" />
+		app:layout_constraintTop_toBottomOf="@+id/BriarSourceCode" />
 
 </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 7003735d8..8acd87bb9 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -697,9 +697,7 @@
 	<string name="links">Links</string>
 	<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"></string><!--Just translate this: "Translated by: %s" -->
-	<string name="translator_name"></string> <!-- Here translators can add their names or Transifex usernames -->
-	<string name="translator_thanks">Thanks to all the contributors at the Localization Lab</string>
+	<string name="translator_thanks">Thanks to all the contributors at the Localization Lab</string><!-- Here translators can add their names or Transifex usernames(eg "Thanks to all the contributors at the Localization Lab, especially Tom, Matthew and Jerry") -->
 
 	<!-- Conversation Settings -->
 	<string name="disappearing_messages_title">Disappearing messages</string>