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 #4527: FAQ Inappropriate faqs removed #5332

Merged
merged 6 commits into from
Feb 14, 2024

Conversation

Rd4dev
Copy link
Collaborator

@Rd4dev Rd4dev commented Feb 4, 2024

Explanation

Fixes #4527

The design team and the previous PRs addressed various issues and revised the FAQ list. However, @seanlip pointed out in the discussions that the FAQ related to updating mobile numbers or email addresses appears inappropriate.

After verifying with @adhiamboperes and @BenHenning, the initial commit includes removing that specific FAQ

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

@Rd4dev Rd4dev requested a review from a team as a code owner February 4, 2024 20:23
@Rd4dev Rd4dev requested a review from adhiamboperes February 4, 2024 20:23
@Rd4dev
Copy link
Collaborator Author

Rd4dev commented Feb 4, 2024

@adhiamboperes PTAL, Additionally, multiple translation strings are disorganized, for example, In the FAQ questions 1, 2, 6, 7 and 4, 5, 8, 9 are repeated, followed by several other FAQs in the translations. Should this pull request also address those issues? While I may not possess expertise in all languages, I can use Google Translate to address them and include them in this pull request if deemed appropriate.

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.

Thanks for the careful audit @Rd4dev!

About the duplicate translations, I think this was an error caused by translate wiki conflicts in:
#5258 after manual update in: #5247.

I think you could try to fix this, but instead of using google translate, you can find the value of the translation as it originally was in #5247.

To make sure that translate wiki does not overwrite your changes, add the fuzzy=true attribute to the translations that need to be reverified after your changes.

Finally, please edit your PR title to include the issue number.

Copy link

oppiabot bot commented Feb 6, 2024

Unassigning @adhiamboperes since the review is done.

Copy link

oppiabot bot commented Feb 6, 2024

Hi @Rd4dev, it looks like some changes were requested on this pull request by @adhiamboperes. PTAL. Thanks!

@oppiabot oppiabot bot assigned Rd4dev Feb 6, 2024
@Rd4dev Rd4dev changed the title FAQ Inappropriate faqs removed Fix #4527: FAQ Inappropriate faqs removed Feb 6, 2024
@Rd4dev
Copy link
Collaborator Author

Rd4dev commented Feb 8, 2024

Thank you for the reference and guidance, @adhiamboperes. I noticed that the duplicate questions seemed to act as placeholders for the new FAQs introduced through the Translation PR, and unfortunately, these new FAQs don't have translations in the linked FAQ Updation PR.

I tried to translate the new FAQs that were not available, incorporating the rest from the existing translations. If you feel the translations should not have been done, I'll promptly revert the related commits. Alternatively, if it's acceptable, I'll keep them.

Furthermore, I've appended the fuzzy="true" attribute to every translated string and integrated the issue number into the title (Will ensure to consistently include the issue number in the future pull requests). -- PTAL.

@oppiabot oppiabot bot assigned adhiamboperes and unassigned Rd4dev Feb 8, 2024
Copy link

oppiabot bot commented Feb 8, 2024

Unassigning @Rd4dev since a re-review was requested. @Rd4dev, please make sure you have addressed all review comments. Thanks!

@Rd4dev Rd4dev requested a review from adhiamboperes February 9, 2024 06:43
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.

Thanks @Rd4dev. This is quite thorough.

@adhiamboperes adhiamboperes enabled auto-merge (squash) February 14, 2024 08:12
Copy link

oppiabot bot commented Feb 14, 2024

Unassigning @adhiamboperes since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Feb 14, 2024
Copy link

oppiabot bot commented Feb 14, 2024

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

@adhiamboperes adhiamboperes merged commit 30ba44d into oppia:develop Feb 14, 2024
36 checks passed
@adhiamboperes adhiamboperes mentioned this pull request Feb 22, 2024
6 tasks
BenHenning added a commit that referenced this pull request Mar 1, 2024
## Explanation
Renamed FAQ question and answer strings from index-based to more
descriptive qualifiers.
The corresponding translations to the previous strings have been
deleted.
The goal is to to overwrite existing faq strings and re-translate them,
since a number of updates were made in #5246 and #5332.


[device-2024-02-22-030542.webm](https://github.com/oppia/oppia-android/assets/59600948/be9a7cc8-89eb-4a1f-a02f-1466ffb0092f)

## Essential Checklist
<!-- Please tick the relevant boxes by putting an "x" in them. -->
- [ ] 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](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
<!-- Delete these section if this PR does not include UI-related
changes. -->
If your PR includes UI-related changes, then:
- Add screenshots for portrait/landscape for both a tablet & phone of
the before & after UI changes
- For the screenshots above, include both English and pseudo-localized
(RTL) screenshots (see [RTL
guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
- Add a video showing the full UX flow with a screen reader enabled (see
[accessibility
guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
- For PRs introducing new UI elements or color changes, both light and
dark mode screenshots must be included
- Add a screenshot demonstrating that you ran affected Espresso tests
locally & that they're passing

---------

Co-authored-by: Ben Henning <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Improper sentence framing is observed in FAQs
2 participants