Compare commits

...

5 commits

Author SHA1 Message Date
Amir E. Aharoni
7be615bacb
Fix comma splice in a translatable string (#6465)
Some checks are pending
Android CI / Run tests and generate APK (push) Waiting to run
2025-10-10 23:46:17 +09:00
Amir E. Aharoni
95d58023c7
Fix punctuation in the string download_failed_we_cannot_download_the_file_without_storage_permission (#6473)
The double exclamation point is really unnecessary.
2025-10-10 23:26:30 +09:00
Amir E. Aharoni
7b8fbc239b
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.
2025-10-10 23:25:46 +09:00
Amir E. Aharoni
30d1107cef
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".
2025-10-10 23:05:19 +09:00
Amir E. Aharoni
fe16c44caa
Change Android "OK" string to app's own localization (#6471)
Addressed one instance described in #6470.
2025-10-10 22:40:00 +10:00
3 changed files with 5 additions and 22 deletions

View file

@ -153,21 +153,7 @@ after opening the app.
} }
} }
setUpPager() 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() checkAndResumeStuckUploads()
} }
} }

View file

@ -70,7 +70,7 @@ class MediaLicenseFragment : UploadBaseFragment(), MediaLicenseContract.View {
requireActivity(), requireActivity(),
getString(R.string.license_step_title), getString(R.string.license_step_title),
getString(R.string.license_tooltip), getString(R.string.license_tooltip),
getString(android.R.string.ok), getString(R.string.ok),
null null
) )
} }

View file

@ -462,7 +462,7 @@ Upload your first media by tapping on the add button.</string>
<string name="never_ask_again">Never ask this again</string> <string name="never_ask_again">Never ask this again</string>
<string name="display_location_permission_title">Ask for location permission</string> <string name="display_location_permission_title">Ask for location permission</string>
<string name="display_location_permission_explanation">Ask for location permission when needed for nearby notification card view feature.</string> <string name="display_location_permission_explanation">Ask for location permission when needed for nearby notification card view feature.</string>
<string name="achievements_fetch_failed">Something went wrong, We could not fetch achievements</string> <string name="achievements_fetch_failed">Something went wrong, and we could not fetch achievements</string>
<string name="achievements_fetch_failed_ultimate_achievement">You\'ve made so many contributions our achievements calculation system can\'t cope. This is the ultimate achievement.</string> <string name="achievements_fetch_failed_ultimate_achievement">You\'ve made so many contributions our achievements calculation system can\'t cope. This is the ultimate achievement.</string>
<string name="ends_on">Ends on:</string> <string name="ends_on">Ends on:</string>
<string name="display_campaigns">Display campaigns</string> <string name="display_campaigns">Display campaigns</string>
@ -538,7 +538,7 @@ Upload your first media by tapping on the add button.</string>
<string name="welcome_do_upload_content_description">Examples of good images to upload to Commons</string> <string name="welcome_do_upload_content_description">Examples of good images to upload to Commons</string>
<string name="welcome_dont_upload_content_description">Examples of images not to upload</string> <string name="welcome_dont_upload_content_description">Examples of images not to upload</string>
<string name="skip_image">Skip this image</string> <string name="skip_image">Skip this image</string>
<string name="download_failed_we_cannot_download_the_file_without_storage_permission">Download Failed!!. We cannot download the file without external storage permission.</string> <string name="download_failed_we_cannot_download_the_file_without_storage_permission">Download failed. We cannot download the file without external storage permission.</string>
<string name="manage_exif_tags">Manage EXIF Tags</string> <string name="manage_exif_tags">Manage EXIF Tags</string>
<string name="manage_exif_tags_summary">Select which EXIF tags to keep in uploads</string> <string name="manage_exif_tags_summary">Select which EXIF tags to keep in uploads</string>
@ -551,9 +551,6 @@ Upload your first media by tapping on the add button.</string>
<string name="exif_tag_name_serialNumbers">Serial Numbers</string> <string name="exif_tag_name_serialNumbers">Serial Numbers</string>
<string name="exif_tag_name_software">Software</string> <string name="exif_tag_name_software">Software</string>
<string name="media_location_permission_denied">Media location access denied</string>
<string name="add_location_manually">We may not be able to automatically obtain location data from pictures you upload. Please add the appropriate location for each picture before submitting</string>
<string name="share_text">Upload photos to Wikimedia Commons directly from your phone. Download the Commons App now: %1$s</string> <string name="share_text">Upload photos to Wikimedia Commons directly from your phone. Download the Commons App now: %1$s</string>
<string name="share_via">Share app via...</string> <string name="share_via">Share app via...</string>
<string name="image_info">Image Info</string> <string name="image_info">Image Info</string>
@ -671,7 +668,7 @@ Upload your first media by tapping on the add button.</string>
<string name="wikipedia_instructions_step_5">5. Paste the wikitext in the appropriate place.</string> <string name="wikipedia_instructions_step_5">5. Paste the wikitext in the appropriate place.</string>
<string name="wikipedia_instructions_step_6">6. Edit the wikitext for appropriate positioning, if necessary. For more information, see &lt;a href="https://en.wikipedia.org/wiki/Wikipedia:Manual_of_Style/Images#How_to_place_an_image"&gt;here&lt;/a&gt;.</string> <string name="wikipedia_instructions_step_6">6. Edit the wikitext for appropriate positioning, if necessary. For more information, see &lt;a href="https://en.wikipedia.org/wiki/Wikipedia:Manual_of_Style/Images#How_to_place_an_image"&gt;here&lt;/a&gt;.</string>
<string name="wikipedia_instructions_step_7">7. Publish the article</string> <string name="wikipedia_instructions_step_7">7. Publish the article</string>
<string name="copy_wikicode_to_clipboard">Copy wikicode to clipboard</string> <string name="copy_wikicode_to_clipboard">Copy wikitext to clipboard</string>
<string name="pause">pause</string> <string name="pause">pause</string>
<string name="resume">resume</string> <string name="resume">resume</string>
<string name="paused">Paused</string> <string name="paused">Paused</string>