Merge branch 'rename-nb-layout-to-no' into 'master'

Rename the nb layout to no, fixing input source selection See merge request Librem5/squeekboard!233
2019-11-11 19:36:58 +00:00
parent 87d368878b 8024998a4b
commit 71d2df8b2a
3 changed files with 2 additions and 2 deletions
--- a/data/keyboards/no.yaml
+++ b/data/keyboards/no.yaml
--- a/src/resources.rs
+++ b/src/resources.rs
@ -17,7 +17,7 @@ const KEYBOARDS: &[(*const str, *const str)] = &[
    ("es", include_str!("../data/keyboards/es.yaml")),
    ("it", include_str!("../data/keyboards/it.yaml")),
    ("ja+kana", include_str!("../data/keyboards/ja+kana.yaml")),
-    ("nb", include_str!("../data/keyboards/nb.yaml")),
+    ("no", include_str!("../data/keyboards/no.yaml")),
    ("number", include_str!("../data/keyboards/number.yaml")),
    ("se", include_str!("../data/keyboards/se.yaml")),
 ];
--- a/tests/meson.build
+++ b/tests/meson.build
@ -54,7 +54,7 @@ foreach layout : [
    'es',
    'it',
    'ja+kana',
-    'nb',
+    'no',
    'number',
    'se',
 ]