Merge branch 'main' into Search-dynamic

Author: Williamrai

app/src/fdroid/java/org/wikipedia/donate/GooglePayComponent.kt

@@ -4,11 +4,13 @@ import android.app.Activity
 import android.content.Intent
 
 object GooglePayComponent {
+    const val CURRENCY_FALLBACK = "USD"
+
     suspend fun isGooglePayAvailable(activity: Activity): Boolean {
         return false
     }
 
-    fun getDonateActivityIntent(activity: Activity, campaignId: String? = null, donateUrl: String? = null): Intent {
+    fun getDonateActivityIntent(activity: Activity, campaignId: String? = null, donateUrl: String? = null, filledAmount: Float = 0f): Intent {
         return Intent()
     }
 }

app/src/main/java/org/wikipedia/descriptions/DescriptionEditUtil.kt

@@ -1,5 +1,6 @@
 package org.wikipedia.descriptions
 
+import org.wikipedia.language.AppLanguageLookUpTable
 import org.wikipedia.page.Page
 
 object DescriptionEditUtil {
@@ -8,7 +9,7 @@ object DescriptionEditUtil {
     private const val DESCRIPTION_SOURCE_WIKIDATA = "central"
 
     fun wikiUsesLocalDescriptions(lang: String): Boolean {
-        return lang == "en" || lang == "test"
+        return lang == "en" || lang.startsWith(AppLanguageLookUpTable.TEST_LANGUAGE_CODE)
     }
 
     fun isEditAllowed(page: Page): Boolean {

app/src/main/java/org/wikipedia/donate/donationreminder/DonationReminderViewModel.kt

@@ -106,7 +106,7 @@ class DonationReminderViewModel(savedStateHandle: SavedStateHandle) : ViewModel(
         val optionItems = options.map {
             OptionItem.Preset(it, context.resources.getQuantityString(R.plurals.donation_reminders_text_articles,
                 it, it))
-        } + OptionItem.Custom()
+        } + OptionItem.Custom(context.getString(R.string.donation_reminders_settings_option_custom))
 
         val selectedValue = if (Prefs.donationReminderConfig.articleFrequency <= 0) options.first()
         else Prefs.donationReminderConfig.articleFrequency
@@ -139,10 +139,11 @@ class DonationReminderViewModel(savedStateHandle: SavedStateHandle) : ViewModel(
             }
         }
 
+        val context = WikipediaApp.instance
         val presets = DonationReminderHelper.currencyAmountPresets[currentCountryCode] ?: listOf(minimumAmount)
         val options = presets.map {
             OptionItem.Preset(it, DonateUtil.currencyFormat.format(it).replace(formatRegex, ""))
-        } + OptionItem.Custom()
+        } + OptionItem.Custom(context.getString(R.string.donation_reminders_settings_option_custom))
 
         val selectedValue = if (Prefs.donationReminderConfig.donateAmount <= 0f) presets.first()
         else Prefs.donationReminderConfig.donateAmount
@@ -182,7 +183,7 @@ data class DonationReminderUiState(
 
 sealed class OptionItem<T : Number>(val displayText: String) {
     data class Preset<T : Number>(val value: T, val text: String) : OptionItem<T>(text)
-    class Custom<T : Number> : OptionItem<T>("Custom...")
+    class Custom<T : Number>(val text: String) : OptionItem<T>(text)
 }
 
 data class SelectableOption<T : Number>(

app/src/main/java/org/wikipedia/language/AppLanguageState.kt

@@ -58,7 +58,7 @@ class AppLanguageState(context: Context) {
                 }
             }
             if (!Prefs.isShowDeveloperSettingsEnabled && !ReleaseUtil.isPreBetaRelease) {
-                codes.remove(AppLanguageLookUpTable.TEST_LANGUAGE_CODE)
+                codes.removeAll { it.startsWith(AppLanguageLookUpTable.TEST_LANGUAGE_CODE) }
             }
             if (!Prefs.isShowDeveloperSettingsEnabled) {
                 codes.remove(AppLanguageLookUpTable.TRADITIONAL_CHINESE_LANGUAGE_CODE)

app/src/main/java/org/wikipedia/language/LanguageUtil.kt

@@ -109,7 +109,7 @@ object LanguageUtil {
     }
 
     fun convertToUselangIfNeeded(languageCode: String): String {
-        return if (languageCode == "test") "uselang" else languageCode
+        return if (languageCode.startsWith(AppLanguageLookUpTable.TEST_LANGUAGE_CODE)) "uselang" else languageCode
     }
 
     fun formatLangCodeForButton(languageCode: String): String {

app/src/main/java/org/wikipedia/staticdata/ContributionsNameData.kt

@@ -259,6 +259,7 @@ object ContributionsNameData {
             "pt" to "Contribuições",
             "pwn" to "使用者貢獻",
             "qu" to "Rurasqakuna",
+            "rki" to "Contributions",
             "rm" to "Beiträge",
             "rmy" to "Contribuții",
             "rn" to "Contributions",
@@ -357,5 +358,6 @@ object ContributionsNameData {
             "zh-yue" to "貢獻",
             "zu" to "Contributions",
             "test" to "Contributions",
+            "test2" to "Contributions",
     )
 }

app/src/main/java/org/wikipedia/staticdata/FileAliasData.kt

@@ -259,6 +259,7 @@ object FileAliasData {
             "pt" to "Ficheiro",
             "pwn" to "sineqetj a vecik",
             "qu" to "Rikcha",
+            "rki" to "ဖိုင်",
             "rm" to "Datoteca",
             "rmy" to "Chitro",
             "rn" to "Dosiye",
@@ -357,5 +358,6 @@ object FileAliasData {
             "zh-yue" to "File",
             "zu" to "File",
             "test" to "File",
+            "test2" to "File",
     )
 }

app/src/main/java/org/wikipedia/staticdata/MainPageNameData.kt

@@ -259,6 +259,7 @@ object MainPageNameData {
             "pt" to "Wikipédia:Página principal",
             "pwn" to "sitjumaq na sapitj",
             "qu" to "Qhapaq p'anqa",
+            "rki" to "အဓိကစာမျက်နှာ",
             "rm" to "Wikipedia:Pagina principala",
             "rmy" to "Sherutni patrin",
             "rn" to "Urupapuro nyamukuru",
@@ -357,5 +358,6 @@ object MainPageNameData {
             "zh-yue" to "頭版",
             "zu" to "Ikhasi Elikhulu",
             "test" to "Main Page",
+            "test2" to "Main Page",
     )
 }

app/src/main/java/org/wikipedia/staticdata/SpecialAliasData.kt

@@ -259,6 +259,7 @@ object SpecialAliasData {
             "pt" to "Especial",
             "pwn" to "pinakisumaljiyan",
             "qu" to "Sapaq",
+            "rki" to "အထူး",
             "rm" to "Spezial",
             "rmy" to "Uzalutno",
             "rn" to "Vyisangije",
@@ -357,5 +358,6 @@ object SpecialAliasData {
             "zh-yue" to "Special",
             "zu" to "Special",
             "test" to "Special",
+            "test2" to "Special",
     )
 }

app/src/main/java/org/wikipedia/staticdata/TalkAliasData.kt

@@ -259,6 +259,7 @@ object TalkAliasData {
             "pt" to "Discussão",
             "pwn" to "kakaljavaran",
             "qu" to "Rimanakuy",
+            "rki" to "ဆွီးနွီးချက်",
             "rm" to "Discussiun",
             "rmy" to "Vakyarimata",
             "rn" to "Ikiyago",
@@ -357,5 +358,6 @@ object TalkAliasData {
             "zh-yue" to "Talk",
             "zu" to "Talk",
             "test" to "Talk",
+            "test2" to "Talk",
     )
 }