Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Localisation updates from https://translatewiki.net. #5172

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Localisation updates from https://translatewiki.net. #5172

merged 2 commits into from
Oct 6, 2023

Conversation

translatewiki
Copy link
Member

Translation updates

@translatewiki translatewiki requested a review from a team as a code owner October 2, 2023 11:17
@adhiamboperes
Copy link
Collaborator

adhiamboperes commented Oct 3, 2023 •
edited
Loading

Hi @seanlip, there are two portuguese strings that still need to be manually updated, could you PTAL?

Script check failure:

2 consistency error(s) were found for BRAZILIAN_PORTUGUESE strings (file: app/src/main/res/values-pt-rBR/strings.xml):
- string unsupported_app_version_dialog_message: original translation uses 1 line(s) but translation uses 3 line(s). Please remove any extra lines or add any that are missing.
- string unsupported_app_version_dialog_close_button_text: original translation uses 1 line(s) but translation uses 3 line(s). Please remove any extra lines or add any that are missing.

@seanlip
Copy link
Member

seanlip commented Oct 3, 2023

@adhiamboperes I have updated both on Translatewiki. Please let me know if there are any more. Thanks!

@seanlip seanlip assigned adhiamboperes and unassigned seanlip Oct 3, 2023
@adhiamboperes
Copy link
Collaborator

@adhiamboperes I have updated both on Translatewiki. Please let me know if there are any more. Thanks!

Thanks, Translatewiki has pushed the fixes. Everything looks good now.

@adhiamboperes
Copy link
Collaborator

@seanlip, could you please update the branch and merge? I do not have write authorization for this branch.

@oppiabot oppiabot bot added the PR: LGTM label Oct 6, 2023
@oppiabot
Copy link

oppiabot bot commented Oct 6, 2023

Hi @translatewiki, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks!

@seanlip seanlip enabled auto-merge (squash) October 6, 2023 13:44
@seanlip
Copy link
Member

seanlip commented Oct 6, 2023

@adhiamboperes done, thanks! Updated and set it to auto-merge.

@seanlip seanlip assigned adhiamboperes and unassigned seanlip and translatewiki Oct 6, 2023
@seanlip seanlip merged commit 1902946 into develop Oct 6, 2023
36 checks passed
@theMr17 theMr17 mentioned this pull request Oct 16, 2023
Merged
6 tasks
adhiamboperes added a commit that referenced this pull request Dec 5, 2023
@theMr17 @adhiamboperes
Fix: #5186: MissingDefaultResource + AppCompatCustomView + FragmentTa…
5075c54 
…gUsage (#5191)

<!-- READ ME FIRST: Please fill in the explanation section below and
check off every point from the Essential Checklist! -->
## Explanation
<!--
- Explain what your PR does. If this PR fixes an existing bug, please
include
- "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
issue
  - when this PR is merged.
  -->

Fixes #5186 [part of #5169]

1. `MissingDefaultResource` has been fixed already by
#5172. It had issues with
these plurals:
-
[minutes_ago](https://github.com/oppia/oppia-android/blob/e060e2ff265ce35c92f1b969f6d7ad002d1a62ad/app/src/main/res/values/strings.xml#L456)
-
[hours_ago](https://github.com/oppia/oppia-android/blob/e060e2ff265ce35c92f1b969f6d7ad002d1a62ad/app/src/main/res/values/strings.xml#L461C18-L461C27)
-
[days_ago](https://github.com/oppia/oppia-android/blob/e060e2ff265ce35c92f1b969f6d7ad002d1a62ad/app/src/main/res/values/strings.xml#L465C18-L465C26)

3. For `AppCompatCustomView`, it is fixed by replacing the Normal views
with AppCompat views

4. `<fragment/>` tags are replaced with
`<androidx.fragment.app.FragmentContainerView/>`, with some changes in
the NavigationDrawerFragment to ensure that binding has been initialized
before it is accessed.

## Screen Recording

https://github.com/oppia/oppia-android/assets/84731134/3a340cff-70a4-4e77-a1a3-e5b7a8c71a6e



## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [x] The PR title and explanation each start with "Fix #bugnum: " (If
this PR fixes part of an issue, prefix the title with "Fix part of
#bugnum: ...".)
- [x] Any changes to
[scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
files have their rationale included in the PR explanation.
- [x] The PR follows the [style
guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
- [x] The PR does not contain any unnecessary code changes from Android
Studio
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
- [x] The PR is made from a branch that's **not** called "develop" and
is up-to-date with "develop".
- [x] The PR is **assigned** to the appropriate reviewers
([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).
<br>

---------

Co-authored-by: Adhiambo Peres <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adhiamboperes adhiamboperes adhiamboperes approved these changes

Assignees

@adhiamboperes adhiamboperes

Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@translatewiki @adhiamboperes @seanlip