Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/common/helpers.py
    ... ... @@ -309,17 +309,12 @@ def get_uf_chatstate(chatstate: str) -> str:
    309 309
         '''
    
    310 310
         Remove chatstate jargon and returns user friendly messages
    
    311 311
         '''
    
    312
    -    if chatstate == 'active':
    
    313
    -        return _('is paying attention to the conversation')
    
    314
    -    if chatstate == 'inactive':
    
    312
    +    if chatstate in ('inactive', 'gone'):
    
    315 313
             return _('is doing something else')
    
    316 314
         if chatstate == 'composing':
    
    317 315
             return _('is composing a message…')
    
    318 316
         if chatstate == 'paused':
    
    319
    -        # paused means he or she was composing but has stopped for a while
    
    320 317
             return _('paused composing a message')
    
    321
    -    if chatstate == 'gone':
    
    322
    -        return _('has closed the chat window or tab')
    
    323 318
         return ''
    
    324 319
     
    
    325 320
     
    

  • gajim/gtk/main.py
    ... ... @@ -358,7 +358,7 @@ def _add_actions2(self) -> None:
    358 358
                 'close-tab',
    
    359 359
                 'switch-next-tab',
    
    360 360
                 'switch-prev-tab',
    
    361
    -            'switch-next-unread-tab'
    
    361
    +            'switch-next-unread-tab',
    
    362 362
                 'switch-prev-unread-tab',
    
    363 363
                 'switch-tab-1',
    
    364 364
                 'switch-tab-2',