summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-10-06 17:40:57 +0200
committerGitHub <noreply@github.com>2024-10-06 17:40:57 +0200
commit4f3ec6728e65c686f61684c06ddf031cf5756845 (patch)
tree0b9427afe534693a5337ec2df66e4ccc7bba520a
parent6dad9e373706a542e32f107f7dcd91a3fac21967 (diff)
parent1c83b39f30880b7e5297db3fffc3afd2cd699f55 (diff)
downloadvyos-1x-4f3ec6728e65c686f61684c06ddf031cf5756845.tar.gz
vyos-1x-4f3ec6728e65c686f61684c06ddf031cf5756845.zip
Merge pull request #4132 from c-po/keyboard-layout
T6759: add support for italian keymap
-rw-r--r--interface-definitions/system_option.xml.in8
-rwxr-xr-xsmoketest/scripts/cli/test_system_option.py2
2 files changed, 7 insertions, 3 deletions
diff --git a/interface-definitions/system_option.xml.in b/interface-definitions/system_option.xml.in
index dc9958ff5..064d9ff40 100644
--- a/interface-definitions/system_option.xml.in
+++ b/interface-definitions/system_option.xml.in
@@ -88,7 +88,7 @@
<properties>
<help>System keyboard layout, type ISO2</help>
<completionHelp>
- <list>us uk fr de es fi jp106 no dk se-latin1 dvorak</list>
+ <list>us uk fr de es fi it jp106 no dk se-latin1 dvorak</list>
</completionHelp>
<valueHelp>
<format>us</format>
@@ -115,6 +115,10 @@
<description>Finland</description>
</valueHelp>
<valueHelp>
+ <format>it</format>
+ <description>Italy</description>
+ </valueHelp>
+ <valueHelp>
<format>jp106</format>
<description>Japan</description>
</valueHelp>
@@ -135,7 +139,7 @@
<description>Dvorak</description>
</valueHelp>
<constraint>
- <regex>(us|uk|fr|de|es|fi|jp106|no|dk|se-latin1|dvorak)</regex>
+ <regex>(us|uk|fr|de|es|fi|it|jp106|no|dk|se-latin1|dvorak)</regex>
</constraint>
<constraintErrorMessage>Invalid keyboard layout</constraintErrorMessage>
</properties>
diff --git a/smoketest/scripts/cli/test_system_option.py b/smoketest/scripts/cli/test_system_option.py
index ffb1d76ae..ed0280628 100755
--- a/smoketest/scripts/cli/test_system_option.py
+++ b/smoketest/scripts/cli/test_system_option.py
@@ -96,4 +96,4 @@ class TestSystemOption(VyOSUnitTestSHIM.TestCase):
if __name__ == '__main__':
- unittest.main(verbosity=2, failfast=True)
+ unittest.main(verbosity=2)