Add a missing comma to a message (#6477 )

There should be a comma before "etc." in a list, and there already is a comma before "etc." in the string depicts_search_text_hint, so it should be in this string to for consistency.
Remove the string SingleWebViewActivity (#6494 )
2025-10-26 04:13:53 +01:00 · 2025-10-14 21:42:09 +09:00 · 2025-10-14 21:41:31 +09:00 · 2025-10-14 21:40:38 +09:00 · 2025-10-14 17:54:54 +09:00
7 changed files with 32 additions and 24 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -57,8 +57,7 @@
    tools:replace="android:appComponentFactory">
    <activity
      android:name=".activity.SingleWebViewActivity"
-      android:exported="false"
-      android:label="@string/title_activity_single_web_view" />
+      android:exported="false" />
    <activity
      android:name=".nearby.WikidataFeedback"
      android:exported="false" />
--- a/app/src/main/res/layout/layout_upload_categories_item.xml
+++ b/app/src/main/res/layout/layout_upload_categories_item.xml
@ -3,6 +3,7 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  xmlns:tools="http://schemas.android.com/tools"
  android:id="@+id/category_layout"
+  android:layoutDirection="locale"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">

@ -10,26 +11,31 @@
    android:id="@+id/upload_category_checkbox"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
+    android:minWidth="48dp"
+    android:minHeight="48dp"
    android:checkMark="?android:attr/textCheckMark"
    android:checked="false"
    android:gravity="center_vertical"
    android:padding="@dimen/tiny_gap"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toStartOf="@+id/category_image"
-    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toTopOf="parent" />

  <com.facebook.drawee.view.SimpleDraweeView
    android:id="@+id/category_image"
    android:layout_width="50dp"
    android:layout_height="50dp"
-    android:paddingEnd="@dimen/tiny_gap"
+    android:layout_marginStart="@dimen/tiny_gap"
+    android:layout_marginEnd="@dimen/tiny_gap"
    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintLeft_toRightOf="@+id/upload_category_checkbox"
+    app:layout_constraintStart_toEndOf="@+id/upload_category_checkbox"
    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintEnd_toStartOf="@+id/text_container"
    app:placeholderImage="@drawable/commons" />

  <LinearLayout
+    android:id="@+id/text_container"
    android:layout_width="0dp"
    android:layout_height="wrap_content"
    android:orientation="vertical"
--- a/app/src/main/res/layout/layout_upload_depicts_item.xml
+++ b/app/src/main/res/layout/layout_upload_depicts_item.xml
@ -2,6 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/depicts_layout"
+  android:layoutDirection="locale"
  android:layout_width="match_parent"
  android:layout_height="wrap_content">

@ -9,26 +10,31 @@
    android:id="@+id/depict_checkbox"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
+    android:minWidth="48dp"
+    android:minHeight="48dp"
    android:checkMark="?android:attr/textCheckMark"
    android:checked="false"
    android:gravity="center_vertical"
    android:padding="@dimen/tiny_gap"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toStartOf="@+id/depicted_image"
-    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toTopOf="parent" />

  <com.facebook.drawee.view.SimpleDraweeView
    android:id="@+id/depicted_image"
    android:layout_width="50dp"
    android:layout_height="50dp"
-    android:paddingRight="@dimen/tiny_gap"
+    android:layout_marginStart="@dimen/tiny_gap"
+    android:layout_marginEnd="@dimen/tiny_gap"
    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintLeft_toRightOf="@+id/depict_checkbox"
+    app:layout_constraintStart_toEndOf="@+id/depict_checkbox"
    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintEnd_toStartOf="@+id/text_container"
    app:placeholderImage="@drawable/ic_wikidata_logo_24dp" />

  <LinearLayout
+    android:id="@+id/text_container"
    android:layout_width="0dp"
    android:layout_height="wrap_content"
    android:orientation="vertical"
@ -41,14 +47,14 @@
      android:id="@+id/depicts_label"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:text="Label"
+      android:text="@string/depicts_label"
      android:textStyle="bold" />

    <TextView
      android:id="@+id/description"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:text="Description" />
+      android:text="@string/depicts_description" />
  </LinearLayout>

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/upload_categories_fragment.xml
+++ b/app/src/main/res/layout/upload_categories_fragment.xml
@ -17,7 +17,6 @@
      android:layout_width="wrap_content"
      android:layout_height="@dimen/half_standard_height"
      android:layout_marginEnd="@dimen/standard_gap"
-      android:layout_marginRight="@dimen/standard_gap"
      android:orientation="horizontal">

      <TextView
@ -25,7 +24,6 @@
        android:layout_width="wrap_content"
        android:layout_height="@dimen/half_standard_height"
        android:layout_marginEnd="@dimen/standard_gap"
-        android:layout_marginRight="@dimen/standard_gap"
        android:gravity="center_vertical"
        android:textSize="@dimen/normal_text"
        android:textStyle="bold"
@ -77,7 +75,6 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginEnd="@dimen/tiny_gap"
-        android:layout_marginRight="@dimen/tiny_gap"
        android:layout_gravity="center_vertical|end"
        android:indeterminate="true"
        android:indeterminateOnly="true"
--- a/app/src/main/res/layout/upload_depicts_fragment.xml
+++ b/app/src/main/res/layout/upload_depicts_fragment.xml
@ -22,7 +22,6 @@
          android:layout_marginEnd="@dimen/standard_gap"
          android:layout_marginRight="@dimen/standard_gap"
          android:layout_alignParentStart="true"
-          android:layout_alignParentLeft="true"
          android:layout_alignParentTop="true"
          android:orientation="horizontal">
            <TextView
@ -30,7 +29,6 @@
              android:layout_width="wrap_content"
              android:layout_height="@dimen/half_standard_height"
              android:layout_marginEnd="@dimen/standard_gap"
-              android:layout_marginRight="@dimen/standard_gap"
              android:gravity="center_vertical"
              android:textSize="@dimen/normal_text"
              android:textStyle="bold"
@ -99,7 +97,6 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginEnd="@dimen/tiny_gap"
-            android:layout_marginRight="@dimen/tiny_gap"
            android:layout_gravity="center_vertical|end"
            android:indeterminate="true"
            android:indeterminateOnly="true"
--- a/app/src/main/res/values-qq/strings.xml
+++ b/app/src/main/res/values-qq/strings.xml
@ -468,6 +468,8 @@
  <string name="map_attribution">{{Optional}}\n&lt;code&gt;&amp;amp;#169;&lt;/code&gt; is the copyright symbol (©).</string>
  <string name="categories_tooltip">{{Doc-commons-app-depicts}}</string>
  <string name="depicts_step_title">{{Doc-commons-app-depicts}}</string>
+  <string name="depicts_label">Label</string>
+  <string name="depicts_description">Description</string>
  <string name="pan_and_zoom_to_adjust">Panning means moving the map left/right/up/down, typically by touching the screen with one finger and moving it.\n\nZooming means making the map\'s scale bigger or smaller, typically by pinching with two fingers.\n\nExample in other app:\nhttps://igss.schneider-electric.com/features/pan-and-zoom-in-definition/</string>
  <string name="location_picker_image_view_shadow">A description of a visual element, location picker image shadow. Used for accesibility usually.</string>
  <string name="label">{{Identical|Label}}</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -619,7 +619,7 @@ Upload your first media by tapping on the add button.</string>
  <string name="place_state_exists">Exists</string>
  <string name="place_state_needs_photo">Needs Photo</string>
  <string name="place_type">Place type:</string>
-  <string name="nearby_search_hint">Bridge, museum, hotel etc.</string>
+  <string name="nearby_search_hint">Bridge, museum, hotel, etc.</string>
  <string name="you_must_reset_your_passsword">Something went wrong with log-in. You must reset your password!</string>
  <string name="title_for_media">MEDIA</string>
  <string name="title_for_child_classes">CHILD CLASSES</string>
@ -710,6 +710,8 @@ Upload your first media by tapping on the add button.</string>
  <string name="categories_tooltip">Please select the appropriate categories. Unlike depictions, categories are only in English.</string>
  <string name="license_tooltip">Commons makes your pictures reusable and adapted by everyone. Do you want to waive all rights? Do you want to be attributed? Do you want adaptations to use the same license?</string>
  <string name="depicts_step_title">Depicts</string>
+  <string name="depicts_label">Label</string>
+  <string name="depicts_description">Description</string>
  <string name="license_step_title">Media License</string>
  <string name="media_detail_step_title">Media Details</string>
  <string name="menu_view_category_page">View category page</string>
@ -825,12 +827,12 @@ Upload your first media by tapping on the add button.</string>
  <string name="invalid_login_message">Your log-in has expired. Please log in again.</string>
  <string name="no_application_available_to_open_gpx_files">No application available to open GPX files</string>
  <string name="file_saved_successfully">File Saved Successfully</string>
-  <string name="do_you_want_to_open_gpx_file">Do you want to open GPX file?</string>
-  <string name="do_you_want_to_open_kml_file">Do you want to open KML file?</string>
-  <string name="failed_to_save_kml_file">Failed to save KML file.</string>
-  <string name="failed_to_save_gpx_file">Failed to save GPX file.</string>
-  <string name="saving_kml_file">Saving KML File</string>
-  <string name="saving_gpx_file">Saving GPX File</string>
+  <string name="do_you_want_to_open_gpx_file">Do you want to open the GPX file?</string>
+  <string name="do_you_want_to_open_kml_file">Do you want to open the KML file?</string>
+  <string name="failed_to_save_kml_file">Failed to save the KML file.</string>
+  <string name="failed_to_save_gpx_file">Failed to save the GPX file.</string>
+  <string name="saving_kml_file">Saving as a KML file...</string>
+  <string name="saving_gpx_file">Saving as a GPX file...</string>
  <plurals name="custom_picker_images_selected_title_appendix">
    <item quantity="one">%d image selected</item>
    <item quantity="other">%d images selected</item>
@ -873,7 +875,6 @@ Upload your first media by tapping on the add button.</string>
  <string name="usages_on_other_wikis_heading">Other wikis</string>
  <string name="bullet_point">•</string>
  <string name="file_usages_container_heading">File usages</string>
-  <string name="title_activity_single_web_view">SingleWebViewActivity</string>
  <string name="account">Account</string>
  <string name="vanish_account">Vanish Account</string>
  <string name="account_vanish_request_confirm_title">Vanish account warning</string>
Author	SHA1	Message	Date
Amir E. Aharoni	61c9de6fcc	Add a missing comma to a message (#6477 ) Some checks are pending Android CI / Run tests and generate APK (push) Waiting to run Details There should be a comma before "etc." in a list, and there already is a comma before "etc." in the string depicts_search_text_hint, so it should be in this string to for consistency.	2025-10-14 21:42:09 +09:00
Amir E. Aharoni	41d95814c9	Remove the string SingleWebViewActivity (#6494 ) Resolves issue #6492. Remove the title of a web activity and the accompanying string resource. This was not a real translatable message, but something that looks more like an identifier that shouldn't be translated. As far as I can tell, it's not seen anywhere in the interface because the actual title is set in the code that calls it.	2025-10-14 21:41:31 +09:00
Amir E. Aharoni	c4cb65fc3c	Improve the grammar of messages about GPX and KML files (#6497 ) Add articles, fix capitalization, add ellipses.	2025-10-14 21:40:38 +09:00
Amir E. Aharoni	a1c5974e93	Fix depicts and categories pickers for RTL languages (#6503 ) This fixes the layouts to work in both left to right (LTR) and right to left (RTL) languages. Also replace two hard-coded strings in the depicts picker with proper string resources. Fixes #6502.	2025-10-14 17:54:54 +09:00