Merge master (#3196)

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Localisation updates from https://translatewiki.net.

* Mapped values-en-gb to values-en-rGB (#3161)

Fixes "Error: Invalid resource directory name" bug.

* Localisation updates from https://translatewiki.net.

* Removes the "Other" deletion option mentioned in #3174 (#3183)

* Localisation updates from https://translatewiki.net.

* Renamed resource file to prevent build from failing (#3189)

* Localisation updates from https://translatewiki.net.

* Removed some jargon/slang from strings.xml (#3162)

* Localisation updates from https://translatewiki.net.

* solve issue Avoid 'form movements' in the login screen #1107 (#2936)

* Disabled review buttons while an image is being loaded (#3185)

* Disabled review buttons while an image is being loaded

* Added javadocs for the new methods

* Fix build

Author: maskaravivek

app/src/main/java/fr/free/nrw/commons/delete/DeleteHelper.java

@@ -154,19 +154,17 @@ public void askReasonAndExecute(Media media,
         boolean[] checkedItems = {false, false, false, false};
         ArrayList<Integer> mUserReason = new ArrayList<>();
 
-        String[] reasonList = {"Reason 1", "Reason 2", "Reason 3", "Reason 4"};
+        String[] reasonList = {"Reason 1", "Reason 2", "Reason 3"};
 
 
         if (problem == ReviewController.DeleteReason.SPAM) {
             reasonList[0] = context.getString(R.string.delete_helper_ask_spam_selfie);
             reasonList[1] = context.getString(R.string.delete_helper_ask_spam_blurry);
             reasonList[2] = context.getString(R.string.delete_helper_ask_spam_nonsense);
-            reasonList[3] = context.getString(R.string.delete_helper_ask_spam_other);
         } else if (problem == ReviewController.DeleteReason.COPYRIGHT_VIOLATION) {
             reasonList[0] = context.getString(R.string.delete_helper_ask_reason_copyright_press_photo);
             reasonList[1] = context.getString(R.string.delete_helper_ask_reason_copyright_internet_photo);
             reasonList[2] = context.getString(R.string.delete_helper_ask_reason_copyright_logo);
-            reasonList[3] = context.getString(R.string.delete_helper_ask_reason_copyright_other);
         }
 
         alert.setMultiChoiceItems(reasonList, checkedItems, (dialogInterface, position, isChecked) -> {

app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java

@@ -120,7 +120,10 @@ protected void onCreate(Bundle savedInstanceState) {
             runRandomizer(); //Run randomizer whenever everything is ready so that a first random image will be added
         }
 
-        btnSkipImage.setOnClickListener(view -> runRandomizer());
+        btnSkipImage.setOnClickListener(view -> {
+            reviewPagerAdapter.disableButtons();
+            runRandomizer();
+        });
 
         btnSkipImage.setOnTouchListener((view, event) -> {
             if (event.getAction() == MotionEvent.ACTION_UP && event.getRawX() >= (
@@ -142,6 +145,7 @@ public boolean runRandomizer() {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(media -> {
                     if (media != null) {
+                        reviewPagerAdapter.disableButtons();
                         updateImage(media);
                     }
                 }));
@@ -169,6 +173,7 @@ private void updateImage(Media media) {
                     String caption = String.format(getString(R.string.review_is_uploaded_by), fileName, revision.getUser());
                     imageCaption.setText(caption);
                     progressBar.setVisibility(View.GONE);
+                    reviewPagerAdapter.enableButtons();
                 }));
         reviewPager.setCurrentItem(0);
     }

app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java

@@ -81,6 +81,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                         .reviewController.reportSpam(requireActivity(), getReviewCallback()));
                 break;
             case COPYRIGHT:
+                enableButtons();
                 question = getString(R.string.review_copyright);
                 explanation = getString(R.string.review_copyright_explanation);
                 yesButtonText = getString(R.string.review_copyright_yes_button_text);
@@ -90,6 +91,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                         .reportPossibleCopyRightViolation(requireActivity(), getReviewCallback()));
                 break;
             case CATEGORY:
+                enableButtons();
                 question = getString(R.string.review_category);
                 explanation = updateCategoriesQuestion();
                 yesButtonText = getString(R.string.review_category_yes_button_text);
@@ -102,6 +104,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 });
                 break;
             case THANKS:
+                enableButtons();
                 question = getString(R.string.review_thanks);
                 explanation = getString(R.string.review_thanks_explanation, getReviewActivity().reviewController.firstRevision.getUser());
                 yesButtonText = getString(R.string.review_thanks_yes_button_text);
@@ -114,6 +117,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                 });
                 break;
             default:
+                enableButtons();
                 question = "How did we get here?";
                 explanation = "No idea.";
                 yesButtonText = "yes";
@@ -142,6 +146,28 @@ public void onFailure() {
         };
     }
 
+    /**
+     * This function is called when an image has
+     * been loaded to enable the review buttons.
+     */
+    public void enableButtons() {
+        yesButton.setEnabled(true);
+        yesButton.setAlpha(1);
+        noButton.setEnabled(true);
+        noButton.setAlpha(1);
+    }
+
+    /**
+     * This function is called when an image is being loaded
+     * to disable the review buttons
+     */
+    public void disableButtons() {
+        yesButton.setEnabled(false);
+        yesButton.setAlpha(0.5f);
+        noButton.setEnabled(false);
+        noButton.setAlpha(0.5f);
+    }
+
     @OnClick(R.id.button_no)
     void onNoButtonClicked() {
         getReviewActivity().swipeToNext();

app/src/main/java/fr/free/nrw/commons/review/ReviewPagerAdapter.java

@@ -34,6 +34,26 @@ void updateFileInformation() {
         }
     }
 
+    /**
+     * This function is called when an image has
+     * been loaded to enable the review buttons.
+     */
+    public void enableButtons() {
+        if (reviewImageFragments != null){
+            reviewImageFragments[0].enableButtons();
+        }
+    }
+
+    /**
+     * This function is called when an image is being loaded
+     * to disable the review buttons
+     */
+    public void disableButtons() {
+        if (reviewImageFragments != null){
+            reviewImageFragments[0].disableButtons();
+        }
+    }
+
     @Override
     public Fragment getItem(int position) {
         Bundle bundle = new Bundle();

app/src/main/res/layout/activity_login.xml

@@ -1,4 +1,4 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -252,4 +252,4 @@
 
     </RelativeLayout>
 
-</ScrollView>
+</LinearLayout>

app/src/main/res/layout/fragment_review_image.xml

@@ -58,6 +58,8 @@
       android:layout_margin="@dimen/activity_margin_horizontal"
       android:background="@android:color/transparent"
       android:text="@string/yes"
+      android:enabled="false"
+      android:alpha="0.5"
       android:textAllCaps="true"
       android:textAlignment="center"
       android:textColor="@color/yes_button_color"/>
@@ -68,6 +70,8 @@
       android:layout_width="0dp"
       android:layout_height="48dp"
       android:layout_weight="1"
+      android:enabled="false"
+      android:alpha="0.5"
       android:layout_margin="@dimen/activity_margin_horizontal"
       android:background="@android:color/transparent"
       android:text="@string/no"

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

@@ -332,7 +332,7 @@
   <string name="search_tab_title_categories">تصنيفات</string>
   <string name="explore_tab_title_featured">متميز</string>
   <string name="explore_tab_title_mobile">تم الرفع عبر المحمول</string>
-  <string name="successful_wikidata_edit">تمت إضافة الصورة بنجاح إلى %1$s في ويكي بيانات!</string>
+  <string name="successful_wikidata_edit" fuzzy="true">تمت إضافة الصورة بنجاح إلى %1$s في ويكي بيانات!</string>
   <string name="wikidata_edit_failure">فشل في تحديث كيان ويكي بيانات المقابل!</string>
   <string name="menu_set_wallpaper">تعيين كخلفية</string>
   <string name="wallpaper_set_successfully">تم تعيين خلفية بنجاح!</string>
@@ -458,7 +458,7 @@
   <string name="check_category_edit_summary">جارٍ طلب التحقق من التصنيف</string>
   <string name="check_category_success_title">تم طلب التحقق من التصنيف</string>
   <string name="check_category_failure_title">طلب التحقق من التصنيف لم ينجح</string>
-  <string name="check_category_success_message">تم طلب التحقق بنجاح من التصنيف %1$s</string>
+  <string name="check_category_success_message" fuzzy="true">تم طلب التحقق بنجاح من التصنيف %1$s</string>
   <string name="check_category_failure_message">لا يمكن طلب التحقق من التصنيف %1$s</string>
   <string name="check_category_toast">جارٍ طلب التحقق من التصنيف %1$s</string>
   <string name="nominate_for_deletion_edit_file_page">إضافة رسالة حذف إلى الملف</string>
@@ -540,7 +540,7 @@
   <string name="delete_helper_make_deletion_toast">تجري محاولة ترشيح %1$s للحذف</string>
   <string name="delete_helper_show_deletion_title">ترشيح للحذف</string>
   <string name="delete_helper_show_deletion_title_success">نجاح</string>
-  <string name="delete_helper_show_deletion_message_if">تم بنجاح ترشيح %1$s للحذف.</string>
+  <string name="delete_helper_show_deletion_message_if" fuzzy="true">تم بنجاح ترشيح %1$s للحذف.</string>
   <string name="delete_helper_show_deletion_title_failed">فشل</string>
   <string name="delete_helper_show_deletion_message_else">لا يمكن طلب الحذف.</string>
   <string name="delete_helper_ask_spam_selfie">سيلفي</string>

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

@@ -322,7 +322,7 @@
   <string name="search_tab_title_categories">Categoríes</string>
   <string name="explore_tab_title_featured">Destacada</string>
   <string name="explore_tab_title_mobile">Xubío dende\'l móvil</string>
-  <string name="successful_wikidata_edit">Añadióse correutamente la imaxe a %1$s en Wikidata.</string>
+  <string name="successful_wikidata_edit" fuzzy="true">Añadióse correutamente la imaxe a %1$s en Wikidata.</string>
   <string name="wikidata_edit_failure">Nun pudo anovase la entidá de Wikidata correspondiente.</string>
   <string name="menu_set_wallpaper">Poner como fondu</string>
   <string name="wallpaper_set_successfully">Fondu definíu correutamente</string>
@@ -506,7 +506,7 @@
   <string name="delete_helper_make_deletion_toast">Tentando marcar %1$s pal so desaniciu</string>
   <string name="delete_helper_show_deletion_title">Marcando pa desaniciar</string>
   <string name="delete_helper_show_deletion_title_success">Correuto</string>
-  <string name="delete_helper_show_deletion_message_if">Marcóse correutamente %1$s pa desaniciar.</string>
+  <string name="delete_helper_show_deletion_message_if" fuzzy="true">Marcóse correutamente %1$s pa desaniciar.</string>
   <string name="delete_helper_show_deletion_title_failed">Falló</string>
   <string name="delete_helper_show_deletion_message_else">Non pudo pidise\'l desaniciu.</string>
   <string name="delete_helper_ask_spam_selfie">Un autorretratu</string>

app/src/main/res/values-b+sr+Latn/strings.xml

@@ -290,7 +290,7 @@
   <string name="provider_searches">Nedavno pretraženi upiti</string>
   <string name="error_loading_categories">Došlo je do greške pri učitavanju kategorija.</string>
   <string name="error_loading_subcategories">Došlo je do greške pri učitavanju potkategorija.</string>
-  <string name="successful_wikidata_edit">Slika je uspešno dodata u %1$s na Vikipodacima.</string>
+  <string name="successful_wikidata_edit" fuzzy="true">Slika je uspešno dodata u %1$s na Vikipodacima.</string>
   <string name="wikidata_edit_failure">Ažuriranje odgovarajućeg entiteta na Vikipodacima nije uspelo.</string>
   <string name="menu_set_wallpaper">Postavi kao pozadinu</string>
   <string name="wallpaper_set_successfully">Pozadina je uspešno postavljena.</string>

app/src/main/res/values-b+tg+Cyrl/strings.xml

@@ -1,18 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name" fuzzy="true">Анбори Викимедиа</string>
+  <string name="title_activity_explore">Омӯзиш</string>
+  <string name="navigation_item_explore">Омӯзиш</string>
+  <string name="preference_category_appearance">Намуд</string>
   <string name="preference_category_general">Умумӣ</string>
   <string name="preference_category_feedback">Пешниҳод</string>
   <string name="preference_category_privacy">Ҳарими хусусӣ</string>
   <string name="preference_category_location">Мавқеъ</string>
   <string name="menu_settings">Танзимот</string>
   <string name="username">Номи корбар</string>
   <string name="password">Гузарвожа</string>
+  <string name="login_credential">Вурудшавӣ ба ҳисоби Commons Beta</string>
   <string name="login">Вуруд</string>
+  <string name="forgot_password">Гузарвожаро фаромӯш кардед?</string>
+  <string name="signup">Номнависӣ</string>
   <string name="logging_in_title">Дар ҳоли вуруд</string>
   <string name="logging_in_message">Лутфан мунтазир шавед…</string>
   <string name="login_success">Вуруд бо муваффақият!</string>
   <string name="login_failed">Вуруд номуваффақ шуд!</string>
+  <string name="upload_failed">Парванда ёфта нашуд. Лутфан парвандаи дигареро интихоб кунед.</string>
+  <string name="uploading_started">Боркунӣ оғоз шуд.</string>
   <string name="upload_failed_notification_subtitle">Барои дидан нохун занед</string>
   <string name="title_activity_contributions" fuzzy="true">Боргузориҳои ман</string>
   <string name="contribution_state_queued">Дар саф</string>
@@ -36,6 +43,7 @@
   <string name="display_list_button">Рӯйхат</string>
   <string name="categories_activity_title">Гурӯҳҳо</string>
   <string name="title_activity_settings">Танзимот</string>
+  <string name="title_activity_signup">Номнависӣ</string>
   <string name="title_activity_category_details">Гурӯҳ</string>
   <string name="menu_about">Дар бораи</string>
   <string name="title_activity_about">Дар бораи</string>
@@ -103,6 +111,14 @@
   <string name="quiz">Пурсиш</string>
   <string name="question">Савол</string>
   <string name="result">Натиҷа</string>
+  <string name="continue_message">Идома</string>
+  <string name="correct">Ҷавоби дуруст</string>
+  <string name="wrong">Ҷавоби хато</string>
+  <string name="add_description">+ Иловаи тавзеҳот</string>
+  <string name="no_recent_searches">Ҷустаниҳои охире нест</string>
+  <string name="delete_search_dialog">Шумо аниқ мехоҳед ин ҷустаниро ҳазф кунед?</string>
+  <string name="search_history_deleted">Таърихи ҷустуҷӯҳо ҳазф шуд</string>
+  <string name="nominate_delete">Номзад барои ҳазф</string>
   <string name="delete">Ҳазв</string>
   <string name="statistics">Омор</string>
   <string name="level">Сатҳ</string>