From a0ccd85d9e90d4115f5372c0e3d4e9259eb0abf3 Mon Sep 17 00:00:00 2001 From: Rob Weber Date: Fri, 18 Dec 2020 09:28:17 -0600 Subject: [PATCH] part of #174, fixes ok() method def change --- launcher.py | 4 ++-- resources/lib/authorizers.py | 4 ++-- resources/lib/backup.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/launcher.py b/launcher.py index 3f2839a..b1ddb0a 100644 --- a/launcher.py +++ b/launcher.py @@ -13,9 +13,9 @@ def authorize_cloud(cloudProvider): authorizer = DropboxAuthorizer() if(authorizer.authorize()): - xbmcgui.Dialog().ok(utils.getString(30010), utils.getString(30027) + ' ' + utils.getString(30106)) + xbmcgui.Dialog().ok(utils.getString(30010), '%s %s' %(utils.getString(30027), utils.getString(30106))) else: - xbmcgui.Dialog().ok(utils.getString(30010), utils.getString(30107) + ' ' + utils.getString(30027)) + xbmcgui.Dialog().ok(utils.getString(30010), '%s %s' % (utils.getString(30107), utils.getString(30027))) def remove_auth(): diff --git a/resources/lib/authorizers.py b/resources/lib/authorizers.py index b632dc2..a46c34b 100644 --- a/resources/lib/authorizers.py +++ b/resources/lib/authorizers.py @@ -23,7 +23,7 @@ class DropboxAuthorizer: if(self.APP_KEY == '' and self.APP_SECRET == ''): # we can't go any farther, need these for sure - xbmcgui.Dialog().ok(utils.getString(30010), utils.getString(30027) + ' ' + utils.getString(30058), utils.getString(30059)) + xbmcgui.Dialog().ok(utils.getString(30010), '%s %s\n%s' % (utils.getString(30027), utils.getString(30058), utils.getString(30059))) result = False @@ -51,7 +51,7 @@ class DropboxAuthorizer: # print url in log utils.log("Authorize URL: " + url) - xbmcgui.Dialog().ok(utils.getString(30010), utils.getString(30056), utils.getString(30057), tinyurl.shorten(url)) + xbmcgui.Dialog().ok(utils.getString(30010), '%s\n%s\n%s' % (utils.getString(30056), utils.getString(30057), tinyurl.shorten(url))) # get the auth code code = xbmcgui.Dialog().input(utils.getString(30027) + ' ' + utils.getString(30103)) diff --git a/resources/lib/backup.py b/resources/lib/backup.py index bc45ed2..d556442 100644 --- a/resources/lib/backup.py +++ b/resources/lib/backup.py @@ -197,7 +197,7 @@ class XbmcBackup: if(not fileCopied): # zip archive copy filed, inform the user - shouldContinue = xbmcgui.Dialog().ok(utils.getString(30089), utils.getString(30090), utils.getString(30091)) + shouldContinue = xbmcgui.Dialog().ok(utils.getString(30089), '%s\n%s' % (utils.getString(30090), utils.getString(30091))) # delete the temp zip file self.xbmc_vfs.rmfile(xbmcvfs.translatePath("special://temp/" + zip_name)) @@ -255,7 +255,7 @@ class XbmcBackup: # for restores remote path must exist if(not self.remote_vfs.exists(self.remote_vfs.root_path)): - xbmcgui.Dialog().ok(utils.getString(30010), utils.getString(30045), self.remote_vfs.root_path) + xbmcgui.Dialog().ok(utils.getString(30010), '%s\n%s' % (utils.getString(30045), self.remote_vfs.root_path)) return valFile = self._checkValidationFile(self.remote_vfs.root_path) @@ -316,7 +316,7 @@ class XbmcBackup: allFiles.append({"source": self.remote_vfs.root_path + aDir['name'], "dest": self.xbmc_vfs.root_path, "files": fileManager.getFiles()}) else: utils.log("error path not found: " + self.remote_vfs.root_path + aDir['name']) - xbmcgui.Dialog().ok(utils.getString(30010), utils.getString(30045), self.remote_vfs.root_path + aDir['name']) + xbmcgui.Dialog().ok(utils.getString(30010), '%s\n%s' % (utils.getString(30045), self.remote_vfs.root_path + aDir['name'])) # restore all the files self.transferLeft = self.transferSize @@ -354,7 +354,7 @@ class XbmcBackup: if(self.xbmc_vfs.exists(xbmcvfs.translatePath('special://temp/xbmc_backup_temp.zip'))): if(not self.xbmc_vfs.rmfile(xbmcvfs.translatePath('special://temp/xbmc_backup_temp.zip'))): # we had some kind of error deleting the old file - xbmcgui.Dialog().ok(utils.getString(30010), utils.getString(30096), utils.getString(30097)) + xbmcgui.Dialog().ok(utils.getString(30010), '%s\n%s' % (utils.getString(30096), utils.getString(30097))) return False # save the remote file system and use the zip vfs