Fix #15760: Convert undo/redo labels to sentence case#20372
Open
flowerjunjie wants to merge 1 commit intoankidroid:mainfrom
Open
Fix #15760: Convert undo/redo labels to sentence case#20372flowerjunjie wants to merge 1 commit intoankidroid:mainfrom
flowerjunjie wants to merge 1 commit intoankidroid:mainfrom
Conversation
This commit implements sentence case conversion for undo/redo labels to maintain consistency with the rest of the UI. Changes: - Added 120+ sentence case string resources for undo/redo actions - Created helper functions in SentenceCase.kt for undo/redo label conversion - Updated ReviewerViewModel.kt to convert undo/redo labels to sentence case - Updated Undo.kt to convert undo/redo messages to sentence case - Updated CardBrowser.kt, DeckPicker.kt, Reviewer.kt, StudyOptionsActivity.kt to use sentence case for undo labels The conversion handles patterns like: - "Undo Empty Cards" → "Undo empty cards" - "Empty Cards undone" → "Empty cards undone" - "Redo Empty Cards" → "Redo empty cards"
david-allison
requested changes
Mar 3, 2026
| * A map of Title Case action names to their sentence case resource IDs. | ||
| * Used for undo/redo label conversion. | ||
| */ | ||
| private val actionToSentenceCaseMap = mapOf( |
Member
There was a problem hiding this comment.
Where did you get these strings from?
Could you add the source to the commit message?
| <string name="sentence_card_stats_previous_card_study">Previous card (study)</string> | ||
| <string name="sentence_actions_previous_card_info">Previous card info</string> | ||
|
|
||
| <!-- Undo/Redo strings - Issue #15760 --> |
Member
There was a problem hiding this comment.
Too much duplication here IMO.
It would be much better to obtain the name of the action from GeneratedTranslations, which would mean this file does not need to be changed.
| import com.ichi2.anki.ui.internationalization.redoneMessageToSentenceCase | ||
|
|
||
| suspend fun tryUndo(): String { | ||
| suspend fun tryUndo(context: Context): String { |
Member
There was a problem hiding this comment.
Context should not be a parameter here, this method should not have a direct Android dependency.
| private suspend fun undo() { | ||
| Timber.v("ReviewerViewModel::undo") | ||
| actionFeedbackFlow.emit(tryUndo()) | ||
| val context = AnkiDroidApp.instance.applicationContext |
Member
There was a problem hiding this comment.
Context should not exist in a ViewModel, it's an Android concern.
david-allison
added
the
Needs Author Reply
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR implements sentence case conversion for undo/redo labels to maintain consistency with the rest of the UI, as requested in #15760.
Changes
Examples
Fixes #15760