ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'python3' of https://github.com/EDCD/EDMarketConnector into python3

Browse Source
This commit is contained in:
Athanasius 2020-07-01 22:46:10 +01:00
commit fc6fc793a0
21 changed files with 1435 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
EDMarketConnector.py
View File

@ -17,7 +17,7 @@ import _strptime # Workaround for http://bugs.python.org/issue7980
from calendar import timegm
import webbrowser
from config import appname, applongname, appversion, config
from config import appname, applongname, appversion, copyright, config
if getattr(sys, 'frozen', False):
# Under py2exe sys.path[0] is the executable name
@ -191,6 +191,8 @@ class AppWindow(object):
self.help_menu.add_command(command=self.help_privacy)
self.help_menu.add_command(command=self.help_releases)
self.help_menu.add_command(command=lambda:self.updater.checkForUpdates())
self.help_menu.add_command(command=lambda:not self.help_about.showing and self.help_about(self.w))
self.menubar.add_cascade(menu=self.help_menu)
if platform == 'win32':
# Must be added after at least one "real" menu entry
@ -348,14 +350,21 @@ class AppWindow(object):
self.theme_file_menu['text'] = _('File') # Menu title
self.theme_edit_menu['text'] = _('Edit') # Menu title
self.theme_help_menu['text'] = _('Help') # Menu title
## File menu
self.file_menu.entryconfigure(0, label=_('Status')) # Menu item
self.file_menu.entryconfigure(1, label=_('Save Raw Data...')) # Menu item
self.file_menu.entryconfigure(2, label=_('Settings')) # Item in the File menu on Windows
self.file_menu.entryconfigure(4, label=_('Exit')) # Item in the File menu on Windows
## Help menu
self.help_menu.entryconfigure(0, label=_('Documentation')) # Help menu item
self.help_menu.entryconfigure(1, label=_('Privacy Policy')) # Help menu item
self.help_menu.entryconfigure(2, label=_('Release Notes')) # Help menu item
self.help_menu.entryconfigure(3, label=_('Check for Updates...')) # Menu item
self.help_menu.entryconfigure(4, label=_("About {APP}").format(APP=applongname)) # App menu entry
## Edit menu
self.edit_menu.entryconfigure(0, label=_('Copy')) # As in Copy and Paste
def login(self):
@ -681,6 +690,91 @@ class AppWindow(object):
def help_releases(self, event=None):
webbrowser.open('https://github.com/EDCD/EDMarketConnector/releases')
class help_about(tk.Toplevel):
showing = False
def __init__(self, parent):
if self.__class__.showing:
return
self.__class__.showing = True
tk.Toplevel.__init__(self, parent)
self.parent = parent
self.title(_('About {APP}').format(APP=applongname))
if parent.winfo_viewable():
self.transient(parent)
# position over parent
if platform!='darwin' or parent.winfo_rooty()>0: # http://core.tcl.tk/tk/tktview/c84f660833546b1b84e7
self.geometry("+%d+%d" % (parent.winfo_rootx(), parent.winfo_rooty()))
# remove decoration
if platform=='win32':
self.attributes('-toolwindow', tk.TRUE)
self.resizable(tk.FALSE, tk.FALSE)
frame = ttk.Frame(self)
frame.grid(sticky=tk.NSEW)
PADX = 10
BUTTONX = 12 # indent Checkbuttons and Radiobuttons
PADY = 2 # close spacing
row = 1
############################################################
# applongname
self.appname_label = tk.Label(frame, text=applongname)
self.appname_label.grid(row=row, columnspan=3, sticky=tk.EW)
row += 1
############################################################
############################################################
# version <link to changelog>
ttk.Label(frame).grid(row=row, column=0) # spacer
row += 1
self.appversion_label = tk.Label(frame, text=appversion)
self.appversion_label.grid(row=row, column=0, sticky=tk.E)
self.appversion = HyperlinkLabel(frame, compoun=tk.RIGHT, text=_('Release Notes'), url='https://github.com/EDCD/EDMarketConnector/releases/tag/rel-{VERSION}'.format(VERSION=appversion), underline=True)
self.appversion.grid(row=row, column=2, sticky=tk.W)
row += 1
############################################################
############################################################
# <whether up to date>
############################################################
############################################################
# <copyright>
ttk.Label(frame).grid(row=row, column=0) # spacer
row += 1
self.copyright = tk.Label(frame, text=copyright)
self.copyright.grid(row=row, columnspan=3, sticky=tk.EW)
row += 1
############################################################
############################################################
# OK button to close the window
ttk.Label(frame).grid(row=row, column=0) # spacer
row += 1
button = ttk.Button(frame, text=_('OK'), command=self.apply)
button.grid(row=row, column=2, sticky=tk.E)
button.bind("<Return>", lambda event:self.apply())
self.protocol("WM_DELETE_WINDOW", self._destroy)
############################################################
print('Current version is {}'.format(appversion))
def apply(self):
self._destroy()
def _destroy(self):
self.parent.wm_attributes('-topmost', config.getint('always_ontop') and 1 or 0)
self.destroy()
self.__class__.showing = False
def save_raw(self):
self.status['text'] = _('Fetching data...')
self.w.update_idletasks()
@ -819,15 +913,8 @@ if __name__ == "__main__":
plugins_not_py3_last = config.getint('plugins_not_py3_last') or 0
if (plugins_not_py3_last + 86400) < int(time()) and len(plug.PLUGINS_not_py3):
tk.messagebox.showinfo(
'EDMC: Plugins Without Python 3.x Support', (
"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\n"
"You can disable a plugin by renaming its folder to have '.disabled' "
"on the end of the name."
)
_('EDMC: Plugins Without Python 3.x Support'),
_("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.".format(PLUGINS=_('Plugins'), FILE=_('File'), SETTINGS=_('Settings'), DISABLED='.disabled'))
)
config.set('plugins_not_py3_last', int(time()))

4
EDMarketConnector.wxs
View File

@ -18,8 +18,8 @@
Description="$(var.PRODUCTLONGNAME) installer"
InstallerVersion="300" Compressed="yes"
Platform="x86"
Languages="1033,1029,1031,1034,1035,1036,1038,1040,1041,1043,1045,1046,1049,1058,1062,2052,2070,2074,0" />
<!-- en cs, de es fi fr hu it ja nl pl pt-BR ru uk lv zh-CN pt-PT sr-Latn neutral -->
Languages="1033,1029,1031,1034,1035,1036,1038,1040,1041,1043,1045,1046,1049,1058,1062,2052,2070,2074,6170,1060,0" />
<!-- en cs, de es fi fr hu it ja nl pl pt-BR ru uk lv zh-CN pt-PT sr-Latn sr-Latn-BA sl neutral -->
<!-- https://msdn.microsoft.com/en-gb/goglobal/bb964664.aspx -->
<!-- Always reinstall since patching is problematic -->

15
L10n/cs.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Pozdržet odeslání po zadokování";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Vypnout automatickou kontrolu aktualizací aplikace, pokud jste ve hře";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Vypnuté pluginy";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Složka pluginů";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Pluginy, které nepodporují Python 3.x";
/* 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." = "Jeden nebo více aktivních pluginů ještě stále nepodporuje Python 3.x. Podívejte se na jejich seznam v záložce '{PLUGINS}' v '{FILE}' > '{SETTINGS}'. Zkontrolujte si jestli není dostupná novější verze pluginu, pokud ne, tak kontaktujte vývojáře pluginu o tom, že musí upravit jejich plugin pro Python 3.x.\n\nPlugin můžete vypnout přidáním '{DISABLED}' na konec názvu jeho složky.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Pluginy, které nepodporují Python 3.x";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Informace jak migrovat pluginy.";
/* Federation rank. [stats.py] */
"Post Captain" = "Post Captain";

15
L10n/de.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Senden verzögern bis angedockt";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Während das Spiel läuft nicht auf Updates überprüfen";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Deaktivierte Plugins";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Plugin-Ordner";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins ohne 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." = "Eins oder mehr deiner aktivierten Plugins hat noch keinen Support für Python 3.x. Du kannst dir die Liste im '{PLUGINS}'-Tab unter '{FILE}' > '{SETTINGS}' ansehen. Du solltest prüfen, ob es für diese Updates gibt und ansonsten dem Entwickler Bescheid geben, dass sie ihren Code für Python 3.x aktualisieren müssen.\n\nDu kannst ein Plugin deaktivieren, indem du dessen Ordner ein '{DISABLED}' am Ende des Namens anhängst.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Plugins ohne Python 3.x Support";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Informationen zum Migrieren von Plugins";
/* Federation rank. [stats.py] */
"Post Captain" = "Kapitän";

15
L10n/en.template
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Delay sending until docked";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Disable Automatic Application Updates Check when in-game";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Disabled Plugins";
@ -334,6 +337,18 @@
/* 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";
/* Federation rank. [stats.py] */
"Post Captain" = "Post Captain";

15
L10n/es.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Retrasar envío hasta el atraque";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Desactivar Comprobación Automática de Actualizaciones de la Aplicación mientras juega";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Plugins Desactivados";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Carpeta de Plugins";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins Sin Soporte para Python 3.x";
/* 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." = "Uno o más de tus plugins habilitados aún no tienen soporte para Python 3.x. Por favor, consulta la lista en la pestaña '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Deberías comprobar si hay una versión actualizada disponible, si no, avisa al desarrollador de que necesita actualizar el código para Python 3.x.\n\nPuedes deshabilitar un plugin cambiando el nombre de su carpeta para que tenga '{DISABLED}' al final del nombre.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Plugins sin Soporte para Python 3.x";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Información sobre migración de plugins";
/* Federation rank. [stats.py] */
"Post Captain" = "Capitán de navío";

15
L10n/fr.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Retarder l'envoi jusqu'à l'amarrage";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Désactiver la vérification automatique des mises à jour quand vous êtes en jeu";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Plugins désactivés";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Répertoire des plugins";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins non compatibles avec Python 3.x";
/* 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." = "Un ou plusieurs de vos plugins activés ne sont pas encore compatibles avec Python 3.x. Regardez la liste sur l'onglet '{PLUGINS}' de '{FILE}' > '{SETTINGS}'. Vous devriez vérifier s'il y a une version mise à jour, sinon alertez le développeur qu'il doit mettre à jour le code pour Python 3.x.\n\nVous pouvez désactiver un plugin en renommant son dossier pour qu'il ait '{DISABLED}' à la fin du nom.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Plugins non compatibles avec Python 3.x";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Informations sur la migration des plugins";
/* Federation rank. [stats.py] */
"Post Captain" = "Capitaine de Vaisseau";

15
L10n/ja.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "ドッキングするまでデータを送信しない";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "ゲーム中の自動アプリケーション更新チェックを無効にする";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "無効なプラグイン";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "プラグインフォルダ";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: プラグインがPython 3.xをサポートしていません";
/* 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." = "有効にしている1つ以上のプラグインがPython 3.xをサポートしていません。'{FILE}' > '{SETTINGS}'\nメニューで表示される設定ダイアログの'{PLUGINS}' タブの一覧を確認してください。更新済みのバージョンがあるかを確認し、なければ開発者にPython 3.xに対応するように開発者に連絡してください。\n\nプラグインを無効にするにはフォルダ名の最後に'{DISABLED}'を追加してください。";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "EDMC: プラグインがPython 3.xをサポートしていません";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "プラグインの移行に関する情報";
/* Federation rank. [stats.py] */
"Post Captain" = "Post Captain";

15
L10n/pt-PT.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Atrasar o envio até estar atracado";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Desactivar Verificação de Updates Automáticos da Aplicação enquanto joga";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Plugins Desactivados";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Pasta dos Plugins";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Plugins sem suporte para Python 3.x";
/* 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." = "Um ou mais dos plugins activados não possui ainda suporte para Python 3.x. Por favor verifique a lista na aba '{PLUGINS}' em '{FILE}' > '{SETTINGS}'. Deverá verificar se está disponível uma versão mais actualizada, caso contrário, informe o desenvolvedor de que necessita de actualizar o código para suportar Python 3.x.\n\nPode desactivar um plugin colocando '{DISABLED}' no fim do nome da pasta correspondente.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Plugins sem suporte para Python 3.x";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Informação para migração de plugins";
/* Federation rank. [stats.py] */
"Post Captain" = "Capitão de Fragata";

19
L10n/ru.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Отложить отправку данных до завершения стыковки";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Отключить автоматическое обновление приложения во время нахождения в игре.";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Отключенные плагины";
@ -140,10 +143,10 @@
"Error: Can't connect to EDDN" = "Ошибка: не удается подключиться к EDDN";
/* [edsm.py] */
"Error: Can't connect to EDSM" = "Ошибка: не удалось подключиться к EDSM";
"Error: Can't connect to EDSM" = "Ошибка: не удается подключиться к EDSM";
/* [inara.py] */
"Error: Can't connect to Inara" = "Ошибка: не удалось подключиться к Inara";
"Error: Can't connect to Inara" = "Ошибка: не удается подключиться к Inara";
/* [edsm.py] */
"Error: EDSM {MSG}" = "Ошибка: EDSM {MSG}";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Папка плагинов";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Без поддержки Python 3.x";
/* 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." = "Один или несколько ваших подключённых плагинов ещё не имеют поддержки Python 3.x. Пожалуйста, ознакомьтесь со списком во вкладке '{PLUGINS}' '{FILE}' > '{SETTINGS}'. Вы должны проверить наличие обновлённой версии, в противном случае предупредите разработчика о необходимости обновления кода на Python 3.x.\n\nВы можете отключить плагин, переименовав его папку в '{DISABLED}'.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Плагины без поддержки Python 3.x";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Информация о мигрирующих плагинах";
/* Federation rank. [stats.py] */
"Post Captain" = "Командир корабля";

432
L10n/sl.strings Normal file
View File

@ -0,0 +1,432 @@
/* Language name */
"!Language" = "Slovenščina";
/* App menu entry on OSX. [EDMarketConnector.py] */
"About {APP}" = "O {APP}";
/* Federation rank. [stats.py] */
"Admiral" = "Admiral";
/* Explorer rank. [stats.py] */
"Aimless" = "Aimless";
/* Appearance setting. [EDMarketConnector.py] */
"Always on top" = "Vedno na vrhu";
/* CQC rank. [stats.py] */
"Amateur" = "Amateur";
/* EDSM setting. [edsm.py] */
"API Key" = "API ključ";
/* Tab heading in settings. [prefs.py] */
"Appearance" = "Videz";
/* Successfully authenticated with the Frontier website. [EDMarketConnector.py] */
"Authentication successful" = "Preverjanje pristnosti je bilo uspešno";
/* Cmdr stats. [stats.py] */
"Balance" = "Ravnotežje";
/* Empire rank. [stats.py] */
"Baron" = "Baron";
/* Trade rank. [stats.py] */
"Broker" = "Broker";
/* Folder selection button on Windows. [prefs.py] */
"Browse..." = "Prebrskaj...";
/* Federation rank. [stats.py] */
"Cadet" = "Cadet";
/* CQC rank. [stats.py] */
"Champion" = "Champion";
/* Folder selection button on OSX. [prefs.py] */
"Change..." = "Spremeni...";
/* Menu item. [EDMarketConnector.py] */
"Check for Updates..." = "Preveri posodobitve...";
/* Federation rank. [stats.py] */
"Chief Petty Officer" = "Chief Petty Officer";
/* Main window. [EDMarketConnector.py] */
"Cmdr" = "Cmdr";
/* Ranking. [stats.py] */
"Combat" = "Combat";
/* EDSM setting. [edsm.py] */
"Commander Name" = "Commander ime";
/* Combat rank. [stats.py] */
"Competent" = "Competent";
/* Tab heading in settings. [prefs.py] */
"Configuration" = "Konfiguracija";
/* Update button in main window. [EDMarketConnector.py] */
"cooldown {SS}s" = "Posodobitev v {SS}s";
/* As in Copy and Paste. [EDMarketConnector.py] */
"Copy" = "Kopiraj";
/* Empire rank. [stats.py] */
"Count" = "Count";
/* Ranking. [stats.py] */
"CQC" = "CQC";
/* Combat rank. [stats.py] */
"Dangerous" = "Dangerous";
/* Appearance theme setting. [prefs.py] */
"Dark" = "Temno";
/* Combat rank. [stats.py] */
"Deadly" = "Deadly";
/* Trade rank. [stats.py] */
"Dealer" = "Dealer";
/* Appearance theme and language setting. [l10n.py] */
"Default" = "Privzeta";
/* Help menu item. [EDMarketConnector.py] */
"Documentation" = "Dokumentacija";
/* Empire rank. [stats.py] */
"Duke" = "Duke";
/* Empire rank. [stats.py] */
"Earl" = "Earl";
/* Menu title. [EDMarketConnector.py] */
"Edit" = "Uredi";
/* Top rank. [stats.py] */
"Elite" = "Elite";
/* Section heading in settings. [edsm.py] */
"Elite Dangerous Star Map credentials" = "EDStarMap uporabniški podatki";
/* Ranking. [stats.py] */
"Empire" = "Cesarstvo";
/* Federation rank. [stats.py] */
"Ensign" = "Ensign";
/* Trade rank. [stats.py] */
"Entrepreneur" = "Enterpreneur";
/* [eddn.py] */
"Error: Can't connect to EDDN" = "Napaka: povezava z EDDN ni mogoča";
/* [edsm.py] */
"Error: Can't connect to EDSM" = "Napaka: Povezava z EDSM ni mogoča";
/* [edsm.py] */
"Error: EDSM {MSG}" = "Napaka: EDSM {MSG}";
/* [companion.py] */
"Error: Invalid Credentials" = "Napaka: napačno uporabniški ime ali geslo";
/* Item in the File menu on Windows. [EDMarketConnector.py] */
"Exit" = "Izhod";
/* Combat rank. [stats.py] */
"Expert" = "Expert";
/* Ranking. [stats.py] */
"Explorer" = "Explorer";
/* Ranking. [stats.py] */
"Federation" = "Federacija";
/* [EDMarketConnector.py] */
"Fetching data..." = "Nalagam podatke...";
/* Menu title. [EDMarketConnector.py] */
"File" = "Datoteka";
/* Section heading in settings. [prefs.py] */
"File location" = "Lokacija datoteke";
/* CQC rank. [stats.py] */
"Gladiator" = "Gladiator";
/* Combat rank. [stats.py] */
"Harmless" = "Harmless";
/* Menu title. [EDMarketConnector.py] */
"Help" = "Pomoč";
/* CQC rank. [stats.py] */
"Helpless" = "Helpless";
/* CQC rank. [stats.py] */
"Hero" = "Hero";
/* Hotkey/Shortcut settings prompt on Windows. [prefs.py] */
"Hotkey" = "Bližnjica";
/* Hotkey/Shortcut settings prompt on OSX. [prefs.py] */
"Keyboard shortcut" = "Bližnjica";
/* Empire rank. [stats.py] */
"King" = "King";
/* Empire rank. [stats.py] */
"Knight" = "Knight";
/* Appearance setting prompt. [prefs.py] */
"Language" = "Jezik";
/* [EDMarketConnector.py] */
"Last updated at {HH}:{MM}:{SS}" = "Zadnja osvežitev podatkov {HH}:{MM}:{SS} ";
/* Federation rank. [stats.py] */
"Lieutenant" = "LIeutenant";
/* Federation rank. [stats.py] */
"Lieutenant Commander" = "Lieutenant Commander";
/* Cmdr stats. [stats.py] */
"Loan" = "Posojilo";
/* [EDMarketConnector.py] */
"Logging in..." = "Prijava v teku... ";
/* Empire rank. [stats.py] */
"Lord" = "Lord";
/* [prefs.py] */
"Market data in CSV format file" = "Podatki trga v CSV formatu";
/* [prefs.py] */
"Market data in Trade Dangerous format file" = "Podatki trga v Trade Dangerous formatu";
/* Empire rank. [stats.py] */
"Marquis" = "Marquis";
/* Combat rank. [stats.py] */
"Master" = "Master";
/* Trade rank. [stats.py] */
"Merchant" = "Merchant";
/* Federation rank. [stats.py] */
"Midshipman" = "Midshipman";
/* Explorer rank. [stats.py] */
"Mostly Aimless" = "Mostly Aimless";
/* Combat rank. [stats.py] */
"Mostly Harmless" = "Mostly Harmless";
/* CQC rank. [stats.py] */
"Mostly Helpless" = "Mostly Helpless";
/* Trade rank. [stats.py] */
"Mostly Penniless" = "Mostly peniless";
/* No hotkey/shortcut currently defined. [prefs.py] */
"None" = "Brez";
/* Combat rank. [stats.py] */
"Novice" = "Novice";
/* [prefs.py] */
"OK" = "Potrdi";
/* Hotkey/Shortcut setting. [prefs.py] */
"Only when Elite: Dangerous is the active app" = "Samo ko je Elite:Dangerous aktivna aplikacija ";
/* Shortcut settings button on OSX. [prefs.py] */
"Open System Preferences" = "Odpri sistemske nastavitve";
/* Tab heading in settings. [prefs.py] */
"Output" = "Izpis";
/* Empire rank. [stats.py] */
"Outsider" = "Outsider";
/* Explorer rank. [stats.py] */
"Pathfinder" = "Pathfinder";
/* Trade rank. [stats.py] */
"Peddler" = "Peddler";
/* Trade rank. [stats.py] */
"Penniless" = "Peniless";
/* Federation rank. [stats.py] */
"Petty Officer" = "Petty Officer";
/* Explorer rank. [stats.py] */
"Pioneer" = "Pioneer";
/* Hotkey/Shortcut setting. [prefs.py] */
"Play sound" = "Sproži zvok";
/* [prefs.py] */
"Please choose what data to save" = "Izberite podatke, ki jih želite shraniti";
/* Federation rank. [stats.py] */
"Post Captain" = "Post Captain";
/* Federation rank. [stats.py] */
"Post Commander" = "Post Commander";
/* Ranking. [stats.py] */
"Powerplay" = "Igra moči";
/* [prefs.py] */
"Preferences" = "Nastavitve";
/* Empire rank. [stats.py] */
"Prince" = "Prince";
/* Help menu item. [EDMarketConnector.py] */
"Privacy Policy" = "Pravilnik o zasebnosti";
/* CQC rank. [stats.py] */
"Professional" = "Professional";
/* Explorer rank. [stats.py] */
"Ranger" = "Ranger";
/* Power rank. [stats.py] */
"Rating 1" = "Ocena 1";
/* Power rank. [stats.py] */
"Rating 2" = "Ocena 2";
/* Power rank. [stats.py] */
"Rating 3" = "Ocena 3";
/* Power rank. [stats.py] */
"Rating 4" = "Ocena 4";
/* Power rank. [stats.py] */
"Rating 5" = "Ocena 5";
/* Shortcut settings prompt on OSX. [prefs.py] */
"Re-start {APP} to use shortcuts" = "Ponovno poženi {APP} za uporabo bližnjic";
/* Federation rank. [stats.py] */
"Rear Admiral" = "Read Admiral";
/* Federation rank. [stats.py] */
"Recruit" = "Recruit";
/* Help menu item. [EDMarketConnector.py] */
"Release Notes" = "Opombe ob izdaji";
/* Multicrew role label in main window. [EDMarketConnector.py] */
"Role" = "Vloga";
/* Menu item. [EDMarketConnector.py] */
"Save Raw Data..." = "Shrani Izvirne Podatke...";
/* Explorer rank. [stats.py] */
"Scout" = "Scout";
/* CQC rank. [stats.py] */
"Semi Professional" = "Semi Professional";
/* Output setting. [eddn.py] */
"Send station data to the Elite Dangerous Data Network" = "Pošlji podatke postaje na EDDN";
/* [eddn.py] */
"Sending data to EDDN..." = "Pošiljam podatke na EDDN";
/* Empire rank. [stats.py] */
"Serf" = "Serif";
/* Item in the File menu on Windows. [EDMarketConnector.py] */
"Settings" = "Nastavitve";
/* Main window. [EDMarketConnector.py] */
"Ship" = "Ladja";
/* Output setting. [prefs.py] */
"Ship loadout" = "Oprema ladje";
/* Status dialog title. [stats.py] */
"Ships" = "Ladje";
/* Empire rank. [stats.py] */
"Squire" = "Squire";
/* Main window. [EDMarketConnector.py] */
"Station" = "Postaja";
/* [EDMarketConnector.py] */
"Station doesn't have a market!" = "Postaja nima trga";
/* [EDMarketConnector.py] */
"Station doesn't have anything!" = "Postaja nima ničesar";
/* Menu item. [EDMarketConnector.py] */
"Status" = "Status";
/* Explorer rank. [stats.py] */
"Surveyor" = "Surveyor";
/* Main window. [EDMarketConnector.py] */
"System" = "Sistem";
/* Appearance setting. [prefs.py] */
"Theme" = "Tema";
/* Ranking. [stats.py] */
"Trade" = "Trgovanje";
/* Explorer rank. [stats.py] */
"Trailblazer" = "Trailblazer";
/* Appearance theme setting. [prefs.py] */
"Transparent" = "Prosojno";
/* Trade rank. [stats.py] */
"Tycoon" = "Tycoon";
/* Update button in main window. [EDMarketConnector.py] */
"Update" = "Osveži";
/* Status dialog subtitle - CR value of ship. [stats.py] */
"Value" = "Vrednost";
/* Federation rank. [stats.py] */
"Vice Admiral" = "Vice Admiral";
/* Menu title on OSX. [EDMarketConnector.py] */
"View" = "Pogled";
/* Empire rank. [stats.py] */
"Viscount" = "Viscount";
/* Federation rank. [stats.py] */
"Warrant Officer" = "Warrant Officer";
/* Shouldn't happen. [EDMarketConnector.py] */
"What are you flying?!" = "S čim letiš";
/* Shouldn't happen. [EDMarketConnector.py] */
"Where are you?!" = "Kje se nahajaš";
/* Shouldn't happen. [EDMarketConnector.py] */
"Who are you?!" = "Kdo si";
/* Menu title on OSX. [EDMarketConnector.py] */
"Window" = "Okno";
/* [EDMarketConnector.py] */
"You're not docked at a station!" = "Nahajš se v postaji!";
/* Shortcut settings prompt on OSX. [prefs.py] */
"{APP} needs permission to use shortcuts" = "{APP} potrebuje dovoljenja za uporabo bližnjic";

525
L10n/sr-Latn-BA.strings Normal file
View File

@ -0,0 +1,525 @@
/* Language name */
"!Language" = "Srpski (Latinica, BiH)";
/* App menu entry on OSX. [EDMarketConnector.py] */
"About {APP}" = "O {APP}";
/* Federation rank. [stats.py] */
"Admiral" = "Admiral";
/* Explorer rank. [stats.py] */
"Aimless" = "Aimless";
/* Appearance setting. [EDMarketConnector.py] */
"Always on top" = "Uvijek na vrhu";
/* CQC rank. [stats.py] */
"Amateur" = "Amateur";
/* EDSM setting. [edsm.py] */
"API Key" = "API ključ";
/* Tab heading in settings. [prefs.py] */
"Appearance" = "Izgled";
/* Successfully authenticated with the Frontier website. [EDMarketConnector.py] */
"Authentication successful" = "Autentifikacija uspješna";
/* Output setting. [prefs.py] */
"Automatically update on docking" = "Automatsko slanje nakon pristajanja";
/* Cmdr stats. [stats.py] */
"Balance" = "Balans";
/* Empire rank. [stats.py] */
"Baron" = "Baron";
/* Trade rank. [stats.py] */
"Broker" = "Broker";
/* Folder selection button on Windows. [prefs.py] */
"Browse..." = "Potraži...";
/* Federation rank. [stats.py] */
"Cadet" = "Cadet";
/* CQC rank. [stats.py] */
"Champion" = "Champion";
/* Folder selection button on OSX. [prefs.py] */
"Change..." = "Promijeni...";
/* Menu item. [EDMarketConnector.py] */
"Check for Updates..." = "Provjeri nadogradnje...";
/* Federation rank. [stats.py] */
"Chief Petty Officer" = "Chief Petty Officer";
/* Main window. [EDMarketConnector.py] */
"Cmdr" = "Cmdr";
/* Ranking. [stats.py] */
"Combat" = "Borba (Combat)";
/* EDSM setting. [edsm.py] */
"Commander Name" = "Ime komandanta";
/* Combat rank. [stats.py] */
"Competent" = "Competent";
/* Tab heading in settings. [prefs.py] */
"Configuration" = "Konfiguracija";
/* Update button in main window. [EDMarketConnector.py] */
"cooldown {SS}s" = "pauza {SS}s";
/* As in Copy and Paste. [EDMarketConnector.py] */
"Copy" = "Kopiraj";
/* Empire rank. [stats.py] */
"Count" = "Count";
/* Ranking. [stats.py] */
"CQC" = "CQC";
/* Combat rank. [stats.py] */
"Dangerous" = "Dangerous";
/* Appearance theme setting. [prefs.py] */
"Dark" = "Tamna";
/* Combat rank. [stats.py] */
"Deadly" = "Deadly";
/* Trade rank. [stats.py] */
"Dealer" = "Dealer";
/* Appearance theme and language setting. [l10n.py] */
"Default" = "Standardna";
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Odgodi slanje do pristajanja";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Isključi automatsku provjeru nadogradnji za vrijeme igranja";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Deaktivirani dodaci (plugins)";
/* Help menu item. [EDMarketConnector.py] */
"Documentation" = "Dokumentacija";
/* Empire rank. [stats.py] */
"Duke" = "Duke";
/* Location of the new Journal file in E:D 2.2. [EDMarketConnector.py] */
"E:D journal file location" = "Lokacija E:D journal fajlova";
/* Empire rank. [stats.py] */
"Earl" = "Earl";
/* Menu title. [EDMarketConnector.py] */
"Edit" = "Uredi";
/* Top rank. [stats.py] */
"Elite" = "Elite";
/* Section heading in settings. [edsm.py] */
"Elite Dangerous Star Map credentials" = "Kredencijali za Elite Dangerous Star Map";
/* Ranking. [stats.py] */
"Empire" = "Imperija (Empire)";
/* List of plugins in settings. [prefs.py] */
"Enabled Plugins" = "Aktivirani dodaci (plugins)";
/* Federation rank. [stats.py] */
"Ensign" = "Ensign";
/* Trade rank. [stats.py] */
"Entrepreneur" = "Entrepreneur";
/* [eddn.py] */
"Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje sa EDDN";
/* [edsm.py] */
"Error: Can't connect to EDSM" = "Greška: Nemoguće povezivanje sa EDSM";
/* [inara.py] */
"Error: Can't connect to Inara" = "Greška: Nemoguće povezivanje sa Inara";
/* [edsm.py] */
"Error: EDSM {MSG}" = "Greška: EDSM {MSG}";
/* Raised when cannot contact the Companion API server. [companion.py] */
"Error: Frontier server is down" = "Greška: Frontier server je nedostupan";
/* Raised when Companion API server is returning old data, e.g. when the servers are too busy. [companion.py] */
"Error: Frontier server is lagging" = "Greška: Frontier server je usporen";
/* Raised when the Companion API server thinks that the user has not purchased E:D. i.e. doesn't have the correct 'SKU'. [companion.py] */
"Error: Frontier server SKU problem" = "Greška: SKU problem na Frontier serveru";
/* [inara.py] */
"Error: Inara {MSG}" = "Greška: Inara {MSG}";
/* [companion.py] */
"Error: Invalid Credentials" = "Greška: Neispravni kredencijali";
/* 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" = "Greška: Pogrešan Cmdr";
/* Item in the File menu on Windows. [EDMarketConnector.py] */
"Exit" = "Izlaz";
/* Combat rank. [stats.py] */
"Expert" = "Expert";
/* Ranking. [stats.py] */
"Explorer" = "Istraživanje (Explorer)";
/* Ranking. [stats.py] */
"Federation" = "Federacija (Federation)";
/* [EDMarketConnector.py] */
"Fetching data..." = "Preuzimanje podataka...";
/* Multicrew role. [EDMarketConnector.py] */
"Fighter" = "Fighter";
/* Menu title. [EDMarketConnector.py] */
"File" = "Fajl";
/* Section heading in settings. [prefs.py] */
"File location" = "Lokacija fajlova";
/* CQC rank. [stats.py] */
"Gladiator" = "Gladiator";
/* Multicrew role. [EDMarketConnector.py] */
"Gunner" = "Gunner";
/* Combat rank. [stats.py] */
"Harmless" = "Harmless";
/* Multicrew role. [EDMarketConnector.py] */
"Helm" = "Helm";
/* Menu title. [EDMarketConnector.py] */
"Help" = "Pomoć";
/* CQC rank. [stats.py] */
"Helpless" = "Helpless";
/* CQC rank. [stats.py] */
"Hero" = "Hero";
/* Dark theme color setting. [prefs.py] */
"Highlighted text" = "Označeni tekst";
/* Hotkey/Shortcut settings prompt on Windows. [prefs.py] */
"Hotkey" = "Prečica";
/* Section heading in settings. [inara.py] */
"Inara credentials" = "Kredencijali za Inara";
/* Hotkey/Shortcut settings prompt on OSX. [prefs.py] */
"Keyboard shortcut" = "Prečica";
/* Empire rank. [stats.py] */
"King" = "King";
/* Empire rank. [stats.py] */
"Knight" = "Knight";
/* Appearance setting prompt. [prefs.py] */
"Language" = "Jezik";
/* [EDMarketConnector.py] */
"Last updated at {HH}:{MM}:{SS}" = "Posljednji put osvježeno {HH}:{MM}:{SS}";
/* Federation rank. [stats.py] */
"Lieutenant" = "Lieutenant";
/* Federation rank. [stats.py] */
"Lieutenant Commander" = "Lieutenant Commander";
/* Cmdr stats. [stats.py] */
"Loan" = "Zajam";
/* [EDMarketConnector.py] */
"Logging in..." = "Prijavljivanje...";
/* Empire rank. [stats.py] */
"Lord" = "Lord";
/* [prefs.py] */
"Market data in CSV format file" = "Fajl sa market podacima u CSV formatu";
/* [prefs.py] */
"Market data in Trade Dangerous format file" = "Fajl sa market podacima u Trade Dangerous formatu";
/* Empire rank. [stats.py] */
"Marquis" = "Marquis";
/* Combat rank. [stats.py] */
"Master" = "Master";
/* Trade rank. [stats.py] */
"Merchant" = "Merchant";
/* Federation rank. [stats.py] */
"Midshipman" = "Midshipman";
/* Explorer rank. [stats.py] */
"Mostly Aimless" = "Mostly Aimless";
/* Combat rank. [stats.py] */
"Mostly Harmless" = "Mostly Harmless";
/* CQC rank. [stats.py] */
"Mostly Helpless" = "Mostly Helpless";
/* Trade rank. [stats.py] */
"Mostly Penniless" = "Mostly Penniless";
/* No hotkey/shortcut currently defined. [prefs.py] */
"None" = "Nije definisano";
/* Dark theme color setting. [prefs.py] */
"Normal text" = "Normalan tekst";
/* Combat rank. [stats.py] */
"Novice" = "Novice";
/* [prefs.py] */
"OK" = "OK";
/* Hotkey/Shortcut setting. [prefs.py] */
"Only when Elite: Dangerous is the active app" = "Samo kada je Elite: Dangerous aktivna aplikacija";
/* Button that opens a folder in Explorer/Finder. [prefs.py] */
"Open" = "Otvori";
/* Shortcut settings button on OSX. [prefs.py] */
"Open System Preferences" = "Otvori sistemska podešavanja";
/* Tab heading in settings. [prefs.py] */
"Output" = "Izvoz";
/* Empire rank. [stats.py] */
"Outsider" = "Outsider";
/* Explorer rank. [stats.py] */
"Pathfinder" = "Pathfinder";
/* Trade rank. [stats.py] */
"Peddler" = "Peddler";
/* Trade rank. [stats.py] */
"Penniless" = "Penniless";
/* Federation rank. [stats.py] */
"Petty Officer" = "Petty Officer";
/* Explorer rank. [stats.py] */
"Pioneer" = "Pioneer";
/* Hotkey/Shortcut setting. [prefs.py] */
"Play sound" = "Zvučni efekat";
/* [prefs.py] */
"Please choose what data to save" = "Izaberite koji podaci se snimaju";
/* Tab heading in settings. [prefs.py] */
"Plugins" = "Dodaci (plugins)";
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Folder za dodatke (plugins)";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške";
/* 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." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Provjerite da li postoji nadograđena verzija ili obavijesite autora da treba da promijeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Dodaci (plugins) bez Python 3.x podrške";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Informacije o migraciji dodataka (plugins)";
/* Federation rank. [stats.py] */
"Post Captain" = "Post Captain";
/* Federation rank. [stats.py] */
"Post Commander" = "Post Commander";
/* Ranking. [stats.py] */
"Powerplay" = "Powerplay";
/* [prefs.py] */
"Preferences" = "Podešavanja";
/* Settings prompt for preferred ship loadout, system and station info websites. [prefs.py] */
"Preferred websites" = "Preferirani web sajtovi";
/* Empire rank. [stats.py] */
"Prince" = "Prince";
/* Help menu item. [EDMarketConnector.py] */
"Privacy Policy" = "Politika privatnosti";
/* CQC rank. [stats.py] */
"Professional" = "Professional";
/* Explorer rank. [stats.py] */
"Ranger" = "Ranger";
/* Power rank. [stats.py] */
"Rating 1" = "Rating 1";
/* Power rank. [stats.py] */
"Rating 2" = "Rating 2";
/* Power rank. [stats.py] */
"Rating 3" = "Rating 3";
/* Power rank. [stats.py] */
"Rating 4" = "Rating 4";
/* Power rank. [stats.py] */
"Rating 5" = "Rating 5";
/* Shortcut settings prompt on OSX. [prefs.py] */
"Re-start {APP} to use shortcuts" = "Restartujte {APP} da bi ste koristili prečice";
/* Federation rank. [stats.py] */
"Rear Admiral" = "Rear Admiral";
/* Federation rank. [stats.py] */
"Recruit" = "Recruit";
/* Help menu item. [EDMarketConnector.py] */
"Release Notes" = "Informacije o verziji";
/* Multicrew role label in main window. [EDMarketConnector.py] */
"Role" = "Uloga";
/* Menu item. [EDMarketConnector.py] */
"Save Raw Data..." = "Snimi sirove podatke...";
/* Explorer rank. [stats.py] */
"Scout" = "Scout";
/* CQC rank. [stats.py] */
"Semi Professional" = "Semi Professional";
/* [edsm.py] */
"Send flight log and Cmdr status to EDSM" = "Pošalji log leta i Cmdr status na EDSM";
/* [inara.py] */
"Send flight log and Cmdr status to Inara" = "Pošalji log leta i Cmdr status na Inara";
/* Output setting. [eddn.py] */
"Send station data to the Elite Dangerous Data Network" = "Slanje podataka o stanici na Elite Dangerous Data Network";
/* Output setting new in E:D 2.2. [eddn.py] */
"Send system and scan data to the Elite Dangerous Data Network" = "Slanje podataka o sistemu i skeniranju na Elite Dangerous Data Network";
/* [eddn.py] */
"Sending data to EDDN..." = "Slanje podataka na EDDN...";
/* Empire rank. [stats.py] */
"Serf" = "Serf";
/* Item in the File menu on Windows. [EDMarketConnector.py] */
"Settings" = "Podešavanja";
/* Main window. [EDMarketConnector.py] */
"Ship" = "Brod";
/* Output setting. [prefs.py] */
"Ship loadout" = "Brodska oprema";
/* Status dialog title. [stats.py] */
"Ships" = "Brodovi";
/* Setting to decide which ship outfitting website to link to - either E:D Shipyard or Coriolis. [prefs.py] */
"Shipyard" = "Brodogradilište";
/* Empire rank. [stats.py] */
"Squire" = "Squire";
/* Main window. [EDMarketConnector.py] */
"Station" = "Stanica";
/* [EDMarketConnector.py] */
"Station doesn't have a market!" = "Stanica nema market!";
/* [EDMarketConnector.py] */
"Station doesn't have anything!" = "Stanica nema ništa!";
/* Menu item. [EDMarketConnector.py] */
"Status" = "Status";
/* Explorer rank. [stats.py] */
"Surveyor" = "Surveyor";
/* Main window. [EDMarketConnector.py] */
"System" = "Sistem";
/* Appearance setting. [prefs.py] */
"Theme" = "Tema";
/* Help text in settings. [prefs.py] */
"Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Savjet: Možete da deaktivirate dodatak (plugin){CR}dodavanjem '{EXT}' na ime njegovog foldera";
/* Ranking. [stats.py] */
"Trade" = "Trgovina (Trade)";
/* Explorer rank. [stats.py] */
"Trailblazer" = "Trailblazer";
/* Appearance theme setting. [prefs.py] */
"Transparent" = "Prozirna";
/* Trade rank. [stats.py] */
"Tycoon" = "Tycoon";
/* Update button in main window. [EDMarketConnector.py] */
"Update" = "Osvježi";
/* Status dialog subtitle - CR value of ship. [stats.py] */
"Value" = "Vrijednost";
/* Federation rank. [stats.py] */
"Vice Admiral" = "Vice Admiral";
/* Menu title on OSX. [EDMarketConnector.py] */
"View" = "Pogled";
/* Empire rank. [stats.py] */
"Viscount" = "Viscount";
/* Federation rank. [stats.py] */
"Warrant Officer" = "Warrant Officer";
/* Shouldn't happen. [EDMarketConnector.py] */
"What are you flying?!" = "U čemu letite?!";
/* Shouldn't happen. [EDMarketConnector.py] */
"Where are you?!" = "Gdje se nalazite?!";
/* Shouldn't happen. [EDMarketConnector.py] */
"Who are you?!" = "Ko ste vi?!";
/* Menu title on OSX. [EDMarketConnector.py] */
"Window" = "Prozor";
/* [EDMarketConnector.py] */
"You're not docked at a station!" = "Niste pristali na stanicu";
/* Shortcut settings prompt on OSX. [prefs.py] */
"{APP} needs permission to use shortcuts" = "{APP} traži dozvolu da koristi prečice";

15
L10n/sr-Latn.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Odloži slanje pre pristajanja";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Isključi automatsko proveravanje izmena aplikacije za vreme igranja";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Deaktivirani dodaci (plugins)";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Folder za dodatke (plugins)";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Dodaci (plugins) bez Python 3.x podrške";
/* 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." = "Jedan ili više aktiviranih dodataka (plugins) nemaju podršku za Python 3.x. Pogledajte listu u '{PLUGINS}' tabu u '{FILE}' > '{SETTINGS}'. Proverite da li postoji nadograđena verzija ili obavesite autora da treba da promeni kod za Python 3.x.\n\nMožete deaktivirati dodatak (plugin) dodavanjem '{DISABLED}' na kraju imena njegovog foldera.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Dodaci (plugins) bez Python 3.x podrške";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Informacije o migraciji dodataka (plugins)";
/* Federation rank. [stats.py] */
"Post Captain" = "Post Captain";

19
L10n/uk.strings
View File

@ -100,6 +100,9 @@
/* Output setting under 'Send system and scan data to the Elite Dangerous Data Network' new in E:D 2.2. [eddn.py] */
"Delay sending until docked" = "Відкласти відправку даних до стикування";
/* Option to disabled Automatic Check For Updates whilst in-game [prefs.py] */
"Disable Automatic Application Updates Check when in-game" = "Вимкнути автоматичні перевірки оновлення додатку, коли в грі";
/* List of plugins in settings. [prefs.py] */
"Disabled Plugins" = "Вимкнені плагіни";
@ -206,7 +209,7 @@
"Help" = "Довідка";
/* CQC rank. [stats.py] */
"Helpless" = "Безпомічний";
"Helpless" = "Безпорадний";
/* CQC rank. [stats.py] */
"Hero" = "Герой";
@ -334,6 +337,18 @@
/* Section heading in settings. [prefs.py] */
"Plugins folder" = "Сховище плагінів";
/* Popup title: Warning about plugins without Python 3.x support [EDMarketConnector.py] */
"EDMC: Plugins Without Python 3.x Support" = "EDMC: Плагіни без підтримки Python 3.x!";
/* 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." = "Один або кілька увімкнених плагінів ще не підтримують Python 3.x. Перегляньте список на вкладці '{PLUGINS}' в '{FILE}' > '{SETTINGS}'. Ви повинні перевірити, чи є в наявності оновлена ​​версія, інакше повідомити розробника плагіну про те, що їм потрібно оновити код для Python 3.x.\n\nВи можете відключити плагін, перейменувавши його папку додавши '{DISABLED}' в кінці назви.";
/* Settings>Plugins>Plugins without Python 3.x support [prefs.py] */
"Plugins Without Python 3.x Support" = "Плагіни без підтримки Python 3.x";
/* Settings>Plugins>Information on migrating plugins [prefs.py] */
"Information on migrating plugins" = "Інформація про міграцію плагінів";
/* Federation rank. [stats.py] */
"Post Captain" = "Капітан I рангу";
@ -431,7 +446,7 @@
"Ships" = "Кораблі";
/* Setting to decide which ship outfitting website to link to - either E:D Shipyard or Coriolis. [prefs.py] */
"Shipyard" = "Верф";
"Shipyard" = "Корабельна верф";
/* Empire rank. [stats.py] */
"Squire" = "Зброєносець";

1
config.py
View File

@ -9,6 +9,7 @@ appname = 'EDMarketConnector'
applongname = 'E:D Market Connector'
appcmdname = 'EDMC'
appversion = '3.5.1.0'
copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'
update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml'
update_interval = 8*60*60

91
docs/Translations.md Normal file
View File

@ -0,0 +1,91 @@
Introduction
===
Translations are handled on [OneSky](https://oneskyapp.com/), specifically in [this project](https://marginal.oneskyapp.com/collaboration/project/52710).
Adding A New Phrase
===
Setting it up in the code
---
If you add any new strings that appear in the application UI, e.g. new configuration options, then you should specify them as:
_('Text that appears in UI')
`_()` is a special global function that then handles the translation, using its single argument, plus the configured language, to look up the appropriate text.
If you need to specify something in the text that shouldn't be translated then use the form:
_('Some text with a {WORD} not translated'.format(WORD='word'))
This way 'word' will always be used literally.
Next you will need to edit `L10n/en.template` to add the phrase:
/* <use of this phrase> [<file it was first added in>] */
"<text as it appears in the code>" = "<English version of the text>";
e.g.
/* Successfully authenticated with the Frontier website. [EDMarketConnector.py] */
"Authentication successful" = "Authentication successful";
which matches with:
self.status['text'] = _('Authentication successful') # Successfully authenticated with the Frontier website
and
/* Help text in settings. [prefs.py] */
"Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name" = "Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name";
which matches with:
nb.Label(plugsframe, text=_("Tip: You can disable a plugin by{CR}adding '{EXT}' to its folder name").format(EXT='.disabled')).grid( # Help text in settings
`{CR}` is handled in `l10n.py`, translating to a unicode `\n`. See the code in`l10n.py` for any other such special substitutions.
You can even use other translations within a given string, e.g.:
_("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.".format(PLUGINS=_('Plugins'), FILE=_('File'), SETTINGS=_('Settings'), DISABLED='.disabled'))
/* 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.";
Adding it to the OneSky project
---
You will, of course, need admin access to the project. Jonathan Harris (aka Maringal, aka Otis) still handles this. Check for this email address in github commits if you need to get in touch.
1. Copy `L10n/en.template` to `en.strings` somewhere. It needs to be this name for OneSky to accept it as an upload.
1. In [the project](https://marginal.oneskyapp.com/admin/page/list/project/52710) click the `+` next to "Files"
1. Select the copied `en.strings` file.
1. **Make sure that you select "Deprecate" for the "Do you want to deprecate phrases uploaded before but not in this batch? " option.**
1. Click the "Import files now" button.
1. Check that the new phrases are listed properly on [the phrases list](https://marginal.oneskyapp.com/admin/phrase/list/project/52710). Use the search dialogue on the 'code text' to find them.
All project admins will get a notification of the new upload. Now you wait for translators to work on the new/changed phrases.
Updating Translations In The Code
===
Once you have new/changed translations on OneSky you'll want to update the code to use them.
1. Navigate to the [Translation Overview](https://marginal.oneskyapp.com/admin/project/dashboard/project/52710) then click on "Download Translation" which should bring you to [Download](https://marginal.oneskyapp.com/admin/export/phrases/project/52710).
1. In "File format" select ".strings (iOS/MacOS)".
1. "All languages" should already be selected in the "Languages filter". If not, select it.
1. Likewise "All files" should already be selected in "File Filter".
1. Click "Export". After a short delay you should be offered a file "EDMarketConnector.zip" for download.
1. Access the contents of this zip file, extracting *all* the files into `L10n/` in the code.
1. Rename the "en.strings" file to "en.template".
1. Commit the changes to git.
Adding a New Language
===
To add a new language to the app:
1. open [EDMarketConnector - Miscellaneous Manage Languages](https://marginal.oneskyapp.com/admin/project/languages/project/52710)
1. Search for the language.
1. Ensure you have the correct one if there are variants.
1. Click the `+` on the right hand side to add the language.
Remember that until there are translations all strings will default to the English version (actually the key, which is always specified in English).
You will also want to add it to the installer. This is simple enough, only requiring you add a number to an array in `EDMarketConnector.wxs`.
1. In `EDMarketConnector.wxs` find the line beginning `Languages="1033,`, e.g.
Languages="1033,1029,1031,1034,1035,1036,1038,1040,1041,1043,1045,1046,1049,1058,1062,2052,2070,2074,6170,0" />
1. Now you'll need to consult the latest [[MS-LCID]: Windows Language Code Identifier (LCID) Reference](https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/70feba9f-294e-491e-b6eb-56532684c37f) for the correct numerical code to add to the list.
1. Convert the hexadecimal Language ID to the equivalent in decimal.
1. Add the new decimal value as the last but one value in the list, keeping the `,0` at the end.
1. Update the comment on the next line to reflect what you added.

16
monitor.py
View File

@ -82,6 +82,7 @@ class EDLogs(FileSystemEventHandler):
self.planet = None
self.system = None
self.station = None
self.station_marketid = None
self.stationtype = None
self.coordinates = None
self.systemaddress = None
@ -166,7 +167,7 @@ class EDLogs(FileSystemEventHandler):
if __debug__:
print('Stopping monitoring Journal')
self.currentdir = None
self.version = self.mode = self.group = self.cmdr = self.planet = self.system = self.station = self.stationtype = self.stationservices = self.coordinates = self.systemaddress = None
self.version = self.mode = self.group = self.cmdr = self.planet = self.system = self.station = self.station_marketid = self.stationtype = self.stationservices = self.coordinates = self.systemaddress = None
self.is_beta = False
if self.observed:
self.observed = None
@ -222,6 +223,7 @@ class EDLogs(FileSystemEventHandler):
('StarSystem', self.system),
('StarPos', self.coordinates),
('SystemAddress', self.systemaddress),
('Population', self.systempopulation),
])
if self.planet:
entry['Body'] = self.planet
@ -229,6 +231,7 @@ class EDLogs(FileSystemEventHandler):
if self.station:
entry['StationName'] = self.station
entry['StationType'] = self.stationtype
entry['MarketID'] = self.station_marketid
self.event_queue.append(json.dumps(entry, separators=(', ', ':')))
else:
self.event_queue.append(None) # Generate null event to update the display (with possibly out-of-date info)
@ -305,6 +308,7 @@ class EDLogs(FileSystemEventHandler):
self.planet = None
self.system = None
self.station = None
self.station_marketid = None
self.stationtype = None
self.stationservices = None
self.coordinates = None
@ -344,6 +348,7 @@ class EDLogs(FileSystemEventHandler):
self.planet = None
self.system = None
self.station = None
self.station_marketid = None
self.stationtype = None
self.stationservices = None
self.coordinates = None
@ -429,6 +434,7 @@ class EDLogs(FileSystemEventHandler):
self.state['Modules'].pop(entry['FromSlot'], None)
elif entry['event'] in ['Undocked']:
self.station = None
self.station_marketid = None
self.stationtype = None
self.stationservices = None
elif entry['event'] in ['Location', 'FSDJump', 'Docked', 'CarrierJump']:
@ -441,8 +447,13 @@ class EDLogs(FileSystemEventHandler):
elif self.system != entry['StarSystem']:
self.coordinates = None # Docked event doesn't include coordinates
self.systemaddress = entry.get('SystemAddress')
if entry['event'] in ['Location', 'FSDJump', 'CarrierJump']:
self.systempopulation = entry.get('Population')
(self.system, self.station) = (entry['StarSystem'] == 'ProvingGround' and 'CQC' or entry['StarSystem'],
entry.get('StationName')) # May be None
self.station_marketid = entry.get('MarketID') # May be None
self.stationtype = entry.get('StationType') # May be None
self.stationservices = entry.get('StationServices') # None under E:D < 2.4
elif entry['event'] == 'ApproachBody':
@ -595,6 +606,7 @@ class EDLogs(FileSystemEventHandler):
self.planet = None
self.system = None
self.station = None
self.station_marketid = None
self.stationtype = None
self.stationservices = None
self.coordinates = None
@ -607,6 +619,7 @@ class EDLogs(FileSystemEventHandler):
self.planet = None
self.system = None
self.station = None
self.station_marketid = None
self.stationtype = None
self.stationservices = None
self.coordinates = None
@ -651,6 +664,7 @@ class EDLogs(FileSystemEventHandler):
('timestamp', strftime('%Y-%m-%dT%H:%M:%SZ', gmtime())),
('event', 'StartUp'),
('Docked', True),
('MarketID', self.station_marketid),
('StationName', self.station),
('StationType', self.stationtype),
('StarSystem', self.system),

72
plugins/eddb.py
View File

@ -8,6 +8,7 @@ import csv
import os
from os.path import join
import sys
import urllib.parse
from config import config
@ -16,61 +17,62 @@ STATION_UNDOCKED = u'×' # "Station" name to display when not docked = U+00D7
this = sys.modules[__name__] # For holding module globals
# (system_id, is_populated) by system_name
with open(join(config.respath, 'systems.p'), 'rb') as h:
this.system_ids = pickle.load(h)
# station_id by (system_id, station_name)
with open(join(config.respath, 'stations.p'), 'rb') as h:
this.station_ids = pickle.load(h)
this.system_address = None
this.system_population = None
this.station_marketid = None # Frontier MarketID
# Main window clicks
def system_url(system_name):
if system_id(system_name):
return 'https://eddb.io/system/%d' % system_id(system_name)
def system_url(system_address):
if system_address:
return 'https://eddb.io/system/ed-address/%s' % system_address
else:
return None
return ''
def station_url(system_name, station_name):
if station_id(system_name, station_name):
return 'https://eddb.io/station/%d' % station_id(system_name, station_name)
if this.station_marketid:
return 'https://eddb.io/station/market-id/{}'.format(this.station_marketid)
else:
return system_url(system_name)
# system_name -> system_id or 0
def system_id(system_name):
return this.system_ids.get(system_name, [0, False])[0]
# system_name -> is_populated
def system_populated(system_name):
return this.system_ids.get(system_name, [0, False])[1]
# (system_name, station_name) -> station_id or 0
def station_id(system_name, station_name):
return this.station_ids.get((system_id(system_name), station_name), 0)
return system_url(this.system_address)
def plugin_start3(plugin_dir):
return 'eddb'
def plugin_app(parent):
this.system_link = parent.children['system'] # system label in main window
this.system_address = None
this.station_marketid = None # Frontier MarketID
this.station_link = parent.children['station'] # station label in main window
this.station_link.configure(popup_copy = lambda x: x != STATION_UNDOCKED)
def prefs_changed(cmdr, is_beta):
if config.get('system_provider') == 'eddb':
this.system_link['url'] = system_url(system_link['text']) # Override standard URL function
this.system_link['url'] = system_url(this.system_address) # Override standard URL function
def journal_entry(cmdr, is_beta, system, station, entry, state):
if config.get('system_provider') == 'eddb':
this.system_link['url'] = system_url(system) # Override standard URL function
this.station_link['text'] = station or (system_populated(system) and STATION_UNDOCKED or '')
this.station_link.update_idletasks()
this.system_address = entry.get('SystemAddress') or this.system_address
this.system_link['url'] = system_url(this.system_address) # Override standard URL function
if config.get('station_provider') == 'eddb':
if entry['event'] in ['StartUp', 'Location', 'FSDJump', 'CarrierJump']:
this.system_population = entry.get('Population')
if entry['event'] in ['StartUp', 'Location', 'Docked', 'CarrierJump']:
this.station_marketid = entry.get('MarketID')
elif entry['event'] in ['Undocked']:
this.station_marketid = None
this.station_link['text'] = station or (this.system_population and this.system_population > 0 and STATION_UNDOCKED or '')
this.station_link.update_idletasks()
def cmdr_data(data, is_beta):
if config.get('system_provider') == 'eddb':
this.system_link['url'] = system_url(data['lastSystem']['name']) # Override standard URL function
this.station_link['text'] = data['commander']['docked'] and data['lastStarport']['name'] or (system_populated(data['lastSystem']['name']) and STATION_UNDOCKED or '')
this.station_link.update_idletasks()
this.system_address = data['lastSystem']['id'] or this.system_address
this.system_link['url'] = system_url(this.system_address) # Override standard URL function
if config.get('station_provider') == 'eddb':
this.station_marketid = data['commander']['docked'] and data['lastStarport']['id']
this.station_link['text'] = data['commander']['docked'] and data['lastStarport']['name'] or (data['lastStarport']['name'] and data['lastStarport']['name'] != "" and STATION_UNDOCKED or '')
this.station_link.update_idletasks()

9
plugins/eddn.py
View File

@ -14,6 +14,8 @@ import tkinter as tk
from ttkHyperlinkLabel import HyperlinkLabel
import myNotebook as nb
from prefs import prefsVersion
if sys.platform != 'win32':
from fcntl import lockf, LOCK_EX, LOCK_NB
@ -347,7 +349,10 @@ def plugin_prefs(parent, cmdr, is_beta):
BUTTONX = 12 # indent Checkbuttons and Radiobuttons
PADY = 2 # close spacing
output = config.getint('output') or (config.OUT_MKT_EDDN | config.OUT_SYS_EDDN) # default settings
if prefsVersion.shouldSetDefaults('0.0.0.0', not bool(config.getint('output'))):
output = (config.OUT_MKT_EDDN | config.OUT_SYS_EDDN) # default settings
else:
output = config.getint('output')
eddnframe = nb.Frame(parent)
@ -371,7 +376,7 @@ def prefsvarchanged(event=None):
def prefs_changed(cmdr, is_beta):
config.set('output',
(config.getint('output') & (config.OUT_MKT_TD | config.OUT_MKT_CSV | config.OUT_SHIP |config. OUT_MKT_MANUAL)) +
(config.getint('output') & (config.OUT_MKT_TD | config.OUT_MKT_CSV | config.OUT_SHIP |config.OUT_MKT_MANUAL)) +
(this.eddn_station.get() and config.OUT_MKT_EDDN) +
(this.eddn_system.get() and config.OUT_SYS_EDDN) +
(this.eddn_delay.get() and config.OUT_SYS_DELAY))

72
prefs.py
View File

@ -10,7 +10,7 @@ from tkinter import colorchooser as tkColorChooser
from ttkHyperlinkLabel import HyperlinkLabel
import myNotebook as nb
from config import applongname, config
from config import applongname, config, appversion
from hotkey import hotkeymgr
from l10n import Translations
from monitor import monitor
@ -18,6 +18,70 @@ from theme import theme
import plug
###########################################################################
# Versioned preferences, so we know whether to set an 'on' default on
# 'new' preferences, or not.
###########################################################################
class PrefsVersion(object):
versions = {
'0.0.0.0': 1,
'1.0.0.0': 2,
'3.4.6.0': 3,
'3.5.1.0': 4,
# Only add new versions that add new Preferences
'current': 4, # Should always match the last specific version, but only increment after you've added the new version. Guess at it if anticipating a new version.
}
def __init__(self):
return
def stringToSerial(self, versionStr: str) -> int:
"""
Convert a version string into a preferences version serial number.
If the version string isn't known returns the 'current' (latest) serial number.
:param versionStr:
:return int:
"""
if versionStr in self.versions:
return self.versions[versionStr]
return self.versions['current']
###########################################################################
# Should defaults be set, given the settings were added after 'addedAfter' ?
#
# config.get('PrefsVersion') is the version preferences we last saved for
###########################################################################
def shouldSetDefaults(self, addedAfter: str, oldTest : bool=True) -> bool:
pv = config.getint('PrefsVersion')
# If no PrefsVersion yet exists then return oldTest
if not pv:
return oldTest
# Convert addedAfter to a version serial number
if addedAfter not in self.versions:
# Assume it was added at the start
aa = 1
else:
aa = self.versions[addedAfter]
# Sanity check, if something was added after then current should be greater
if aa >= self.versions['current']:
raise Exception('ERROR: Call to prefs.py:PrefsVersion.shouldSetDefaults() with "addedAfter" >= current latest in "versions" table. You probably need to increase "current" serial number.')
# If this preference was added after the saved PrefsVersion we should set defaults
if aa >= pv:
return True
return False
###########################################################################
prefsVersion = PrefsVersion()
###########################################################################
if platform == 'darwin':
import objc
from Foundation import NSFileManager
@ -103,7 +167,10 @@ class PreferencesDialog(tk.Toplevel):
outframe = nb.Frame(notebook)
outframe.columnconfigure(0, weight=1)
output = config.getint('output') or config.OUT_SHIP # default settings
if prefsVersion.shouldSetDefaults('0.0.0.0', not bool(config.getint('output'))):
output = config.OUT_SHIP # default settings
else:
output = config.getint('output')
self.out_label = nb.Label(outframe, text=_('Please choose what data to save'))
self.out_label.grid(columnspan=2, padx=PADX, sticky=tk.W)
@ -499,6 +566,7 @@ class PreferencesDialog(tk.Toplevel):
def apply(self):
config.set('PrefsVersion', prefsVersion.stringToSerial(appversion))
config.set('output',
(self.out_td.get() and config.OUT_MKT_TD) +
(self.out_csv.get() and config.OUT_MKT_CSV) +

8
setup.py
View File

@ -17,7 +17,7 @@ import shutil
import sys
from tempfile import gettempdir
from config import appname as APPNAME, applongname as APPLONGNAME, appcmdname as APPCMDNAME, appversion as VERSION
from config import appname as APPNAME, applongname as APPLONGNAME, appcmdname as APPCMDNAME, appversion as VERSION, copyright as COPYRIGHT
from config import update_feed, update_interval
@ -96,7 +96,7 @@ if sys.platform=='darwin':
],
'LSMinimumSystemVersion': '10.10',
'NSAppleScriptEnabled': True,
'NSHumanReadableCopyright': u'© 2015-2019 Jonathan Harris, 2020 EDCD',
'NSHumanReadableCopyright': COPYRIGHT,
'SUEnableAutomaticChecks': True,
'SUShowReleaseNotes': True,
'SUAllowsAutomaticUpdates': False,
@ -156,7 +156,7 @@ setup(
'company_name': 'EDCD', # WinSparkle
'product_name': APP, # WinSparkle
'version': VERSION,
'copyright': u'© 2015-2019 Jonathan Harris, 2020 EDCD',
'copyright': COPYRIGHT,
'other_resources': [(24, 1, open(APPNAME+'.manifest').read())],
} ],
console = [ {'dest_base': APPCMDNAME,
@ -164,7 +164,7 @@ setup(
'company_name': 'EDCD',
'product_name': APPNAME,
'version': VERSION,
'copyright': u'© 2015-2019 Jonathan Harris, 2020 EDCD',
'copyright': COPYRIGHT,
} ],
data_files = DATA_FILES,
options = OPTIONS,