From 99d90b52b1657c9f0ccf71436df9288b0aee157e Mon Sep 17 00:00:00 2001 From: Athanasius Date: Mon, 12 Apr 2021 14:58:03 +0100 Subject: [PATCH] translations: Re-order as per l10n.py output & some added * Generic 'Error'. * Strings for Access Token customer_id != FID. * Other strings in companion.py now translating. * Missing colon on Plugins string. --- L10n/en.template | 60 +++++++++++++++++++++++++++++------------------- companion.py | 12 +++++----- 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/L10n/en.template b/L10n/en.template index 1d4f4e07..a7262ed1 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -1,18 +1,12 @@ -/* Label for 'UI Transparency' option in [prefs.py]*/ -"Main window transparency" = "Main window transparency"; +/* Language name */ +"!Language" = "English"; /* Message next to 'UI Transparency' slider [prefs.py] */ "100 means fully opaque.{CR}Window is updated in real time" = "100 means fully opaque.{CR}Window is updated in real time"; -/* Label for 'UI Scaling' option [prefs.py] */ -"UI Scale Percentage" = "UI Scale Percentage"; - /* Text describing that value '100' means 'default', and changes require a restart [prefs.py] */ "100 means Default{CR}Restart Required for{CR}changes to take effect!" = "100 means Default{CR}Restart Required for{CR}changes to take effect!"; -/* Language name */ -"!Language" = "English"; - /* App menu entry on OSX. [EDMarketConnector.py] */ "About {APP}" = "About {APP}"; @@ -52,12 +46,12 @@ /* Folder selection button on Windows. [prefs.py] */ "Browse..." = "Browse..."; -/* No 'commander' data in CAPI [EDMarketConnector.py] */ -"CAPI: No commander data returned" = "CAPI: No commander data returned"; - /* Federation rank. [stats.py] */ "Cadet" = "Cadet"; +/* No 'commander' data in CAPI [EDMarketConnector.py] */ +"CAPI: No commander data returned" = "CAPI: No commander data returned"; + /* CQC rank. [stats.py] */ "Champion" = "Champion"; @@ -136,6 +130,9 @@ /* Menu title. [EDMarketConnector.py] */ "Edit" = "Edit"; +/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */ +"EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; + /* Top rank. [stats.py] */ "Elite" = "Elite"; @@ -154,6 +151,9 @@ /* Trade rank. [stats.py] */ "Entrepreneur" = "Entrepreneur"; +/* [companion.py] */ +"Error" = "Error"; + /* [eddn.py] */ "Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; @@ -163,6 +163,12 @@ /* [inara.py] */ "Error: Can't connect to Inara" = "Error: Can't connect to Inara"; +/* [companion.py] */ +"Error: Couldn't check token customer_id" = "Error: Couldn't check token customer_id"; + +/* [companion.py] */ +"Error: customer_id doesn't match!" = "Error: customer_id doesn't match!"; + /* [edsm.py] */ "Error: EDSM {MSG}" = "Error: EDSM {MSG}"; @@ -181,6 +187,9 @@ /* [companion.py] */ "Error: Invalid Credentials" = "Error: Invalid Credentials"; +/* [companion.py] */ +"Error: unable to get token" = "Error: unable to get token"; + /* Raised when the user has multiple accounts and the username/password setting is not for the account they're currently playing OR the user has reset their Cmdr and the Companion API server is still returning data for the old Cmdr. [companion.py] */ "Error: Wrong Cmdr" = "Error: Wrong Cmdr"; @@ -241,6 +250,9 @@ /* Section heading in settings. [inara.py] */ "Inara credentials" = "Inara credentials"; +/* Settings>Plugins>Information on migrating plugins [prefs.py] */ +"Information on migrating plugins" = "Information on migrating plugins"; + /* Changed journal update_lock failed [monitor.py] */ "Journal directory already locked" = "Journal directory already locked"; @@ -268,12 +280,18 @@ /* Cmdr stats. [stats.py] */ "Loan" = "Loan"; +/* Label for user configured level of logging [prefs.py] */ +"Log Level" = "Log Level"; + /* [EDMarketConnector.py] */ "Logging in..." = "Logging in..."; /* Empire rank. [stats.py] */ "Lord" = "Lord"; +/* Label for 'UI Transparency' option in [prefs.py] */ +"Main window transparency" = "Main window transparency"; + /* [prefs.py] */ "Market data in CSV format file" = "Market data in CSV format file"; @@ -316,6 +334,9 @@ /* [prefs.py] */ "OK" = "OK"; +/* Popup body: Warning about plugins without Python 3.x support [EDMarketConnector.py] */ +"One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; + /* Hotkey/Shortcut setting. [prefs.py] */ "Only when Elite: Dangerous is the active app" = "Only when Elite: Dangerous is the active app"; @@ -358,17 +379,8 @@ /* Section heading in settings. [prefs.py] */ "Plugins folder" = "Plugins folder"; -/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */ -"EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; - -/* Popup body: Warning about plugins without Python 3.x support [EDMarketConnector.py] */ -"One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name." = "One or more of your enabled plugins do not yet have support for Python 3.x. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. You should check if there is an updated version available, else alert the developer that they need to update the code for Python 3.x.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; - /* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */ -"Plugins Without Python 3.x Support" = "Plugins Without Python 3.x Support"; - -/* Settings>Plugins>Information on migrating plugins [prefs.py] */ -"Information on migrating plugins" = "Information on migrating plugins"; +"Plugins Without Python 3.x Support:" = "Plugins Without Python 3.x Support:"; /* Federation rank. [stats.py] */ "Post Captain" = "Post Captain"; @@ -517,6 +529,9 @@ /* Trade rank. [stats.py] */ "Tycoon" = "Tycoon"; +/* Label for 'UI Scaling' option [prefs.py] */ +"UI Scale Percentage" = "UI Scale Percentage"; + /* Update button in main window. [EDMarketConnector.py] */ "Update" = "Update"; @@ -555,6 +570,3 @@ /* Shortcut settings prompt on OSX. [prefs.py] */ "{APP} needs permission to use shortcuts" = "{APP} needs permission to use shortcuts"; - -/* Label for user configured level of logging [prefs.py] */ -"Log Level" = "Log Level"; diff --git a/companion.py b/companion.py index f827aa9f..7702d046 100644 --- a/companion.py +++ b/companion.py @@ -329,7 +329,7 @@ class Auth(object): (data[k] for k in ('error_description', 'error', 'message') if k in data), '' ) - raise CredentialsError(f'Error: {error!r}') + raise CredentialsError(f'{_("Error")}: {error!r}') r = None try: @@ -367,16 +367,16 @@ class Auth(object): if (usr := data_decode.get('usr')) is None: logger.error('No "usr" in /decode data') - raise CredentialsError("Error: Couldn't check token customer_id") + raise CredentialsError(_("Error: Couldn't check token customer_id")) if (customer_id := usr.get('customer_id')) is None: logger.error('No "usr"->"customer_id" in /decode data') - raise CredentialsError("Error: Couldn't check token customer_id") + raise CredentialsError(_("Error: Couldn't check token customer_id")) # All 'FID' seen in Journals so far have been 'F' # Frontier, Steam and Epic if f'F{customer_id}' != monitor.state.get('FID'): - raise CredentialsError("Error: customer_id doesn't match!") + raise CredentialsError(_("Error: customer_id doesn't match!")) logger.info(f'Frontier CAPI Auth: New token for \"{self.cmdr}\"') cmdrs = config.get_list('cmdrs', default=[]) @@ -397,7 +397,7 @@ class Auth(object): if r: self.dump(r) - raise CredentialsError('unable to get token') from e + raise CredentialsError(_('Error: unable to get token')) from e logger.error(f"Frontier CAPI Auth: Can't get token for \"{self.cmdr}\"") self.dump(r) @@ -405,7 +405,7 @@ class Auth(object): (data[k] for k in ('error_description', 'error', 'message') if k in data), '' ) - raise CredentialsError(f'Error: {error!r}') + raise CredentialsError(f'{_("Error")}: {error!r}') @staticmethod def invalidate(cmdr: str) -> None: