Merge branch 'es' into 'master'

es layout: Add to resources and testing

See merge request Librem5/squeekboard!188
This commit is contained in:
David Boddie
2019-09-29 15:56:30 +00:00
2 changed files with 2 additions and 1 deletions

View File

@ -5,6 +5,7 @@
const KEYBOARDS: &[(*const str, *const str)] = &[ const KEYBOARDS: &[(*const str, *const str)] = &[
("us", include_str!("../data/keyboards/us.yaml")), ("us", include_str!("../data/keyboards/us.yaml")),
("es", include_str!("../data/keyboards/es.yaml")),
("nb", include_str!("../data/keyboards/nb.yaml")), ("nb", include_str!("../data/keyboards/nb.yaml")),
("number", include_str!("../data/keyboards/number.yaml")), ("number", include_str!("../data/keyboards/number.yaml")),
]; ];

View File

@ -47,7 +47,7 @@ endforeach
# The layout test is in the examples directory # The layout test is in the examples directory
# due to the way Cargo builds executables # due to the way Cargo builds executables
# and the need to call it manually # and the need to call it manually
foreach layout : ['us', 'nb', 'number'] foreach layout : ['us', 'es', 'nb', 'number']
test( test(
'test_layout_' + layout, 'test_layout_' + layout,
cargo_script, cargo_script,