From e9a1af0f528067d87b3fa2e6e61ff2b0fec11cef Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 3 Oct 2025 21:43:10 -0400 Subject: [PATCH 1/3] Change hardcoded strings in the language search dialog to messages (#6440) Another comment: While working on this, I also noticed that "Recent Searches" is hardcoded in the XML file, and I'm not sure where does it actually appear. I fixed it, too, but perhaps it can be completely removed. Fixes #6439. --- app/src/main/res/layout/dialog_select_language.xml | 6 +++--- app/src/main/res/values-qq/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/layout/dialog_select_language.xml b/app/src/main/res/layout/dialog_select_language.xml index b63d3ceac..6fa70dcdb 100644 --- a/app/src/main/res/layout/dialog_select_language.xml +++ b/app/src/main/res/layout/dialog_select_language.xml @@ -12,7 +12,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" - android:hint="Type Language Name" + android:hint="@string/language_search_type_language_name" android:padding="12dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -22,7 +22,7 @@ android:id="@+id/recent_searches" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="Recent Searches" + android:text="@string/language_search_recent_searches" app:layout_constraintTop_toBottomOf="@id/search_language" app:layout_constraintEnd_toEndOf="@+id/language_history_list" android:layout_marginEnd="8dp" @@ -55,7 +55,7 @@ android:id="@+id/all_languages" android:layout_width="0dp" android:layout_height="wrap_content" - android:text="All Languages" + android:text="@string/language_search_all_languages" app:layout_constraintTop_toBottomOf="@id/separator" app:layout_constraintEnd_toEndOf="@+id/language_history_list" android:layout_margin="8dp" diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml index 09d73b6fb..dc0ae6a07 100644 --- a/app/src/main/res/values-qq/strings.xml +++ b/app/src/main/res/values-qq/strings.xml @@ -97,6 +97,9 @@ Message shown on contribution list during non-first sync if no uploads present. Menu item text prompting user to retry a failed upload.\n{{Identical|Retry}} Menu item text prompting user to cancel and delete a failed upload.\n{{Identical|Cancel}} + Placeholder text in the top search box in the language search dialog. + A title in the language search dialog. + A title in the language search dialog. Menu item text prompting user to download a selected photo or media file locally.\n{{Identical|Download}} {{Identical|License}} This is a button text. Concise wording is preferred (e.g. \"&\" instead of \"and\"), where possible. It should ideally be rendered in one line, even on small devices. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6447f552a..785d7cbef 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -150,6 +150,9 @@ You have not yet uploaded any photos. Retry Cancel + Type Language Name + Recent Searches + All Languages By submitting this picture, I declare that this is my own work, that it does not contain copyrighted material or selfies, and otherwise adheres to <a href=\"https://commons.wikimedia.org/wiki/Commons:Policies_and_guidelines\">Wikimedia Commons policies</a>. Download Default License From 71ad6a2ce51b251a41a996a1950e2bdf57e44474 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 3 Oct 2025 21:43:54 -0400 Subject: [PATCH 2/3] Change hardcoded preferences strings to translatable messages (#6443) --- app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/preferences.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 785d7cbef..50e031fa6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -464,6 +464,8 @@ Upload your first media by tapping on the add button. Ends on: Display campaigns See the ongoing campaigns + Show deletion button + Enable the \"Delete Folder\" button in the custom picker Allow the app to fetch location in case the camera does not record it. Some device cameras do not record location. In such cases, letting the app fetch and attach location to it makes your contribution more useful. You may change this any time from the Settings Allow Dismiss diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index fb3cb0ca1..c79ebc4d6 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -55,8 +55,8 @@ android:defaultValue="false" android:key="displayDeletionButton" app:singleLineTitle="false" - android:summary="Enable the "Delete folder" button in the custom picker" - android:title="Show Deletion Button" /> + android:summary="@string/show_deletion_button_explanation" + android:title="@string/show_deletion_button" /> From ed7007fc8c41d099171c8e57510e4fbe2cfcf081 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Sat, 4 Oct 2025 01:10:00 -0400 Subject: [PATCH 3/3] Change a hardcoded string to a translatable message (#6444) Follow-up to #6443. Noticed this one after that pull request was already merged. --- app/src/main/res/values-qq/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/preferences.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-qq/strings.xml b/app/src/main/res/values-qq/strings.xml index dc0ae6a07..7cd68db41 100644 --- a/app/src/main/res/values-qq/strings.xml +++ b/app/src/main/res/values-qq/strings.xml @@ -154,6 +154,7 @@ {{Identical|Notification}} {{Identical|Review}} {{Identical/Connection Error}} + A section title in preferences. <u>See webpage for details</u> {{Identical|Skip}} {{Identical|Log in}} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 50e031fa6..4f22abaf7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -269,6 +269,7 @@ Problems found in image Please only upload pictures that you have taken by yourself. Don\'t upload pictures that you have downloaded from the Internet. + Uploads Save In-app shots Save pictures taken with the in-app camera to your device storage Log in to your account diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index c79ebc4d6..3b7604026 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -61,7 +61,7 @@ + android:title="@string/preferences_uploads">