From 4dc248a63158b5b17bde7c944999b7c1d563989c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 1 Nov 2018 14:43:22 +0100 Subject: [PATCH 1/2] Rename Open Marketplace to just Marketplace Because Open Marketplace has to be translated (the 'open' part) but the Marketplace can just be called marketplace. Contributes to issue 5870. --- resources/qml/Actions.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 161c1db342..892386d9e7 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -421,7 +421,7 @@ Item Action { id: browsePackagesAction - text: catalog.i18nc("@action:menu", "Open Marketplace...") + text: catalog.i18nc("@action:menu", "&Marketplace") iconName: "plugins_browse" } From 28526744990580b1f181d2c7afe0726e59b5be13 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 1 Nov 2018 15:50:18 +0100 Subject: [PATCH 2/2] Adjust state of API call It can just be an arbitrary string, as long as it is kept consistent I suppose. Discovered during test of CURA-5784. --- cura/OAuth2/AuthorizationService.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/OAuth2/AuthorizationService.py b/cura/OAuth2/AuthorizationService.py index 65b31f1ed7..4355891139 100644 --- a/cura/OAuth2/AuthorizationService.py +++ b/cura/OAuth2/AuthorizationService.py @@ -120,7 +120,7 @@ class AuthorizationService: "redirect_uri": self._settings.CALLBACK_URL, "scope": self._settings.CLIENT_SCOPES, "response_type": "code", - "state": "CuraDriveIsAwesome", + "state": "(.Y.)", "code_challenge": challenge_code, "code_challenge_method": "S512" })