| Summary: | drakx keyboard mapping table contains invalid 'srp' Xkb layout | ||
|---|---|---|---|
| Product: | Mageia | Reporter: | Martin Whitaker <mageia> |
| Component: | RPM Packages | Assignee: | Mageia tools maintainers <mageiatools> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | Normal | CC: | marja11 |
| Version: | Cauldron | ||
| Target Milestone: | --- | ||
| Hardware: | All | ||
| OS: | Linux | ||
| Whiteboard: | MGA6TOO | ||
| Source RPM: | drakx-kbd-mouse-x11-1.23-1.mga6.src.rpm | CVE: | |
| Status comment: | |||
|
Description
Martin Whitaker
2017-12-09 10:57:40 CET
(In reply to Martin Whitaker from comment #0) > It appears that, sometime in the past, the Xkb layout name has changed from > 'srp' to 'rs'. > > Both the 'srp' and 'yu' entries in the keyboard::keyboards table are > affected. Thanks, Martin. I don't understand '"srp,srp",' in line 289 here http://gitweb.mageia.org/software/drakx-kbd-mouse-x11/tree/lib/keyboard.pm#n289 Is it OK to replace that with '"rs",' ? Assignee:
bugsquad =>
mageiatools (In reply to Marja van Waes from comment #1) > I don't understand '"srp,srp",' in line 289 here > http://gitweb.mageia.org/software/drakx-kbd-mouse-x11/tree/lib/keyboard.pm#n289 > > Is it OK to replace that with '"rs",' ? IIRC, this means there are two alternative layouts. The next column (Xkb variant) should contain the same number of comma-separated identifiers. So the two alternatives here are srp+basic and srp+latin. So I think it needs to be "rs,rs". (In reply to Martin Whitaker from comment #2) > (In reply to Marja van Waes from comment #1) > > I don't understand '"srp,srp",' in line 289 here > > http://gitweb.mageia.org/software/drakx-kbd-mouse-x11/tree/lib/keyboard.pm#n289 > > > > Is it OK to replace that with '"rs",' ? > > IIRC, this means there are two alternative layouts. The next column (Xkb > variant) should contain the same number of comma-separated identifiers. So > the two alternatives here are srp+basic and srp+latin. So I think it needs > to be "rs,rs". Oops, you're right, I had forgotten about dual and triple layouts. Thanks :-) commit e36bd9001abe7219f9382477aadc43326b6cc005
Author: Marja van Waes <marja@...>
Date: Sun Dec 10 20:34:05 2017 +0100
Correct Serbian and Yugoslavian xkb symbols file (martinw, mga#22157)
---
Commit Link:
http://gitweb.mageia.org/software/drakx-kbd-mouse-x11/commit/?id=e36bd9001abe7219f9382477aadc43326b6cc005
I only committed for cauldron, didn't branch for Mageia 6, didn't tag for new release. I'll do that when I'm less tired (I'm too frightened to make mistakes now), or someone else will do it. The translation catalogue won't need to be touched if the Mageia 6 branch is started from this commit: http://gitweb.mageia.org/software/drakx-kbd-mouse-x11/commit/?id=35ef1b79b91a3df0c8cf84ee779e82725d904372 And for Cauldron, at this point it isn't a disaster if French users see their keyboard names in English Mageia 6 is EOL, so we can mark this as fixed. Thanks Marja. Status:
NEW =>
RESOLVED |