From 2e63245859830aa39801bbc73a238be0a5de0e2b Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Thu, 27 Apr 2017 21:20:36 +0100 Subject: [PATCH] Mention "Frontier" in FDev server errors --- L10n/en.template | 9 ++++++--- companion.py | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index d50854a8..c759fb37 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -154,11 +154,14 @@ /* [edsm.py] */ "Error: EDSM {MSG}" = "Error: EDSM {MSG}"; -/* [companion.py] */ -"Error: Invalid Credentials" = "Error: Invalid Credentials"; +/* Raised when cannot contact the Companion API server. [companion.py] */ +"Error: Frontier server is down" = "Error: Frontier server is down"; + +/* Raised when Companion API server is returning old data, e.g. when the servers are too busy. [companion.py] */ +"Error: Frontier server is lagging" = "Error: Frontier server is lagging"; /* [companion.py] */ -"Error: Server is down" = "Error: Server is down"; +"Error: Invalid Credentials" = "Error: Invalid Credentials"; /* Raised when Companion API server is returning old data, e.g. when the servers are too busy. [EDMarketConnector.py] */ "Error: Server is lagging" = "Error: Server is lagging"; diff --git a/companion.py b/companion.py index 0a4cd183..d1694a08 100644 --- a/companion.py +++ b/companion.py @@ -140,13 +140,13 @@ def listify(thing): class ServerError(Exception): def __unicode__(self): - return _('Error: Server is down') + return _('Error: Frontier server is down') # Raised when cannot contact the Companion API server def __str__(self): return unicode(self).encode('utf-8') class ServerLagging(Exception): def __unicode__(self): - return _('Error: Server is lagging') # Raised when Companion API server is returning old data, e.g. when the servers are too busy + return _('Error: Frontier server is lagging') # Raised when Companion API server is returning old data, e.g. when the servers are too busy def __str__(self): return unicode(self).encode('utf-8')