1
0
Fork 0

Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
Nick Brassel 2021-11-05 08:55:55 +11:00
commit 92e9bbd9b9
4 changed files with 117 additions and 4 deletions

View file

@ -25,6 +25,13 @@ def _valid_community_layout(layout):
return (Path('layouts/default') / layout).exists()
def _remove_newlines_from_labels(layouts):
for layout_name, layout_json in layouts.items():
for key in layout_json['layout']:
if '\n' in key['label']:
key['label'] = key['label'].split('\n')[0]
def info_json(keyboard):
"""Generate the info.json data for a specific keyboard.
"""
@ -100,10 +107,7 @@ def info_json(keyboard):
_check_matrix(info_data)
# Remove newline characters from layout labels
for layout_name, layout_json in layouts.items():
for key in layout_json['layout']:
if '\n' in key['label']:
key['label'] = key['label'].split('\n')[0]
_remove_newlines_from_labels(layouts)
return info_data