feat: do not show the changelogtranslation prompt in English (#3862)

Co-authored-by: VaiTon <eyadlorenzo@gmail.com>
openfoodfacts · Mar 3, 2021 · b9d5fd1 · b9d5fd1
1 parent 87b4bd7
commit b9d5fd1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/...src/main/java/openfoodfacts/github/scrachx/openfood/features/changelog/ChangelogDialog.kt b/...src/main/java/openfoodfacts/github/scrachx/openfood/features/changelog/ChangelogDialog.kt
@@ -9,6 +9,7 @@ import android.view.WindowManager
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.pm.PackageInfoCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -21,6 +22,7 @@ import openfoodfacts.github.scrachx.openfood.customtabs.CustomTabActivityHelper
 import openfoodfacts.github.scrachx.openfood.customtabs.CustomTabsHelper
 import openfoodfacts.github.scrachx.openfood.customtabs.WebViewFallback
 import openfoodfacts.github.scrachx.openfood.utils.LocaleHelper.getLocaleFromContext
+import java.util.Locale
 
 class ChangelogDialog : DialogFragment(R.layout.fragment_changelog) {
 
@@ -86,9 +88,14 @@ class ChangelogDialog : DialogFragment(R.layout.fragment_changelog) {
     }
 
     private fun setupTranslationHelpLabel() {
-        val language = getLocaleFromContext(context).displayLanguage
-        translationHelpLabel.text = getString(R.string.changelog_translation_help, language)
-        translationHelpLabel.setOnClickListener { openDailyFoodFacts() }
+        val locale = getLocaleFromContext(context)
+        if (locale.language.startsWith(Locale.ENGLISH.language)) {
+            translationHelpLabel.isVisible = false
+        } else {
+            translationHelpLabel.text = getString(R.string.changelog_translation_help, locale.displayLanguage)
+            translationHelpLabel.isVisible = true
+            translationHelpLabel.setOnClickListener { openDailyFoodFacts() }
+        }
     }
 
     private fun applyWindowTweaks() {

diff --git a/app/src/main/res/layout/fragment_changelog.xml b/app/src/main/res/layout/fragment_changelog.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
     <TextView
@@ -32,10 +32,12 @@
         android:clickable="true"
         android:focusable="true"
         android:gravity="center"
-        tools:text="@string/changelog_translation_help"
         android:textColor="?android:textColorLink"
         android:textSize="@dimen/font_normal"
-        android:textStyle="normal" />
+        android:textStyle="normal"
+        android:visibility="gone"
+        tools:text="@string/changelog_translation_help"
+        tools:visibility="visible" />
 
     <Button
         android:id="@+id/changelog_button_close"
@@ -46,4 +48,4 @@
         android:layout_margin="@dimen/padding_normal"
         android:background="@drawable/rounded_button"
         android:text="@string/got_it" />
-</LinearLayout>
+</LinearLayout>