Merge pull request #4132 from c-po/keyboard-layout

T6759: add support for italian keymap
vyos · Oct 6, 2024 · 4f3ec67 · 4f3ec67
2 parents 6dad9e3 + 1c83b39
commit 4f3ec67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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>
@@ -114,6 +114,10 @@
                  <format>fi</format>
                  <description>Finland</description>
                </valueHelp>
+               <valueHelp>
+                <format>it</format>
+                <description>Italy</description>
+              </valueHelp>
                <valueHelp>
                  <format>jp106</format>
                  <description>Japan</description>
@@ -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
@@ -96,4 +96,4 @@ def test_ssh_client_options(self):
 
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2, failfast=True)
+    unittest.main(verbosity=2)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -96,4 +96,4 @@ def test_ssh_client_options(self):


		if __name__ == '__main__':
		unittest.main(verbosity=2, failfast=True)
		unittest.main(verbosity=2)