fix: Redo move templates#9822
Merged
mikeharv merged 5 commits intoRaspberryPiFoundation:v13from May 7, 2026
Merged
Conversation
maribethb
approved these changes
May 7, 2026
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
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.
The basics
The details
Resolves
Fixes #9801 and #9803
Proposed Changes
This adds punctation and capital letters where needed to Toast text and ARIA live region announcement messages. This makes things more readable, especially when multiple messages are coalesced.
This also changes the basic structure of block move announcement templates in the following ways:
"%1 of %2"message helper was defined to facilitate this.Block and input labels in move announcements are now more terse; omitting the "type" part of each field's label.
The heavy function
computeMoveLabelwas refactored to use a couple of newly introduced helpers.Reason for Changes
The aria-live region now coalesces messages together when required, however, the messages lack punctuation, and when they are concatenated, the screen outputs one long sentence with varying levels of sense.
Example: "moving on workspace" is appended to the move mode hint but no full stop separates these two distinct sentences so they are no longer distinct.
(Without changes...)

Feedback also suggests it's confusing to use the same "inside"/"around" terminology for both statement inputs (when moving inside a container block or wrapping a container block around other blocks) and value inputs. Those labels are now reserved for the former case with the more general "to" being used for all horizontal connections.
Test Coverage
Existing tests were updated to reflect the new expected strings.
Additional Information
Note that this doesn't fully resolve #9803 as there is still open question about handling disambiguation of inputs with identical labels.
This branch is based on #9817. That PR can be closed without merging if this one is accepted first.