From fe16c44caa058d2909487f973032ff37fef4e98a Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 10 Oct 2025 08:40:00 -0400 Subject: [PATCH 1/5] Change Android "OK" string to app's own localization (#6471) Addressed one instance described in #6470. --- .../fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt index 65826a505..a789ef362 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt @@ -70,7 +70,7 @@ class MediaLicenseFragment : UploadBaseFragment(), MediaLicenseContract.View { requireActivity(), getString(R.string.license_step_title), getString(R.string.license_tooltip), - getString(android.R.string.ok), + getString(R.string.ok), null ) } From 30d1107cef1655572aa7c9be3ada51ad20e73331 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 10 Oct 2025 10:05:19 -0400 Subject: [PATCH 2/5] Change "wikicode" to "wikitext" in a message (#6476) The usual English term is "wikitext". "Wikicode" is used in French and perhaps some other language, but English uses "wikitext". --- 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 6e76cd25d..f59400f71 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -671,7 +671,7 @@ Upload your first media by tapping on the add button. 5. Paste the wikitext in the appropriate place. 6. Edit the wikitext for appropriate positioning, if necessary. For more information, see <a href="https://en.wikipedia.org/wiki/Wikipedia:Manual_of_Style/Images#How_to_place_an_image">here</a>. 7. Publish the article - Copy wikicode to clipboard + Copy wikitext to clipboard pause resume Paused From 7b8fbc239bfebbea34b799cf055b68aef22decfa Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 10 Oct 2025 10:25:46 -0400 Subject: [PATCH 3/5] Remove commented out code and associated strings (#6475) As I was documenting undocumented strings (see #6457), I noticed that two messages are only used once in a few lines of code that were commented out in 2023. To clean up the messages, I am removing them from the strings list and deleting the commented-out code. --- .../nrw/commons/contributions/MainActivity.kt | 16 +--------------- app/src/main/res/values/strings.xml | 3 --- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt index 5c2c44ab5..ac7068cc7 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt @@ -153,21 +153,7 @@ after opening the app. } } setUpPager() - /** - * Ask the user for media location access just after login - * so that location in the EXIF metadata of the images shared by the user - * is retained on devices running Android 10 or above - */ -// if (VERSION.SDK_INT >= VERSION_CODES.Q) { -// ActivityCompat.requestPermissions(this, -// new String[]{Manifest.permission.ACCESS_MEDIA_LOCATION}, 0); -// PermissionUtils.checkPermissionsAndPerformAction( -// this, -// () -> {}, -// R.string.media_location_permission_denied, -// R.string.add_location_manually, -// permission.ACCESS_MEDIA_LOCATION); -// } + checkAndResumeStuckUploads() } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f59400f71..46ea36610 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -551,9 +551,6 @@ Upload your first media by tapping on the add button. Serial Numbers Software - Media location access denied - We may not be able to automatically obtain location data from pictures you upload. Please add the appropriate location for each picture before submitting - Upload photos to Wikimedia Commons directly from your phone. Download the Commons App now: %1$s Share app via... Image Info From 95d58023c72066efa008301f87fb561a95d99423 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 10 Oct 2025 10:26:30 -0400 Subject: [PATCH 4/5] Fix punctuation in the string download_failed_we_cannot_download_the_file_without_storage_permission (#6473) The double exclamation point is really unnecessary. --- 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 46ea36610..dde824040 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -538,7 +538,7 @@ Upload your first media by tapping on the add button. Examples of good images to upload to Commons Examples of images not to upload Skip this image - Download Failed!!. We cannot download the file without external storage permission. + Download failed. We cannot download the file without external storage permission. Manage EXIF Tags Select which EXIF tags to keep in uploads From 7be615bacb9df942fda680f4e6834956c13e32f5 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Fri, 10 Oct 2025 10:46:17 -0400 Subject: [PATCH 5/5] Fix comma splice in a translatable string (#6465) --- 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 dde824040..6cf6cef75 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -462,7 +462,7 @@ Upload your first media by tapping on the add button. Never ask this again Ask for location permission Ask for location permission when needed for nearby notification card view feature. - Something went wrong, We could not fetch achievements + Something went wrong, and we could not fetch achievements You\'ve made so many contributions our achievements calculation system can\'t cope. This is the ultimate achievement. Ends on: Display campaigns