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.

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

Fix #5034: Fix XML tags in translations and remove unnecessary quotation marks in CDATA strings. #5041

Merged
merged 1 commit into from
Jun 9, 2023

Conversation

seanlip
Copy link
Member

@seanlip seanlip commented Jun 9, 2023

Explanation

Fix #5034: This PR fixes #5034 by updating the translations in Arabic, PT-BR and Swahili. The corresponding translations have also been updated in translatewiki and should come in on the next push.

This PR also removes some unnecessary quotation marks in CDATA tags in the English translations file.

Essential Checklist

  • 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: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop".
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

English Portuguese Naija Arabic
Screenshot_1686305486 Screenshot_1686305545 Screenshot_1686305597 Screenshot_1686304904
Landscape LTR Landscape RTL
Screenshot_1686305730 Screenshot_1686305706

@seanlip seanlip requested a review from a team as a code owner June 9, 2023 09:37
@seanlip seanlip requested a review from adhiamboperes June 9, 2023 09:37
@BenHenning BenHenning added the PR: Cherrypick requested Indicates that a PR is being requested for being cherrypicked into the ongoing release branch. label Jun 9, 2023
@BenHenning BenHenning removed their assignment Jun 9, 2023
Copy link
Collaborator

@adhiamboperes adhiamboperes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM.

@oppiabot
Copy link

oppiabot bot commented Jun 9, 2023

Unassigning @adhiamboperes since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Jun 9, 2023
@oppiabot
Copy link

oppiabot bot commented Jun 9, 2023

Hi @seanlip, 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 merged commit a9819e8 into develop Jun 9, 2023
@seanlip seanlip deleted the fix-translations branch June 9, 2023 10:59
adhiamboperes pushed a commit to adhiamboperes/oppia-android that referenced this pull request Jun 9, 2023
…uotation marks in CDATA strings. (oppia#5041)

## Explanation

Fix oppia#5034: This PR fixes oppia#5034 by updating the translations in Arabic,
PT-BR and Swahili. The corresponding translations have also been updated
in translatewiki and should come in on the next push.

This PR also removes some unnecessary quotation marks in CDATA tags in
the English translations file.

## 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)).

## For UI-specific PRs only
| English | Portuguese |  Naija | Arabic |
|---|---|---|---|

|![Screenshot_1686305486](https://github.com/oppia/oppia-android/assets/59600948/116716a4-d4b9-481a-8fbf-16fa36129dee)|![Screenshot_1686305545](https://github.com/oppia/oppia-android/assets/59600948/1a5ce5aa-af69-42dc-8cef-53785611d736)|![Screenshot_1686305597](https://github.com/oppia/oppia-android/assets/59600948/1034b244-635f-46e9-863a-dc90ccf67b0a)|![Screenshot_1686304904](https://github.com/oppia/oppia-android/assets/59600948/d2a10404-d2c9-45e7-9b6a-f38442eb3bdd)|

| Landscape LTR | Landscape RTL |
|---|---|

|![Screenshot_1686305730](https://github.com/oppia/oppia-android/assets/59600948/7a85ae43-9faa-4bb9-9957-ae1f6e3d2d4a)|![Screenshot_1686305706](https://github.com/oppia/oppia-android/assets/59600948/f4a09c1d-4094-418f-8e83-6796f1c026d0)|
@adhiamboperes adhiamboperes added the PR: Cherrypick completed Indicates a cherrypick request was approved & completed for a PR. label Jun 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Cherrypick completed Indicates a cherrypick request was approved & completed for a PR. PR: Cherrypick requested Indicates that a PR is being requested for being cherrypicked into the ongoing release branch. PR: LGTM
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG]: Bullet lists aren't showing in FAQs for all non-English languages
3 participants