#5341 When the app language sets to French and OS language sets to Chinese,… #5364
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… the depiction and license both use French language.
|
Would you mind rebasing (or pulling) from the main branch? Thanks! :-) |
|
Yes, finish pulling from main branch |
nicolas-raoul
requested changes
Oct 27, 2023
There was a problem hiding this comment.
Tested, it works great!
There seems to be many unrelated changes, please undo them.
Please remove the logging lines that are not really necessary.
I asked for a few other things, please mark each as resolved when each is done.
Then please refresh this page to review your pull request's code.
Thanks a lot!
data-client/src/main/java/org/wikipedia/language/AcceptLanguageUtil.java
Show resolved
Hide resolved
data-client/src/main/java/org/wikipedia/language/AcceptLanguageUtil.java
Outdated
Show resolved
Hide resolved
app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/fr/free/nrw/commons/upload/structure/depictions/DepictModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
Outdated
Show resolved
Hide resolved
|
I just updated all changes requested now. Ready to review :) |
nicolas-raoul
requested changes
Oct 29, 2023
app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java
Outdated
Show resolved
Hide resolved
|
What is the status of this PR? What changes are required now? |
|
I am so sorry for the delay! @u7452206 I know this is my fault, but would you mind fixing the conflicts? Thanks for your understanding :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description (required)
When the app language sets to French and OS language sets to Chinese，the depiction and license both use app language now. Fixes #5341
What changes did you make and why?
In order to fix License language
In the CommonsApplicationModule.java class and in provideLicenses function,
the purpose of this code to change the application's language settings based on the user's language preference saved in SharedPreferences.
In order to fix depiction language
In the DepictsClient class and byLanguageOrFirstOrEmpty function, beside adding a getSavedLanguage function
The primary use-case for this function is when the application needs to display a label for a specific item. It first tries to display the label in the user's preferred language. If that isn't available, it displays any available label. If none are available, it displays nothing (returns an empty string). The origin code takes the context language from Locale of the phone but not the one from the app ui language.
Above three photos magnifications all presents taking app setting language out.
Tests performed (required)
Tested {ProdDebug} on {Pixel 2} with API level {33}.
Screenshots (for UI changes only)
Need help? See https://support.google.com/android/answer/9075928
Note: Please ensure that you have read CONTRIBUTING.md if this is your first pull request.