Skip to content

Commit

Permalink
Bump 3 0 release! (#159)
Browse files Browse the repository at this point in the history
* adapt make package with correct folder

* move docs to dedicated repo DataPlotly-docs

* lint

* lint2

* adapt scripts for release

* i18n just for UI
  • Loading branch information
ghtmtt authored Oct 30, 2019
1 parent 4b0dc74 commit 3829960
Show file tree
Hide file tree
Showing 557 changed files with 3,206 additions and 60,753 deletions.
6 changes: 3 additions & 3 deletions .tx/config
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
host = https://www.transifex.com

[dataplotly-ui.application]
file_filter = i18n/DataPlotly_<lang>.ts
source_file = i18n/DataPlotly_en.ts
file_filter = DataPlotly/i18n/DataPlotly_<lang>.ts
source_file = DataPlotly/i18n/DataPlotly_en.ts
source_lang = en

trans.it = i18n/DataPlotly_it.ts
trans.it = DataPlotly/i18n/DataPlotly_it.ts
type = QT
11 changes: 2 additions & 9 deletions DataPlotly/gui/plot_settings_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
***************************************************************************/
"""

import os
import json
from collections import OrderedDict
from shutil import copyfile
Expand All @@ -44,7 +43,6 @@
)
from qgis.PyQt.QtCore import (
QUrl,
QSettings,
pyqtSignal,
QDir
)
Expand Down Expand Up @@ -476,16 +474,11 @@ def helpPage(self):
the language (looks for translations)
"""

locale = QSettings().value('locale/userLocale', 'en_US')[0:2]
# locale = QSettings().value('locale/userLocale', 'en_US')[0:2]

self.help_view.load(QUrl(''))
self.layouth.addWidget(self.help_view)
help_link = os.path.join(os.path.dirname(__file__), 'help/build/html/{}/{}.html'.format(locale, self.ptype))
# check if the file exists, else open the default home page
if not os.path.exists(help_link):
help_link = os.path.join(os.path.dirname(__file__), 'help/build/html/en/{}.html'.format(self.ptype))

help_url = QUrl.fromLocalFile(help_link)
help_url = QUrl('https://dataplotly-docs.readthedocs.io/en/latest/{}.html'.format(self.ptype))
self.help_view.load(help_url)

def resizeEvent(self, event):
Expand Down
Loading

0 comments on commit 3829960

Please sign in to comment.