Mercurial Repositories > eric / changeset
changeset
Merged with Spanish translations update.
Wed, 31 Dec 2014 12:58:51 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 31 Dec 2014 12:58:51 +0100
- changeset 4016
- b72dac09ba02
- parent 4013
- e3c30bae0d15 (diff)
- parent 4015
- e1c05df8e660 (current diff)
- child 4017
- 3462f360c740
Merged with Spanish translations update.
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Tue Dec 30 16:57:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Wed Dec 31 12:58:51 2014 +0100 @@ -15,7 +15,8 @@ import os -from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray, \ + qVersion from PyQt5.QtGui import QTextCursor from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication, QLineEdit @@ -340,8 +341,13 @@ url = QUrl() url.setScheme("file") url.setPath(self.filename) - query = parent.split(":")[0] + '_' + rev - url.setQuery(query) + if qVersion() >= "5.0.0": + query = parent.split(":")[0] + '_' + rev + url.setQuery(query) + else: + query = QByteArray() + query.append(parent.split(":")[0]).append('_').append(rev) + url.setEncodedQuery(query) dstr += ' [<a href="{0}" name="{1}" id="{1}">{2}</a>]'.format( url.toString(), query, self.tr('diff to {0}').format(parent), @@ -487,7 +493,10 @@ if Utilities.isWindowsPlatform(): if filename.startswith("/"): filename = filename[1:] - ver = url.query() + if qVersion() >= "5.0.0": + ver = url.query() + else: + ver = bytes(url.encodedQuery()).decode() v1, v2 = ver.split('_') if v1 == "" or v2 == "": return
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Tue Dec 30 16:57:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Wed Dec 31 12:58:51 2014 +0100 @@ -14,7 +14,7 @@ import pysvn -from PyQt5.QtCore import QMutexLocker, QUrl, Qt +from PyQt5.QtCore import QMutexLocker, QUrl, Qt, QByteArray, qVersion from PyQt5.QtGui import QCursor, QTextCursor from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox @@ -140,8 +140,13 @@ url = QUrl() url.setScheme("file") url.setPath(self.filename) - query = lv + '_' + ver - url.setQuery(query) + if qVersion() >= "5.0.0": + query = lv + '_' + ver + url.setQuery(query) + else: + query = QByteArray() + query.append(lv).append('_').append(ver) + url.setEncodedQuery(query) dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( url.toString(), query, self.tr('diff to {0}').format(lv) @@ -236,7 +241,10 @@ if Utilities.isWindowsPlatform(): if filename.startswith("/"): filename = filename[1:] - ver = url.query() + if qVersion() >= "5.0.0": + ver = url.query() + else: + ver = bytes(url.encodedQuery()).decode() v1 = ver.split('_')[0] v2 = ver.split('_')[1] if not v1 or not v2:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Tue Dec 30 16:57:34 2014 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Wed Dec 31 12:58:51 2014 +0100 @@ -15,7 +15,8 @@ import os -from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot +from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot, qVersion, \ + QByteArray from PyQt5.QtGui import QTextCursor from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox @@ -182,8 +183,13 @@ url = QUrl() url.setScheme("file") url.setPath(self.filename) - query = lv + '_' + ver - url.setQuery(query) + if qVersion() >= "5.0.0": + query = lv + '_' + ver + url.setQuery(query) + else: + query = QByteArray() + query.append(lv).append('_').append(ver) + url.setEncodedQuery(query) dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( url.toString(), query, self.tr('diff to {0}').format(lv), @@ -272,7 +278,10 @@ if Utilities.isWindowsPlatform(): if filename.startswith("/"): filename = filename[1:] - ver = url.query() + if qVersion() >= "5.0.0": + ver = url.query() + else: + ver = bytes(url.encodedQuery()).decode() v1 = ver.split('_')[0] v2 = ver.split('_')[1] if v1 == "" or v2 == "":
--- a/i18n/eric6_de.ts Tue Dec 30 16:57:34 2014 +0100 +++ b/i18n/eric6_de.ts Wed Dec 31 12:58:51 2014 +0100 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1918,8 +1919,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="145"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -1987,8 +1988,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="93"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -15838,8 +15839,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1094"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1167"/> @@ -57158,7 +57159,7 @@ <message> <location filename="../UI/UserInterface.py" line="1639"/> <source>Show the versions available for download</source> - <translation>Zeige die verfügbaren eric5-Versionen</translation> + <translation>Zeige die verfügbaren eric-Versionen</translation> </message> <message> <location filename="../UI/UserInterface.py" line="6078"/>
