From a1c5974e936c369e099232b8930732d057491e72 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Tue, 14 Oct 2025 04:54:54 -0400 Subject: [PATCH 1/4] 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. --- .../res/layout/layout_upload_categories_item.xml | 12 +++++++++--- .../res/layout/layout_upload_depicts_item.xml | 16 +++++++++++----- .../res/layout/upload_categories_fragment.xml | 3 --- .../main/res/layout/upload_depicts_fragment.xml | 3 --- app/src/main/res/values-qq/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/app/src/main/res/layout/layout_upload_categories_item.xml b/app/src/main/res/layout/layout_upload_categories_item.xml index 1c432ca88..146d55af3 100644 --- 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" /> @@ -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" /> + android:text="@string/depicts_description" /> diff --git a/app/src/main/res/layout/upload_categories_fragment.xml b/app/src/main/res/layout/upload_categories_fragment.xml index 6ded4af87..cd053bce9 100644 --- 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"> {{Optional}}\n<code>&amp;#169;</code> is the copyright symbol (©). {{Doc-commons-app-depicts}} {{Doc-commons-app-depicts}} + Label + Description 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/ A description of a visual element, location picker image shadow. Used for accesibility usually. {{Identical|Label}} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 183c683da..5ae4ca5e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -710,6 +710,8 @@ Upload your first media by tapping on the add button. Please select the appropriate categories. Unlike depictions, categories are only in English. 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? Depicts + Label + Description Media License Media Details View category page From c4cb65fc3c926c9ae854b8eb12e5ad52305c82ce Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Tue, 14 Oct 2025 08:40:38 -0400 Subject: [PATCH 2/4] Improve the grammar of messages about GPX and KML files (#6497) Add articles, fix capitalization, add ellipses. --- app/src/main/res/values/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5ae4ca5e8..05b3ee6f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -827,12 +827,12 @@ Upload your first media by tapping on the add button. Your log-in has expired. Please log in again. No application available to open GPX files File Saved Successfully - Do you want to open GPX file? - Do you want to open KML file? - Failed to save KML file. - Failed to save GPX file. - Saving KML File - Saving GPX File + Do you want to open the GPX file? + Do you want to open the KML file? + Failed to save the KML file. + Failed to save the GPX file. + Saving as a KML file... + Saving as a GPX file... %d image selected %d images selected From 41d95814c94e2fe8e08dc9e4e2646e5981ef0dd1 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Tue, 14 Oct 2025 08:41:31 -0400 Subject: [PATCH 3/4] 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. --- app/src/main/AndroidManifest.xml | 3 +-- app/src/main/res/values/strings.xml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e8215bd90..d83d645dd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,8 +57,7 @@ tools:replace="android:appComponentFactory"> + android:exported="false" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05b3ee6f0..d193b9aa2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -875,7 +875,6 @@ Upload your first media by tapping on the add button. Other wikis • File usages - SingleWebViewActivity Account Vanish Account Vanish account warning From 61c9de6fcc444596c890880b64568beb4ab0a93a Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Tue, 14 Oct 2025 08:42:09 -0400 Subject: [PATCH 4/4] 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. --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d193b9aa2..064b197e4 100644 --- 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. Exists Needs Photo Place type: - Bridge, museum, hotel etc. + Bridge, museum, hotel, etc. Something went wrong with log-in. You must reset your password! MEDIA CHILD CLASSES