mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve utils hotkey handling

Browse source
This commit is contained in:
Mark Grassi 2023-01-28 17:22:04 -05:00 • committed by Christian Boltz
parent e554fe9fd4
commit e188195344
Failed to generate hash of commit
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
utils/apparmor/ui.py
View file

@ -105,16 +105,14 @@ def UI_Important(text):
def get_translated_hotkey(translated, cmsg=''):
msg = 'PromptUser: ' + _('Invalid hotkey for')
# Originally (\S) was used but with translations it would not work :(
if re.search(r'\((\S+)\)', translated):
return re.search(r'\((\S+)\)', translated).groups()[0]
else:
if cmsg:
raise AppArmorException(cmsg)
else:
raise AppArmorException('%s %s' % (msg, translated))
match = re.search(r'\((\S+)\)', translated)
if match:
return match.groups()[0].lower()
if not cmsg:
cmsg = 'PromptUser: %s %s' % (_('Invalid hotkey for'), translated)
raise AppArmorException(cmsg)
def UI_YesNo(text, default):
@ -122,8 +120,8 @@ def UI_YesNo(text, default):
default = default.lower()
yes = CMDS['CMD_YES']
no = CMDS['CMD_NO']
yeskey = get_translated_hotkey(yes).lower()
nokey = get_translated_hotkey(no).lower()
yeskey = get_translated_hotkey(yes)
nokey = get_translated_hotkey(no)
ans = 'XXXINVALIDXXX'
while ans not in ('y', 'n'):
if UI_mode == 'json':
@ -164,9 +162,9 @@ def UI_YesNoCancel(text, default):
no = CMDS['CMD_NO']
cancel = CMDS['CMD_CANCEL']
yeskey = get_translated_hotkey(yes).lower()
nokey = get_translated_hotkey(no).lower()
cancelkey = get_translated_hotkey(cancel).lower()
yeskey = get_translated_hotkey(yes)
nokey = get_translated_hotkey(no)
cancelkey = get_translated_hotkey(cancel)
ans = 'XXXINVALIDXXX'
while ans not in ('c', 'n', 'y'):
@ -401,7 +399,7 @@ class PromptQuestion:
menutext = CMDS[cmd]
key = get_translated_hotkey(menutext).lower()
key = get_translated_hotkey(menutext)
# Duplicate hotkey
if keys.get(key, False):
raise AppArmorException(
@ -420,7 +418,7 @@ class PromptQuestion:
defaulttext = CMDS[default]
defmsg = _('PromptUser: Invalid hotkey in default item')
default_key = get_translated_hotkey(defaulttext, defmsg).lower()
default_key = get_translated_hotkey(defaulttext, defmsg)
if not keys.get(default_key, False):
raise AppArmorException(_('PromptUser: Invalid default %s') % default)

2
utils/test/test-translations.py
View file

@ -69,7 +69,7 @@ class TestHotkeyConflicts(AATest):
keys = {}
for key in params:
text = t.gettext(CMDS[key])
hotkey = get_translated_hotkey(text).lower()
hotkey = get_translated_hotkey(text)
if keys.get(hotkey):
raise Exception("Hotkey conflict: '{}' and '{}'".format(keys[hotkey], text))