Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
0b47c54d
by Emmanuel Gil Peyrot at 2020-04-21T18:17:31+02:00
4 changed files:
Changes:
| ... | ... | @@ -1490,7 +1490,7 @@ class Logger: |
| 1490 | 1490 |
rows = self._con.execute(sql).fetchall()
|
| 1491 | 1491 |
for row in rows:
|
| 1492 | 1492 |
self._muc_avatar_sha_cache[row.jid] = row.avatar_sha
|
| 1493 |
- log.info('%s Avatar SHA entrys loaded', len(rows))
|
|
| 1493 |
+ log.info('%d Avatar SHA entries loaded', len(rows))
|
|
| 1494 | 1494 |
|
| 1495 | 1495 |
@timeit
|
| 1496 | 1496 |
def set_avatar_sha(self, account_jid, jid, sha=None):
|
| ... | ... | @@ -1632,7 +1632,7 @@ class Logger: |
| 1632 | 1632 |
for row in rows:
|
| 1633 | 1633 |
disco_info = row.disco_info._replace(timestamp=row.last_seen)
|
| 1634 | 1634 |
self._disco_info_cache[row.jid] = disco_info
|
| 1635 |
- log.info('%s DiscoInfo entrys loaded', len(rows))
|
|
| 1635 |
+ log.info('%d DiscoInfo entries loaded', len(rows))
|
|
| 1636 | 1636 |
|
| 1637 | 1637 |
def get_last_disco_info(self, jid, max_age=0):
|
| 1638 | 1638 |
"""
|
| ... | ... | @@ -52,7 +52,7 @@ class CSSConfig(): |
| 52 | 52 |
|
| 53 | 53 |
# gajim-dark.css
|
| 54 | 54 |
|
| 55 |
- Has only entrys which we want to override in gajim.css
|
|
| 55 |
+ Has only entries which we want to override in gajim.css
|
|
| 56 | 56 |
|
| 57 | 57 |
# default.css or default-dark.css
|
| 58 | 58 |
|
| ... | ... | @@ -37,7 +37,7 @@ from gajim.gtk.util import MaxWidthComboBoxText |
| 37 | 37 |
# hide-fallback-fields Hide fallback fields in IBR form (ejabberd)
|
| 38 | 38 |
# left-width Width for labels
|
| 39 | 39 |
# read-only Read only mode for fields
|
| 40 |
-# entry-activates-default Form entrys activate the default widget
|
|
| 40 |
+# entry-activates-default Form entry activates the default widget
|
|
| 41 | 41 |
|
| 42 | 42 |
|
| 43 | 43 |
class DataFormWidget(Gtk.ScrolledWindow):
|
| ... | ... | @@ -529,13 +529,13 @@ def get_singlechat_menu(control_id, account, jid): |
| 529 | 529 |
|
| 530 | 530 |
def build_chatstate_menu():
|
| 531 | 531 |
menu = Gio.Menu()
|
| 532 |
- entrys = [
|
|
| 532 |
+ entries = [
|
|
| 533 | 533 |
(_('Disabled'), 'disabled'),
|
| 534 | 534 |
(_('Composing only'), 'composing_only'),
|
| 535 | 535 |
(_('All chat states'), 'all')
|
| 536 | 536 |
]
|
| 537 | 537 |
|
| 538 |
- for entry in entrys:
|
|
| 538 |
+ for entry in entries:
|
|
| 539 | 539 |
label, setting = entry
|
| 540 | 540 |
action = 'win.send-chatstate-%s::%s' % (control_id, setting)
|
| 541 | 541 |
menu.append(label, action)
|
| ... | ... | @@ -646,13 +646,13 @@ def get_groupchat_menu(control_id, account, jid): |
| 646 | 646 |
|
| 647 | 647 |
def build_chatstate_menu():
|
| 648 | 648 |
menu = Gio.Menu()
|
| 649 |
- entrys = [
|
|
| 649 |
+ entries = [
|
|
| 650 | 650 |
(_('Disabled'), 'disabled'),
|
| 651 | 651 |
(_('Composing only'), 'composing_only'),
|
| 652 | 652 |
(_('All chat states'), 'all')
|
| 653 | 653 |
]
|
| 654 | 654 |
|
| 655 |
- for entry in entrys:
|
|
| 655 |
+ for entry in entries:
|
|
| 656 | 656 |
label, setting = entry
|
| 657 | 657 |
action = 'win.send-chatstate-%s::%s' % (control_id, setting)
|
| 658 | 658 |
menu.append(label, action)
|