Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim
Commits:
81dee69b by Philipp Hörist at 2020-01-15T22:48:52+01:00
CI: Reinstall mypy and pylint
We dont want to use the global installed versions because its hard
to control what version is installed there
- - - - -
1 changed file:
- .gitlab-ci.yml
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -10,11 +10,11 @@ run-tests:
stage: test
script:
- rm -rf civenv-master
- - virtualenv --system-site-packages civenv
+ - virtualenv -p python3 --system-site-packages civenv
- . ./civenv/bin/activate
- - pip3 install mypy
+ - pip3 install -I mypy
- pip3 install -I nbxmpp==0.6.10
- - pip3 install pylint==2.1.1
+ - pip3 install -I pylint==2.1.1
- mypy gajim
- scripts/dev/pylint-ci.sh --jobs=2 gajim
- python3 setup.py test -s test.no_gui
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81dee69ba9878744a9c8cd14b6c50dbdbc…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81dee69ba9878744a9c8cd14b6c50dbdbc…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
e6873e70 by Daniel Brötzmann at 2020-01-13T09:33:12+01:00
HistoryManager: Fix dialog question string
- - - - -
1 changed file:
- gajim/history_manager.py
Changes:
=====================================
gajim/history_manager.py
=====================================
@@ -605,8 +605,8 @@ class HistoryManager:
NewConfirmationDialog(
_('Delete'),
ngettext('Delete Message', 'Delete Messages', paths_len),
- ngettext('Do you want to permanently delete this message',
- 'Do you want to permanently delete these messages',
+ ngettext('Do you want to permanently delete this message?',
+ 'Do you want to permanently delete these messages?',
paths_len),
[DialogButton.make('Cancel'),
DialogButton.make('Delete',
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e6873e70d147e647c397fe2c6a6ab84d86…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e6873e70d147e647c397fe2c6a6ab84d86…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
58dac3ac by Daniel Brötzmann at 2020-01-09T09:52:57+01:00
Dialogs: Use contact's shown name
- - - - -
3 changed files:
- gajim/gtk/filetransfer.py
- gajim/gui_interface.py
- gajim/roster_window.py
Changes:
=====================================
gajim/gtk/filetransfer.py
=====================================
@@ -483,7 +483,7 @@ class FileTransfersWindow:
NewConfirmationDialog(
_('File Transfer Request'),
- _('%s wants to send you a file') % contact.jid,
+ _('%s wants to send you a file') % contact.jid.get_shown_name(),
sectext,
[DialogButton.make('Cancel',
callback=_on_cancel),
=====================================
gajim/gui_interface.py
=====================================
@@ -357,9 +357,11 @@ class Interface:
def _remove():
self.roster.on_req_usub(None, [(contact, account)])
+ name = contact.get_shown_name()
+ jid = contact.jid
NewConfirmationDialog(
_('Subscription Removed'),
- _('Contact \'%s\' removed subscription from you') % contact.jid,
+ _('%s (%s) has removed subscription from you') % (name, jid),
_('You will always see this contact as offline.\n'
'Do you want to remove them from your contact list?'),
[DialogButton.make('Cancel',
=====================================
gajim/roster_window.py
=====================================
@@ -3325,7 +3325,7 @@ class RosterWindow:
contact = list_[0][0]
title = _('Remove Contact')
pritext = _('Remove contact from contact list')
- sectext = _('You are about to remove \'%(name)s\' (%(jid)s) from '
+ sectext = _('You are about to remove %(name)s (%(jid)s) from '
'your contact list.\n') % {
'name': contact.get_shown_name(),
'jid': contact.jid}
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58dac3acc62e50435c70e92b9998260920…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/58dac3acc62e50435c70e92b9998260920…
You're receiving this email because of your account on dev.gajim.org.
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
31e51e17 by Philipp Hörist at 2020-01-07T22:07:01+01:00
Raise min GTK version
- - - - -
1 changed file:
- gajim/gajim.py
Changes:
=====================================
gajim/gajim.py
=====================================
@@ -27,7 +27,7 @@ from distutils.version import LooseVersion as V
from gajim.common import i18n
_MIN_NBXMPP_VER = '0.9.92'
-_MIN_GTK_VER = '3.22.0'
+_MIN_GTK_VER = '3.22.27'
_MIN_CAIRO_VER = '1.14.0'
_MIN_PYGOBJECT_VER = '3.32.0'
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/31e51e173ca1246d58ec25e30a6fb34a0c…
--
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/31e51e173ca1246d58ec25e30a6fb34a0c…
You're receiving this email because of your account on dev.gajim.org.