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

CLDR-15034 kbd: cherry picks from main #3334

Merged
merged 1 commit into from
Oct 11, 2023

Conversation

srl295
Copy link
Member

@srl295 srl295 commented Oct 11, 2023

Two PRs that were merged to main (45) instead of maint-44.

Asking for a rubber stamp here to keep the branches consistent.

CLDR-15034


- layers/@form > layers/@formId
- key/@flicks > key/@flickId
- key/@switch >  key/@layerId
- key/@to > key/@output
- display/@to > display/@output
  • updates to dtd, samples
  • drop some old data in tests
  • CLDR-17113 kbd display output= and display= should support variables

  • CLDR-17113 kbd shuffle element deck chairs

  • longPress, multiTap now use a new keyList id
  • keyList is a list of keys, has a default key
  • flickSegment now uses a keyId instead of output

This means that each part of longPress, flick, and multiTap can:

  • have a customization
  • perform a layer switch if desired

Also, document.

  • replaces longPressDefault=true

(cherry picked from commit 5f1d298)


  • now supports modifier 'other' if nothing else matches
  • now supports comma-separated lists of modifier sets
  • attribute name "modifier" changed to "modifiers"
  • CLDR-17140 kbd: remove extraneous mention of duplicate keys
  • per review

(cherry picked from commit 286a10b)

CLDR-_____

  • This PR completes the ticket.

ALLOW_MANY_COMMITS=true

Two PRs that were merged to main (45) instead of maint-44

-----

- CLDR-17113 kbd: element/attr renaming (#3313)

* CLDR-17113 kbd: element/attr renaming

- layers/@Form > layers/@formid
- key/@flicks > key/@flickId
- key/@switch >  key/@layerId
- key/@to > key/@output
- display/@to > display/@output

- updates to dtd, samples
- drop some old data in tests

* CLDR-17113 kbd display output= and display= should support variables

* CLDR-17113 kbd shuffle element deck chairs

- longPress, multiTap now use a new keyList id
- keyList is a list of keys, has a default key
- flickSegment now uses a keyId instead of output

This means that each part of longPress, flick, and multiTap can:
- have a <display> customization
- perform a layer switch if desired

Also, document.

* CLDR-17113 kbd: move keyList back into attributes

* CLDR-17113 kbd: add longPressDefaultKeyId

- replaces longPressDefault=true

* CLDR-17113 kbd: no nested gestures

* CLDR-17113 kbd: no nested gestures,2

(cherry picked from commit 5f1d298)

-----

- CLDR-17140 kbd: specify modifier matching (#3314)

* CLDR-17140 kbd: specify modifier matching

* CLDR-17140 kbd: rename modifier= to modifiers=

* CLDR-17140 kbd: modifiers: add 'other' and comma

- now supports modifier 'other' if nothing else matches
- now supports comma-separated lists of modifier sets
- attribute name "modifier" changed to "modifiers"

* CLDR-17140 kbd: remove extraneous mention of duplicate keys

- per review

* CLDR-17140 kbd: modifiers review comments

(cherry picked from commit 286a10b)
@srl295 srl295 requested review from a team October 11, 2023 21:58
@srl295 srl295 self-assigned this Oct 11, 2023
@srl295
Copy link
Member Author

srl295 commented Oct 11, 2023

I'll need to cherry pick #3330 also, which can be a separate PR if that one isn't merged by the time this one's review'd.

@srl295 srl295 merged commit 32a1842 into maint/maint-44 Oct 11, 2023
11 checks passed
@srl295 srl295 deleted the kbd/cldr-15034-cherrypick branch October 11, 2023 22:24
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.

2 participants