Merge branch 'main' into account-delete

app/src/main/java/fr/free/nrw/commons/coordinates/CoordinateEditHelper.kt

@@ -61,16 +61,16 @@ class CoordinateEditHelper @Inject constructor(
     /**
      * Replaces new coordinates
      * @param media to be added
-     * @param Latitude to be added
+     * @param latitude to be added
-     * @param Longitude to be added
+     * @param longitude to be added
-     * @param Accuracy to be added
+     * @param accuracy to be added
      * @return Observable<Boolean>
      */
     private fun addCoordinates(
         media: Media,
-        Latitude: String,
+        latitude: String,
-        Longitude: String,
+        longitude: String,
-        Accuracy: String
+        accuracy: String
     ): Observable<Boolean>? {
         Timber.d("thread is coordinates adding %s", Thread.currentThread().getName())
         val summary = "Adding Coordinates"
@@ -83,9 +83,9 @@ class CoordinateEditHelper @Inject constructor(
                 .blockingGet()
         }
 
-        if (Latitude != null) {
+        if (latitude != null) {
-            buffer.append("\n{{Location|").append(Latitude).append("|").append(Longitude)
+            buffer.append("\n{{Location|").append(latitude).append("|").append(longitude)
-                .append("|").append(Accuracy).append("}}")
+                .append("|").append(accuracy).append("}}")
         }
 
         val editedLocation = buffer.toString()
@@ -141,7 +141,7 @@ class CoordinateEditHelper @Inject constructor(
      * @param media to be added
      * @param latitude to be added
      * @param longitude to be added
-     * @param Accuracy to be added
+     * @param accuracy to be added
      * @param result to be added
      * @return boolean
      */
@@ -150,7 +150,7 @@ class CoordinateEditHelper @Inject constructor(
         media: Media,
         latitude: String,
         longitude: String,
-        Accuracy: String,
+        accuracy: String,
         result: Boolean
     ): Boolean {
         val message: String
@@ -160,7 +160,7 @@ class CoordinateEditHelper @Inject constructor(
             media.coordinates = fr.free.nrw.commons.location.LatLng(
                 latitude.toDouble(),
                 longitude.toDouble(),
-                Accuracy.toFloat()
+                accuracy.toFloat()
             )
             title += ": " + context.getString(R.string.coordinates_edit_helper_show_edit_title_success)
             val coordinatesInMessage = StringBuilder()

app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.kt

@@ -40,10 +40,10 @@ class QuizChecker @Inject constructor(
 
     private val compositeDisposable = CompositeDisposable()
 
-    private val UPLOAD_COUNT_THRESHOLD = 5
+    private val uploadCountThreshold = 5
-    private val REVERT_PERCENTAGE_FOR_MESSAGE = "50%"
+    private val revertPercentageForMessage = "50%"
-    private val REVERT_SHARED_PREFERENCE = "revertCount"
+    private val revertSharedPreference = "revertCount"
-    private val UPLOAD_SHARED_PREFERENCE = "uploadCount"
+    private val uploadSharedPreference = "uploadCount"
 
     /**
      * Initializes quiz check by calculating revert parameters and showing quiz if necessary
@@ -80,12 +80,12 @@ class QuizChecker @Inject constructor(
      */
     private fun setTotalUploadCount(uploadCount: Int) {
         totalUploadCount = uploadCount - revertKvStore.getInt(
-            UPLOAD_SHARED_PREFERENCE,
+            uploadSharedPreference,
             0
         )
         if (totalUploadCount < 0) {
             totalUploadCount = 0
-            revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, 0)
+            revertKvStore.putInt(uploadSharedPreference, 0)
         }
         isUploadCountFetched = true
     }
@@ -112,10 +112,10 @@ class QuizChecker @Inject constructor(
      * @param revertCountFetched Count of deleted uploads
      */
     private fun setRevertParameter(revertCountFetched: Int) {
-        revertCount = revertCountFetched - revertKvStore.getInt(REVERT_SHARED_PREFERENCE, 0)
+        revertCount = revertCountFetched - revertKvStore.getInt(revertSharedPreference, 0)
         if (revertCount < 0) {
             revertCount = 0
-            revertKvStore.putInt(REVERT_SHARED_PREFERENCE, 0)
+            revertKvStore.putInt(revertSharedPreference, 0)
         }
         isRevertCountFetched = true
     }
@@ -128,13 +128,13 @@ class QuizChecker @Inject constructor(
         setRevertCount()
 
         if (revertCount < 0 || totalUploadCount < 0) {
-            revertKvStore.putInt(REVERT_SHARED_PREFERENCE, 0)
+            revertKvStore.putInt(revertSharedPreference, 0)
-            revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, 0)
+            revertKvStore.putInt(uploadSharedPreference, 0)
             return
         }
 
         if (isRevertCountFetched && isUploadCountFetched &&
-            totalUploadCount >= UPLOAD_COUNT_THRESHOLD &&
+            totalUploadCount >= uploadCountThreshold &&
             (revertCount * 100) / totalUploadCount >= 50
         ) {
             callQuiz(activity)
@@ -149,7 +149,7 @@ class QuizChecker @Inject constructor(
         DialogUtil.showAlertDialog(
             activity,
             activity.getString(R.string.quiz),
-            activity.getString(R.string.quiz_alert_message, REVERT_PERCENTAGE_FOR_MESSAGE),
+            activity.getString(R.string.quiz_alert_message, revertPercentageForMessage),
             activity.getString(R.string.about_translate_proceed),
             activity.getString(android.R.string.cancel),
             { startQuizActivity(activity) },
@@ -161,11 +161,11 @@ class QuizChecker @Inject constructor(
      * Starts the quiz activity and updates preferences for revert and upload counts
      */
     private fun startQuizActivity(activity: Activity) {
-        val newRevertSharedPrefs = revertCount + revertKvStore.getInt(REVERT_SHARED_PREFERENCE, 0)
+        val newRevertSharedPrefs = revertCount + revertKvStore.getInt(revertSharedPreference, 0)
-        revertKvStore.putInt(REVERT_SHARED_PREFERENCE, newRevertSharedPrefs)
+        revertKvStore.putInt(revertSharedPreference, newRevertSharedPrefs)
 
-        val newUploadCount = totalUploadCount + revertKvStore.getInt(UPLOAD_SHARED_PREFERENCE, 0)
+        val newUploadCount = totalUploadCount + revertKvStore.getInt(uploadSharedPreference, 0)
-        revertKvStore.putInt(UPLOAD_SHARED_PREFERENCE, newUploadCount)
+        revertKvStore.putInt(uploadSharedPreference, newUploadCount)
 
         val intent = Intent(activity, WelcomeActivity::class.java).apply {
             putExtra("isQuiz", true)

app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.kt

@@ -30,8 +30,8 @@ import fr.free.nrw.commons.contributions.MainActivity
 class QuizResultActivity : AppCompatActivity() {
 
     private var binding: ActivityQuizResultBinding? = null
-    private val NUMBER_OF_QUESTIONS = 5
+    private val numberOfQuestions = 5
-    private val MULTIPLIER_TO_GET_PERCENTAGE = 20
+    private val multiplierToGetPercentage = 20
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -67,9 +67,9 @@ class QuizResultActivity : AppCompatActivity() {
      */
     @SuppressLint("StringFormatInvalid", "SetTextI18n")
     fun setScore(score: Int) {
-        val scorePercent = score * MULTIPLIER_TO_GET_PERCENTAGE
+        val scorePercent = score * multiplierToGetPercentage
         binding?.resultProgressBar?.progress = scorePercent
-        binding?.tvResultProgress?.text = "$score / $NUMBER_OF_QUESTIONS"
+        binding?.tvResultProgress?.text = "$score / $numberOfQuestions"
         val message = resources.getString(R.string.congratulatory_message_quiz, "$scorePercent%")
         binding?.congratulatoryMessage?.text = message
     }

app/src/main/res/values-ar/strings.xml

@@ -875,4 +875,6 @@
   <string name="usages_on_commons_heading">كومنز</string>
   <string name="usages_on_other_wikis_heading">مواقع ويكي أخرى</string>
   <string name="file_usages_container_heading">حالات استخدام الملف</string>
+  <string name="caption">الشرح</string>
+  <string name="caption_copied_to_clipboard">تم نسخ التسمية التوضيحية إلى الحافظة</string>
 </resources>

app/src/main/res/values-bn/strings.xml

@@ -529,4 +529,6 @@
   <string name="uploads">আপলোড</string>
   <string name="pending">অমীমাংসিত</string>
   <string name="failed">ব্যর্থ হয়েছে</string>
+  <string name="caption">ক্যাপশন</string>
+  <string name="caption_copied_to_clipboard">ক্যাপশন ক্লিপবোর্ডে অনুলিপি করা হয়েছে</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -814,4 +814,6 @@
   <string name="usages_on_other_wikis_heading">Andre wikier</string>
   <string name="bullet_point">•</string>
   <string name="file_usages_container_heading">Filanvendelser</string>
+  <string name="caption">Billedtekst</string>
+  <string name="caption_copied_to_clipboard">Billedtekst kopieret til udklipsholder</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -32,6 +32,7 @@
 * Orikrin1998
 * Paraboule
 * Patrick Star
+* Pols12
 * Robins7
 * Sherbrooke
 * SleaY
@@ -852,4 +853,6 @@
   <string name="usages_on_other_wikis_heading">Autres wikis</string>
   <string name="bullet_point">•</string>
   <string name="file_usages_container_heading">Utilisations du fichier</string>
+  <string name="caption">Légende</string>
+  <string name="caption_copied_to_clipboard">Légende copiée dans le presse-papier</string>
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -358,4 +358,5 @@
   <string name="custom_selector_delete_folder">फ़ोल्डर हटाएँ</string>
   <string name="custom_selector_delete">हटाएँ</string>
   <string name="custom_selector_cancel">रद्द करें</string>
+  <string name="caption">कैप्शन</string>
 </resources>

app/src/main/res/values-it/strings.xml

@@ -773,4 +773,6 @@
   <string name="usages_on_commons_heading">Commons</string>
   <string name="usages_on_other_wikis_heading">Altri wiki</string>
   <string name="file_usages_container_heading">Utilizzi del file</string>
+  <string name="caption">Didascalia</string>
+  <string name="caption_copied_to_clipboard">Didascalia copiata negli appunti</string>
 </resources>

app/src/main/res/values-lb/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Authors:
+* GilPe
 * Les Meloures
 * Robby
 * Soued031
@@ -532,4 +533,6 @@
   <string name="error_while_loading">Feeler beim Lueden</string>
   <string name="usages_on_commons_heading">Commons</string>
   <string name="usages_on_other_wikis_heading">Aner Wikien</string>
+  <string name="caption">Beschrëftung</string>
+  <string name="caption_copied_to_clipboard">Text an den Tëschespäicher kopéiert</string>
 </resources>

app/src/main/res/values-mk/strings.xml

@@ -810,4 +810,6 @@
   <string name="usages_on_other_wikis_heading">Други викија</string>
   <string name="bullet_point">•</string>
   <string name="file_usages_container_heading">Употреби на податотеката</string>
+  <string name="caption">Толкување</string>
+  <string name="caption_copied_to_clipboard">Толкувањето е ставено во меѓускладот</string>
 </resources>

app/src/main/res/values-pa/strings.xml

@@ -160,7 +160,7 @@
   <string name="navigation_item_upload">ਚੜ੍ਹਾਉ</string>
   <string name="navigation_item_nearby">ਨੇੜੇ-ਤੇੜੇ</string>
   <string name="navigation_item_about">ਬਾਰੇ</string>
-  <string name="navigation_item_settings">ਸੈਟਿੰਗਾਂ</string>
+  <string name="navigation_item_settings">ਤਰਜੀਹਾਂ</string>
   <string name="navigation_item_feedback">ਸੁਝਾਅ</string>
   <string name="navigation_item_logout">ਬਾਹਰ ਆਉ</string>
   <string name="navigation_item_info">ਸਿਖਲਾਈ</string>

app/src/main/res/values-pms/strings.xml

@@ -806,4 +806,6 @@
   <string name="usages_on_other_wikis_heading">Àutre wiki</string>
   <string name="bullet_point">•</string>
   <string name="file_usages_container_heading">Usagi dl\'archivi</string>
+  <string name="caption">Legenda</string>
+  <string name="caption_copied_to_clipboard">Legenda copià an sla taulëtta</string>
 </resources>

app/src/main/res/values-se/strings.xml

@@ -217,6 +217,7 @@
   <string name="next">Čuovvovaš</string>
   <string name="title_page_bookmarks_pictures">Govat</string>
   <string name="title_page_bookmarks_locations">Sajit</string>
+  <string name="title_page_bookmarks_categories">Kategoriijat</string>
   <string name="provider_bookmarks">Girjemearkkat</string>
   <string name="provider_bookmarks_location">Girjemearkkat</string>
   <string name="no_categories_selected">Ii oktage kategoriija leat válljejuvvon</string>

app/src/main/res/values-skr/strings.xml

@@ -277,4 +277,5 @@
   <string name="custom_selector_delete">مٹاؤ</string>
   <string name="custom_selector_cancel">منسوخ</string>
   <string name="usages_on_commons_heading">کامنز</string>
+  <string name="caption">عنوان</string>
 </resources>

app/src/main/res/values-sr/strings.xml

@@ -743,4 +743,6 @@
   <string name="failed">Није успело</string>
   <string name="green_pin">Ово место већ има слику</string>
   <string name="grey_pin">Проверавање да ли ово место има слику.</string>
+  <string name="caption">Поднапис</string>
+  <string name="caption_copied_to_clipboard">Поднапис копиран</string>
 </resources>