Merge branch 'dev' into FEAT_NewVoice

__init__.py

@@ -126,6 +126,8 @@ def handle_exit_shutdown_intent(self, message):
         :param message: message object associated with request
         """
         confirm_number = str(randint(100, 999))
+        self.gui.show_text(confirm_number,
+                           self.resources.render_dialog("word_confirm"))
         validator = numeric_confirmation_validator(confirm_number)
         if message.data.get("exit"):
             action = SystemCommand.EXIT
@@ -139,7 +141,10 @@ def handle_exit_shutdown_intent(self, message):
         response = self.get_response("ask_exit_shutdown",
                                      {"action": action.value,
                                       "number": confirm_number},
-                                     validator, "action_not_confirmed")
+                                     validator, "action_not_confirmed",
+                                     num_retries=3)
+        LOG.debug(f"Got response: {response}")
+        self.gui.clear()
         if not response:
             self.speak_dialog("confirm_cancel", private=True)
         elif response:

locale/en-us/dialog/word_confirm.dialog

@@ -0,0 +1 @@
+go ahead

locale/en-us/vocab/no.voc → locale/en-us/vocab/cancel.voc

@@ -3,4 +3,5 @@ nope
 nah
 negative
 nevermind
-never mind
+never mind
+cancel

locale/uk-ua/dialog/word_confirm.dialog

@@ -0,0 +1 @@
+продовжуй

test/test_resources.yaml

@@ -13,7 +13,7 @@ vocab:
   - "enable"
   - "exit"
   - "listening"
-  - "no"
+  - "cancel"
   - "request"
   - "restart"
   - "shutdown"
@@ -59,6 +59,7 @@ dialog:
   - wakeword_failed_to_disable
   - ask_enable
   - confirm_change
+  - word_confirm
 
 # regex entities, not necessarily filenames
 regex:

test/test_skill.py

@@ -75,7 +75,7 @@ def test_handle_exit_shutdown_intent(self):
         # Exit Confirmed
         message = Message("valid_intent", {"exit": "exit"})
 
-        def get_response(*args):
+        def get_response(*args, **kwargs):
             self.assertEqual(args[0], "ask_exit_shutdown")
             dialog = args[0]
             dialog_data = args[1]
@@ -103,7 +103,7 @@ def get_response(*args):
         # Shutdown confirmed
         message = Message("valid_intent", {"shutdown": "shut down"})
 
-        def get_response(*args):
+        def get_response(*args, **kwargs):
             self.assertEqual(args[0], "ask_exit_shutdown")
             dialog = args[0]
             dialog_data = args[1]
@@ -131,7 +131,7 @@ def get_response(*args):
         # Restart Confirmed
         message = Message("valid_intent", {"restart": "reboot"})
 
-        def get_response(*args):
+        def get_response(*args, **kwargs):
             self.assertEqual(args[0], "ask_exit_shutdown")
             dialog = args[0]
             dialog_data = args[1]
@@ -160,7 +160,7 @@ def get_response(*args):
         self.skill._do_exit_shutdown.reset_mock()
         message = Message("valid_intent", {"exit": "exit"})
 
-        def get_response(*args):
+        def get_response(*args, **kwargs):
             self.assertEqual(args[0], "ask_exit_shutdown")
             dialog = args[0]
             dialog_data = args[1]
@@ -187,7 +187,7 @@ def get_response(*args):
         # Exit no response
         message = Message("valid_intent", {"exit": "exit"})
 
-        def get_response(*args):
+        def get_response(*args, **kwargs):
             self.assertEqual(args[0], "ask_exit_shutdown")
             dialog = args[0]
             dialog_data = args[1]

version.py

@@ -26,4 +26,4 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "1.1.1a1"
+__version__ = "1.1.1a2"