Commit Graph
6677 Commits
Author SHA1 Message Date
Athanasius 87c4139bbb Merge branch 'beta' into develop 2020-07-05 20:08:52 +01:00
Athanasius 252b1a648d Merge pull request #558 from EDCD/release-3.99.2.0
Release 3.99.2.0
2020-07-05 20:07:49 +01:00
Athanasius c4c2a84143 Merge branch 'beta' into release-3.99.2.0 2020-07-05 20:05:50 +01:00
Athanasius 719fa082a9 Changelog for 3.99.2.0 2020-07-05 20:04:41 +01:00
Athanasius 7e838953c9 Increase version to 3.99.2.0 2020-07-05 20:01:05 +01:00
Athanasius 1a8410e9a2 Update translations ready for 3.99.2.0 2020-07-05 19:58:36 +01:00
Athanasius 26da1be135 Merge branch 'issue/549-helper-scripts' into develop 2020-07-05 19:50:32 +01:00
Athanasius 085333c80b Update issue templates 2020-07-05 19:46:02 +01:00
Athanasius 1a18c2be9b Merge branch 'develop' into python3 2020-07-05 19:41:07 +01:00
Athanasius 80cf6975a8 Merge pull request #557 from EDCD/l10n/Add-Swedish
Add Swedish Translation
2020-07-05 19:34:56 +01:00
Athanasius 72bed8fc17 Add Swedish, sv-SE, to .wxs file for installation 2020-07-05 19:30:22 +01:00
Athanasius 58078546ac Add Swedish Translationo
TODO: Add to installer setup so it will be in the next release.
2020-07-05 16:21:45 +01:00
Athanasius e21fc8f4c5 Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2020-07-05 16:16:44 +01:00
Athanasius 2de8b9b94f docs/Translations: Finalize "don't translate" phrases immediately. 2020-07-05 16:16:18 +01:00
Athanasius d6d2ef3450 Merge pull request #554 from Athanasius/fix/Registry-Marginal-Winsparkle
Fix WinSparkle options to be under EDCD key
2020-07-04 11:52:42 +01:00
Athanasius dbc177a02c Fix WinSparkle options to be under EDCD key
* When I changed 'company_name' in setup.py to 'EDCD' this caused WinSparkle to
   store, and look for, its keys there.
 * There's code in config.py that attempts to set some WinSparkle options, only
   if they weren't already there.  This is hardcoded to use the old 'Marginal'
   Registry Key.

So, explicitly do this WinSparkle setup under 'EDCD', and *always* set the
update_interval value to match what we expect.  Leave the 'CheckForUpdates'
under the 'is it already here?' check so that we respect the user's choice.
2020-07-04 11:51:01 +01:00
Athanasius c1f1d19953 Merge pull request #553 from Athanasius/fix/500-No_DISPLAY_set
theme.py: Check if we can actually get an Xorg/X11 display

closes #500
2020-07-04 10:10:36 +01:00
Athanasius af9c44640f theme.py: Check if we can actually get an Xorg/X11 display
The added exception at least means we don't then segmentation fault in
the next line, but it also means we then hit another exception later
in the main loop as we try to create the main Tk window.

Hopefully the exception messages will be clear enough to the user.

closes #500
2020-07-04 09:37:50 +01:00
Athanasius 87d7c823a7 Changelog for 3.99.1.0 Release/3.99.1.0 2020-07-02 18:19:09 +01:00
Athanasius 46812e83e9 Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2020-07-02 18:07:19 +01:00
Athanasius bbb5c52de3 Increase version to 3.99.1.0 2020-07-02 18:06:29 +01:00
Athanasius eecd64c8ef You need 'npm' installed to update coriolis-data
And that's where some other files come from: modules.p, ships.p
2020-07-02 18:02:45 +01:00
Athanasius 5074c0e5f1 Merge pull request #550 from EDCD/fix/546-strict_journal_file_names
Use a strict regex for matching Journal*.log files
2020-07-02 17:56:11 +01:00
Athanasius 942cbbfcfc Use a strict regex for matching Journal*.log files
A user accidentally copied a Journal file into the same directory, resulting in
a "Journal.<datetime>.<serial> - Copy.log" file.  EDMC 3.99.0.0 then picked this
up and re-sent events to EDDN, EDSM, Inara.

So, let's be strict about the filenames we consider to be valid, live, Journal
files.

 * Journal files have one basic form: Journal.YYMMDDHHMMSS.XX.log
 * In addition the word 'Beta' can be inserted just after 'Journal'

So regex '^Journal(Beta)?\.[0-9]{12}\.[0-9]{2}\.log$' matches both and nothing
else.

Test: The "copy to same directory" that originally triggered this.  EDMC no
      longer 'sees' the copy.
Test: Copied a Journal file out, renamed it to later date/time, copied that
      back in.  EDMC saw it correctly as a new file.

NB: Didn't test the "no emitter" version at monitor.py:251, but no reason to
    think it won't also work.

closes #546
2020-07-02 17:54:04 +01:00
Athanasius 0432327045 modules.p update from latest coriolis-data 2020-07-02 17:19:45 +01:00
Athanasius 5cfbb8eb12 Start documenting necessary pre-packaging actions. 2020-07-02 16:29:10 +01:00
Athanasius b0f4fadf7a Merge pull request #548 from Athanasius/fix/547-New_translations_not_installed
Add the new languages to the installed files.
2020-07-02 16:08:18 +01:00
Athanasius 2dddffd1f7 Add the new languages to the installed files.
* You need to add a 'Directory' entry for the new file *and* then list it in 'Features'.
 * Translations.md updated with the necessary steps.

closes #547
2020-07-02 15:59:10 +01:00
Athanasius a64badc578 Merge branch 'develop' into python3 2020-07-01 22:57:10 +01:00
Athanasius 79f86039d2 Merge branch 'master' into develop
This should be no actual commits, just sync'ing to be rid of
"3 commits behind master".
2020-07-01 22:55:18 +01:00
Athanasius bdb9042d81 Merge branch 'develop' into python3 2020-07-01 22:46:37 +01:00
Athanasius fc6fc793a0 Merge branch 'python3' of https://github.com/EDCD/EDMarketConnector into python3 2020-07-01 22:46:10 +01:00
Athanasius 3b5a510653 Plugins.md: Minor edits
* One more plugin_start() -> plugin_start3()
 * Startup and Shutdown events linkified in sections.
 * Note the use of the return from plugin_start3()
 * Point out the cmdr_data() `data` dictionary is from CAPI `/profile`
2020-07-01 18:29:56 +01:00
Athanasius 3b233771ff setup.py: Use APPNAME, not APP, for product_name
'product_name' is used by WinSparkle to determine the Registry path it uses.   APP is
'EDMarketConnector.py' not the 'EDMarketConnector' that APPNAME is.  This having changed
causes a new popup from WinSparkle on first run of post-3.46 asking about whether to enable
auto update checks.

3.99.0.0 testers will gave to put up with it on first run.
2020-07-01 18:14:17 +01:00
Athanasius d8e8869b15 Plugins.md: Minor edit about Settings 2020-07-01 18:11:20 +01:00
Athanasius 71ae6b8a34 Releasing.md: Add notes on Pre-Releases. 2020-07-01 17:21:30 +01:00
Athanasius c1221fb6fc Change 'Release Notes' URL to use 'Release/A.B.C.D' tag form
Closes #544
2020-07-01 17:11:23 +01:00
Athanasius 0555dfdf8c Update changelog for 3.99.0.0 Release/3.99.0.0 2020-07-01 16:56:20 +01:00
Athanasius ab375c7bac Version 3.99.0.0 as beta0 for python 3.7 release 2020-07-01 16:20:59 +01:00
Athanasius b016d99c98 Merge pull request #543 from EDCD/issue/529-update-translations
Issue/529 update translations
2020-07-01 16:16:59 +01:00
Athanasius 1e83107e71 Merge pull request #530 from EDCD/issue/529-update-translations
Closes #529 Issue/529 update translations
2020-07-01 16:14:36 +01:00
Athanasius b24ad5313b Add Slovenian (Slovenia) to installer languages. 2020-07-01 16:10:16 +01:00
Athanasius 8766649dc2 Update translations as of 2020-07-01 15:02 UTC
* Adds "Serbian (Latin, Bosnia and Herzegovina)
 * Also imports the 144/175 "Slovenian (Slovenia)"
2020-07-01 16:05:43 +01:00
Athanasius f10ac1d97e Fix two typoes in docs/Translations.md 2020-07-01 16:02:25 +01:00
Athanasius 4cf03b4331 Document how to add a new translation language 2020-07-01 15:55:37 +01:00
Athanasius aff1b89b48 Add sr-Latn-BA to the installer languages
If we're supporting it now in-app then it should be in the installer
as well.
2020-07-01 15:55:37 +01:00
Athanasius c019166ffb Document using other translations within a string
This is useful for things like referring to the translated name of a
menu label in some other text.
2020-07-01 15:55:37 +01:00
Athanasius 0bf8ad428c Document how translations work 2020-07-01 15:55:37 +01:00
Athanasius 38593058f4 Use translations of some words in Python 3.x popup text
'File', 'Settings' and 'Plugins' are defined to have translations for
the menus/tabs texts, so use them.
2020-07-01 15:55:37 +01:00
Athanasius 9469ec3079 Use literal '.disabled' in the Python 3.x popup text 2020-07-01 15:55:37 +01:00