Merge branch 'main' into fix/17/dismiss-dialog-autoclose

Author: imnotjames

grimmory.koplugin/grimmory/ui/dialog_manager.lua

@@ -360,12 +360,16 @@ function DialogManager:showPluginUpdater()
     end)
 end
 
-function DialogManager:showProgressDialog(title, dismiss_callback)
+function DialogManager:showProgressDialog(title, dismiss_callback, dismiss_text)
     local dialog
     local confirm_dialog
     local is_closing = false
 
     if dismiss_callback ~= nil then
+        if dismiss_text == nil then
+            dismiss_text = _("Terminate this task?")
+        end
+
         dismiss_callback = function()
             if is_closing then
                 -- The dismiss callback is fired even when
@@ -379,7 +383,7 @@ function DialogManager:showProgressDialog(title, dismiss_callback)
             end
 
             confirm_dialog = ConfirmBox:new({
-                text = _("Cancel Synchronization?"),
+                text = dismiss_text,
                 ok_callback = function()
                     pcall(dismiss_callback)
                     UIManager:close(dialog)

grimmory.koplugin/main.lua

@@ -331,7 +331,8 @@ function Grimmory:onGrimmorySync(verbose)
                 _("Synchronizing to Grimmory"),
                 function()
                     should_terminate = true
-                end
+                end,
+                _("Are you sure you want to interrupt synchronization?")
             )
         end