From dac95425577fe3f91b9f15e61c086125f4f57c47 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Wed, 13 Dec 2023 19:38:42 -0500 Subject: [PATCH] [Minor] Correct Template S&G Also includes a minor fix for try/except if coriolis-data is missing --- EDMarketConnector.py | 6 +++--- L10n/en.template | 16 +++++----------- coriolis-update-files.py | 8 ++++++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index da871032..50872ec3 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -2262,11 +2262,11 @@ sys.path: {sys.path}''' def messagebox_broken_plugins(): """Display message about plugins not updated for Python 3.x.""" if plug.PLUGINS_broken: - # LANG: Popup-text about 'broken' plugins that failoed to load + # LANG: Popup-text about 'broken' plugins that failed to load popup_text = _( "One or more of your enabled plugins failed to load. Please see the list on the '{PLUGINS}' " "tab of '{FILE}' > '{SETTINGS}'. This could be caused by a wrong folder structure. The load.py " - "file should be located under plugins/PLUGIN_NAME/load.py.\r\n\r\nYou can disable a plugin by " + r"file should be located under plugins/PLUGIN_NAME/load.py.\r\n\r\nYou can disable a plugin by " "renaming its folder to have '{DISABLED}' on the end of the name." ) @@ -2282,7 +2282,7 @@ sys.path: {sys.path}''' popup_text = popup_text.replace('\\r', '\r') tk.messagebox.showinfo( - # LANG: Popup window title for list of 'broken' plugins that failoed to load + # LANG: Popup window title for list of 'broken' plugins that failed to load _('EDMC: Broken Plugins'), popup_text ) diff --git a/L10n/en.template b/L10n/en.template index 52398f25..f89873af 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -213,18 +213,18 @@ /* EDMarketConnector.py: Popup-text about 'active' plugins without Python 3.x support; In files: EDMarketConnector.py:2253:2259; */ "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."; -/* EDMarketConnector.py: Popup-text about 'broken' plugins without Python 3.x support; In files: EDMarketConnector.py:2266:2271; */ -"One or more of your enabled plugins failed to load. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. This could be caused by a wrong folder structure. The load.py file should be located under plugins/PLUGIN_NAME/load.py.\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 failed to load. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. This could be caused by a wrong folder structure. The load.py file should be located under plugins/PLUGIN_NAME/load.py.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; - /* EDMarketConnector.py: Settings > Plugins tab; prefs.py: Label on Settings > Plugins tab; In files: EDMarketConnector.py:2263; prefs.py:986; */ "Plugins" = "Plugins"; /* EDMarketConnector.py: Popup window title for list of 'enabled' plugins that don't work with Python 3.x; In files: EDMarketConnector.py:2274; */ "EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Without Python 3.x Support"; -/* EDMarketConnector.py: Popup window title for list of 'broken' plugins that failoed to load; In files: EDMarketConnector.py:2285; */ +/* EDMarketConnector.py: Popup window title for list of 'broken' plugins that failed to load; In files: EDMarketConnector.py:2285; */ "EDMC: Broken Plugins" = "EDMC: Broken Plugins"; +/* EDMarketConnector.py: Popup-text about 'broken' plugins that failed to load; In files: EDMarketConnector.py:2266; */ +"One or more of your enabled plugins failed to load. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. This could be caused by a wrong folder structure. The load.py file should be located under plugins/PLUGIN_NAME/load.py.\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 failed to load. Please see the list on the '{PLUGINS}' tab of '{FILE}' > '{SETTINGS}'. This could be caused by a wrong folder structure. The load.py file should be located under plugins/PLUGIN_NAME/load.py.\r\n\r\nYou can disable a plugin by renaming its folder to have '{DISABLED}' on the end of the name."; + /* journal_lock.py: Title text on popup when Journal directory already locked; In files: journal_lock.py:208; */ "Journal directory already locked" = "Journal directory already locked"; @@ -267,9 +267,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Invalid Coriolis override mode!"; - -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDB Journal processing disabled. See Log."; /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; @@ -297,9 +294,6 @@ /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:2507; */ "Sending data to EDDN..." = "Sending data to EDDN..."; - -/* edsm.py: Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:308; */ -"Send flight log and Cmdr status to EDSM" = "Send flight log and Cmdr status to EDSM"; /* edsm.py: Settings>EDSM - Label on header/URL to EDSM API key page; In files: edsm.py:319; */ "Elite Dangerous Star Map credentials" = "Elite Dangerous Star Map credentials"; @@ -478,7 +472,7 @@ "Enabled Plugins" = "Enabled Plugins"; /* prefs.py: Plugins - Label for list of 'enabled' plugins that don't work with Python 3.x; In files: prefs.py:954; */ -"Plugins Without Python 3.x Support:" = "Plugins Without Python 3.x Support:"; +"Plugins Without Python 3.x Support" = "Plugins Without Python 3.x Support"; /* prefs.py: Plugins - Label on URL to documentation about migrating plugins from Python 2.7; In files: prefs.py:962; */ "Information on migrating plugins" = "Information on migrating plugins"; diff --git a/coriolis-update-files.py b/coriolis-update-files.py index 09592cfe..0f32b935 100755 --- a/coriolis-update-files.py +++ b/coriolis-update-files.py @@ -28,8 +28,12 @@ if __name__ == "__main__": assert name not in modules, name modules[name] = attributes - # Regenerate coriolis-data distribution - subprocess.check_call('npm install', cwd='coriolis-data', shell=True, stdout=sys.stdout, stderr=sys.stderr) + try: + # Regenerate coriolis-data distribution + subprocess.check_call('npm install', cwd='coriolis-data', shell=True, stdout=sys.stdout, stderr=sys.stderr) + except NotADirectoryError as err: + sys.exit("Coriolis-Data Directory not found! Have you set up your submodules? \n" + "https://github.com/EDCD/EDMarketConnector/wiki/Running-from-source#obtain-a-copy-of-the-application-source") file_path = 'coriolis-data/dist/index.json' with open(file_path) as file: