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 #3844: Combine chapter listing double string to one string #4903

Conversation

kkmurerwa
Copy link
Collaborator

@kkmurerwa kkmurerwa commented Mar 16, 2023

Explanation

Fix #3844: When merged, this PR will;

  • Remove the R.plurals.chapter_count_with_story_name from the strings file.
  • Remove all translations of the R.plurals.chapter_count_with_story_name.
  • Delete the computeStoryNameChapterCountContainerContentDescription() method from StorySummaryViewModel which is no longer used.

The approach to delete the above files was necessitated by a change made on PR #4441. The PR switched from a chapter-based progress system i.e. Chapter 1 of 10 to a percentage-based progress system. This made the chapter_count_with_story_name strings and the computeStoryNameChapterCountContainerContentDescription() method used to generate the chapter-based progress text redundant. These have been removed to eliminate this redundancy.

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

@BenHenning
Copy link
Sponsor Member

@kkmurerwa is this ready for review? If so, you should "PTAL @<reviewer_name>" in order to kick-off the review process.

@kkmurerwa
Copy link
Collaborator Author

@BenHenning it is ready for review. I hesitated to assign it to you because I assumed it automatically does it once you send a PR. Let me do that right now.

@kkmurerwa
Copy link
Collaborator Author

PTAL @BenHenning

Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @kkmurerwa! This looks really solid. Just had a few questions on clean-up, thoroughness, and testing--PTAL.

@BenHenning BenHenning assigned kkmurerwa and unassigned BenHenning Mar 30, 2023
@kkmurerwa
Copy link
Collaborator Author

Hey @BenHenning. I am working on the issues you've identified. I will request for a review once that is done.

@kkmurerwa
Copy link
Collaborator Author

kkmurerwa commented Mar 31, 2023

Hey @BenHenning. I have deleted the required files and updated the PR comment.

@kkmurerwa
Copy link
Collaborator Author

PTAL @BenHenning

@oppiabot oppiabot bot assigned BenHenning and unassigned kkmurerwa Mar 31, 2023
@oppiabot
Copy link

oppiabot bot commented Mar 31, 2023

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

Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @kkmurerwa! Just had one follow-up comment, but can you also update your PR description to reference the PR that originally removed the reference to computeStoryNameChapterCountContainerContentDescription? That will help contextualize the "why this approach is correct" aspect of a clear PR description.

app/src/main/res/values-ar/strings.xml Show resolved Hide resolved
app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved
@BenHenning BenHenning assigned kkmurerwa and unassigned BenHenning Mar 31, 2023
@kkmurerwa
Copy link
Collaborator Author

@BenHenning I have updated the PR comment. Please let me know if it is better now.

@kkmurerwa
Copy link
Collaborator Author

PTAL @BenHenning

@oppiabot oppiabot bot unassigned kkmurerwa Apr 3, 2023
@oppiabot
Copy link

oppiabot bot commented Apr 3, 2023

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

@BenHenning BenHenning assigned kkmurerwa and unassigned BenHenning Apr 4, 2023
@BenHenning
Copy link
Sponsor Member

Thanks @kkmurerwa. I followed up on the open comment--PTAL.

@BenHenning BenHenning self-assigned this Apr 6, 2023
Copy link
Sponsor Member

@BenHenning BenHenning left a comment

Choose a reason for hiding this comment

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

Thanks @kkmurerwa. This LGTM! I'll enable auto-merge so that you can merge this once CI checks are passing and your comment is resolved.

@BenHenning BenHenning enabled auto-merge (squash) April 11, 2023 02:50
@BenHenning BenHenning removed their assignment Apr 11, 2023
@oppiabot oppiabot bot added the PR: LGTM label Apr 11, 2023
@oppiabot
Copy link

oppiabot bot commented Apr 11, 2023

Hi @kkmurerwa, 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!

@kkmurerwa
Copy link
Collaborator Author

Hi @BenHenning. I'll mark the remaining unresolved comment as resolved once all the checks pass. Thanks.

@BenHenning BenHenning merged commit 4a14b41 into oppia:develop Apr 11, 2023
36 checks passed
@kkmurerwa kkmurerwa deleted the combine-chapter-listing-double-string-to-one-string branch May 10, 2023 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

Chapter listings combine two strings rather than require a single string translation
2 participants