Athanasius
5dee9d2cff
l10n script: Use different regex for 'above' comments
...
This allows us to only consider an 'above' comment if its a standalone
one. Meaning there can't possibly be a `_(...)` call on its line, with
it intended for that call, not the one on this line.
2021-06-13 15:13:36 +01:00
Athanasius
7a858b25d2
EDMarketConnector.py: Fix following-line LANG comment
2021-06-13 15:13:09 +01:00
Athanasius
4f481cc703
l10n script: TODO: issue with LANG above *for* above, not current
2021-06-13 15:02:50 +01:00
Athanasius
83f3f09882
companion: Tweak LANG comment for 'CAPI disagreed with Journal game location'
...
'Journal location' is ambiguous, potentially referring to where on-disk
the files are.
2021-06-13 14:59:35 +01:00
Athanasius
e1e09aebad
l10n script: Attempt to always use correct LANG comment
...
There was an issue where consecutive lines, each with a LANG comment,
caused the next line to use the 'above' line's comment.
2021-06-13 14:58:42 +01:00
Athanasius
cba3835698
EDMarketConnector: Split multi-_(...) line to separate ones for LANG comments
2021-06-13 14:57:14 +01:00
Athanasius
b6f3713531
Translations: Updated en.template with new LANG-comment based comments
2021-06-13 14:03:05 +01:00
Athanasius
b3b4a482b3
Translations: Updated with latest 20210613
2021-06-13 13:49:13 +01:00
Athanasius
e736f30358
Merge pull request #1158 from EDCD/enhancement/l10n-add-missing-LANG-comments
...
Add all missing LANG comments
2021-06-13 13:48:34 +01:00
Athanasius
28ceb72a27
plugins/edsm: LANG comments added
2021-06-13 13:37:21 +01:00
Athanasius
5ad3ec8d8f
plugins/coriolis: LANG comments added
2021-06-13 13:10:14 +01:00
Athanasius
4f1f07957c
journal_lock: LANG comments
2021-06-13 13:02:13 +01:00
Athanasius
7552e93f07
EDMarketConnector: Final LANG comments
2021-06-13 12:59:50 +01:00
Athanasius
b09a102d87
companion.py: Final LANG comments added.
2021-06-13 12:51:48 +01:00
Athanasius
f449e85c0b
CAPI: 'SKUError' exception was never used - removed
...
Also LANG comments added.
2021-06-13 12:42:50 +01:00
Athanasius
3a1af1c2b2
prefs.py: Final additional LANG comments
2021-06-13 12:39:24 +01:00
Athanasius
5c6a4fe68c
prefs.py: LANG comments and some slight code re-arrangement
...
The whole LANG comment thing works best with a single `_(...)` on any
given line, so splitting some of these `thing if X else other` into full
conditionals.
2021-06-13 12:22:01 +01:00
Athanasius
21098f8cfd
stats.py: Missing LANG comment, and type ignore on some ctypes
2021-06-13 12:14:01 +01:00
Athanasius
8a756fee39
Merge pull request #1167 from A-UNDERSCORE-D/fix/890/forget-frontier-auth
...
Added CL arg to forget all frontier tokens
2021-06-13 12:04:32 +01:00
Athanasius
799b5b7666
CAPI: Change confusing post-login again log message
2021-06-12 19:24:26 +01:00
A_D
284064d6ed
Added CL arg to forget all frontier tokens
...
This is obviously quite annoying but should provide a magic fix to any
user with weird auth trouble (such as those seen by
EDCD/EDMarketConnector#1166 )
Closes EDCD/EDMarketConnector#890
2021-06-12 16:38:25 +02:00
Athanasius
44e4772d60
Merge pull request #1165 from EDCD/dependabot/pip/develop/mypy-0.902
...
build(deps-dev): bump mypy from 0.901 to 0.902
2021-06-11 08:24:23 +01:00
dependabot[bot]
8abe0d7c8d
build(deps-dev): bump mypy from 0.901 to 0.902
...
Bumps [mypy](https://github.com/python/mypy ) from 0.901 to 0.902.
- [Release notes](https://github.com/python/mypy/releases )
- [Commits](https://github.com/python/mypy/compare/v0.901...v0.902 )
---
updated-dependencies:
- dependency-name: mypy
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-06-11 06:48:40 +00:00
Athanasius
7d36404d5c
config: Post-release appversion bump to 5.1.2-beta0
2021-06-10 20:47:12 +01:00
A_D
cba7aee874
Fixed printed file line number sometimes off by one
2021-06-10 20:29:11 +01:00
A_D
e89c0e9e21
Fixed possibly unbound variable
2021-06-10 20:29:11 +01:00
A_D
8d77cc039b
Added LANG comments for EDDN localisation
2021-06-10 20:29:11 +01:00
A_D
40e9e0e268
added missing entries to inara
2021-06-10 20:29:11 +01:00
A_D
9b542386fe
added missing entry to eddb
2021-06-10 20:29:11 +01:00
Athanasius
89edd84b5c
Changelog: Translations not updated in 5.1.1
2021-06-10 20:02:07 +01:00
Athanasius
37bee03dd8
Changelog: Translations section "nothing should have changed, yet"
2021-06-10 20:01:05 +01:00
Athanasius
2fd14381f2
Release 5.1.1: appversion and changelog
2021-06-10 19:58:59 +01:00
Athanasius
3005991a3c
Merge pull request #1161 from EDCD/enhancement/odyssey-inventory-4.0.0.400
...
Align ShipLocker and BackPack code with ED 4.0.0.400
2021-06-10 19:35:34 +01:00
Athanasius
2c8d70f67d
ShipLocker: Always load from the file, but be paranoid about it
...
We'll log the "missing keys, file?" line at TRACE for now, until we're
sure all this code is OK.
2021-06-10 14:45:41 +01:00
Athanasius
107c44a2a9
Inara: Fix the all() generator for ShipLocker check
2021-06-10 14:36:50 +01:00
Athanasius
e754568b28
ShipLocker: Fix the all() generator
2021-06-10 14:31:26 +01:00
Athanasius
2353889ed2
monitor: Make 'empty ShipLocker event' log be TRACE
2021-06-10 14:21:33 +01:00
Athanasius
937aaccec4
ShipLockerJSON: Ensure initialised, and document it.
2021-06-10 14:20:27 +01:00
Athanasius
7051aba656
ShipLocker/Backpack: Use one event for the now-pass'ed ones.
...
Also, just dropped `TransferMicroResources` entirely as it's no longer
present (and would be irrelevant).
2021-06-10 14:08:57 +01:00
Athanasius
a7722f70fe
No need for [] if it's a generator inside all() anyway.
2021-06-10 14:04:38 +01:00
Athanasius
9fa02b51c3
Inara: Update to use ShipLocker, possibly from file.
2021-06-10 12:52:15 +01:00
Athanasius
3ea0bcce5e
BackPack: No need to worry about Resurrect.
2021-06-10 12:44:46 +01:00
Athanasius
ae18071f13
Backpack: Factor out the "make it empty" code.
2021-06-10 12:39:53 +01:00
Athanasius
8b6c0e50ac
Backpack: Zero out when we Embark, as it's all then in ShipLocker
2021-06-10 12:37:59 +01:00
Athanasius
09c81a21f6
ShipLocker: do *NOT* zero out BackPack when handling this event
...
Just need to ensure we do on Embark (or Death? but likely fresh events
then anyway?).
Certainly if Journal event order is ever Backpack *then* ShipLocker this
would erroneously zero out the backpack.
2021-06-10 12:34:30 +01:00
Athanasius
b02729ebdc
Backpack/ShipLocker: TransferMicroResources is gone as of 4.0.0.400
2021-06-10 12:32:40 +01:00
Athanasius
f942e76313
monitor: BackPackMaterials shouldn't be a thing any more
2021-06-10 12:28:37 +01:00
Athanasius
c2d75e7f1d
Credits: UpgradeWeapon should now include a credits cost.
...
Need to see 4.0.0.400 event for this and UpgradeSuit to be sure they
don't also cite materials costs. But the hope is there'd be a new
empty/file `ShipLocker` event anyway.
2021-06-10 12:24:13 +01:00
Athanasius
59b410341c
ShipLocker: Can now ignore SellMicroResources for inventory purposes
...
`ShipLocker` empty/file event has full new inventory.
2021-06-10 12:22:56 +01:00
Athanasius
db43442504
ShipLocker: Ignore TradeMicroResources for inventory purposes
...
We get `ShipLocker`/file with full new inventory.
2021-06-10 12:21:40 +01:00
Athanasius
A_D
dependabot[bot]