From efdade508d0c5585c5355e5a1a12f5dbb561fcd5 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Tue, 8 Jan 2019 22:49:00 +0000 Subject: [PATCH] Indicate successful authentication Fixes #389 --- EDMarketConnector.py | 4 ++-- L10n/en.template | 10 +++------- README.md | 6 +++++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 0834156d..dffea9e3 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -371,7 +371,7 @@ class AppWindow: self.w.update_idletasks() try: if companion.session.login(monitor.cmdr, monitor.is_beta): - self.status['text'] = '' + self.status['text'] = _('Authentication successful') # Successfully authenticated with the Frontier website except (companion.CredentialsError, companion.ServerError, companion.ServerLagging) as e: self.status['text'] = unicode(e) except Exception as e: @@ -589,7 +589,7 @@ class AppWindow: def auth(self, event=None): try: companion.session.auth_callback(self.protocolhandler.lastpayload) - self.status['text'] = '' + self.status['text'] = _('Authentication successful') # Successfully authenticated with the Frontier website except companion.ServerError as e: self.status['text'] = unicode(e) except Exception as e: diff --git a/L10n/en.template b/L10n/en.template index d70906c8..77891a4d 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -1,9 +1,6 @@ /* Language name */ "!Language" = "English"; -/* Use same text as E:D Launcher's verification dialog. [prefs.py] */ -"A verification code has now been sent to the{CR}email address associated with your Elite account." = "A verification code has now been sent to the{CR}email address associated with your Elite account."; - /* App menu entry on OSX. [EDMarketConnector.py] */ "About {APP}" = "About {APP}"; @@ -25,6 +22,9 @@ /* Tab heading in settings. [prefs.py] */ "Appearance" = "Appearance"; +/* Successfully authenticated with the Frontier website. [EDMarketConnector.py] */ +"Authentication successful" = "Authentication successful"; + /* Output setting. [prefs.py] */ "Automatically update on docking" = "Automatically update on docking"; @@ -217,7 +217,6 @@ /* Hotkey/Shortcut settings prompt on Windows. [prefs.py] */ "Hotkey" = "Hotkey"; - /* Section heading in settings. [inara.py] */ "Inara credentials" = "Inara credentials"; @@ -329,9 +328,6 @@ /* [prefs.py] */ "Please choose what data to save" = "Please choose what data to save"; -/* Use same text as E:D Launcher's verification dialog. [prefs.py] */ -"Please enter the code into the box below." = "Please enter the code into the box below."; - /* Tab heading in settings. [prefs.py] */ "Plugins" = "Plugins"; diff --git a/README.md b/README.md index 8275de19..d0e5ddd3 100644 --- a/README.md +++ b/README.md @@ -124,12 +124,16 @@ Troubleshooting ### App repeatedly opens the Frontier's authentication website The authentication didn't complete correctly for some reason. This can be caused by: + - Using Internet Explorer. IE is [known](https://blogs.msdn.microsoft.com/ieinternals/2011/07/13/understanding-protocols/) to be broken. Please (temporarily) set your default browser to Edge, Chrome or Firefox and retry. - Entering credentials for a different Cmdr - see [Error: Wrong Cmdr](#error-wrong-cmdr). - Entering Steam credentials instead of Frontier credentials - see [Error: User not found](#error-user-not-found). ### 500 internal server error -Frontier's authentication website sometimes gets overloaded and displays this error. Please try again later. +Either: + +- You pressed the "Approve" button on Frontier's authentication website twice. This is harmless; if the app isn't displaying any error messages and isn't redirecting again to Frontier's authentication website then all is fine. +- Frontier's authentication website sometimes gets overloaded and displays this error. Please try again later. ### Error: User not found Your Steam account may not be linked to your Frontier account (you can check whether you have any external accounts linked on the [Frontier store](https://www.frontierstore.net/frontier_partnerkeys/)).