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

Commits:

1 changed file:

Changes:

  • gajim/gtk/groupchat_info.py
    ... ... @@ -33,30 +33,6 @@ from gajim.gtk.util import make_href_markup
    33 33
     
    
    34 34
     
    
    35 35
     MUC_FEATURES = {
    
    36
    -    'mam': (
    
    37
    -        'feather-server-symbolic',
    
    38
    -        Q_('?Group chat feature:Archiving'),
    
    39
    -        _('Messages are archived on the server')),
    
    40
    -    'muc_persistent': (
    
    41
    -        'feather-hard-drive-symbolic',
    
    42
    -        Q_('?Group chat feature:Persistent'),
    
    43
    -        _('This group chat persists '
    
    44
    -          'even if there are no participants')),
    
    45
    -    'muc_temporary': (
    
    46
    -        'feather-clock-symbolic',
    
    47
    -        Q_('?Group chat feature:Temporary'),
    
    48
    -        _('This group chat will be destroyed '
    
    49
    -          'once the last participant left')),
    
    50
    -    'muc_moderated': (
    
    51
    -        'feather-mic-off-symbolic',
    
    52
    -        Q_('?Group chat feature:Moderated'),
    
    53
    -        _('Participants entering this group chat need '
    
    54
    -          'to request permission to send messages')),
    
    55
    -    'muc_unmoderated': (
    
    56
    -        'feather-mic-symbolic',
    
    57
    -        Q_('?Group chat feature:Not Moderated'),
    
    58
    -        _('Participants entering this group chat are '
    
    59
    -          'allowed to send messages')),
    
    60 36
         'muc_open': (
    
    61 37
             'feather-globe-symbolic',
    
    62 38
             Q_('?Group chat feature:Open'),
    
    ... ... @@ -66,14 +42,6 @@ MUC_FEATURES = {
    66 42
             Q_('?Group chat feature:Members Only'),
    
    67 43
             _('This group chat is restricted '
    
    68 44
               'to members only')),
    
    69
    -    'muc_public': (
    
    70
    -        'feather-eye-symbolic',
    
    71
    -        Q_('?Group chat feature:Public'),
    
    72
    -        _('Group chat can be found via search')),
    
    73
    -    'muc_hidden': (
    
    74
    -        'feather-eye-off-symbolic',
    
    75
    -        Q_('?Group chat feature:Hidden'),
    
    76
    -        _('This group chat can not be found via search')),
    
    77 45
         'muc_nonanonymous': (
    
    78 46
             'feather-shield-off-symbolic',
    
    79 47
             Q_('?Group chat feature:Not Anonymous'),
    
    ... ... @@ -83,6 +51,24 @@ MUC_FEATURES = {
    83 51
             'feather-shield-symbolic',
    
    84 52
             Q_('?Group chat feature:Semi-Anonymous'),
    
    85 53
             _('Only moderators can see your XMPP address')),
    
    54
    +    'muc_moderated': (
    
    55
    +        'feather-mic-off-symbolic',
    
    56
    +        Q_('?Group chat feature:Moderated'),
    
    57
    +        _('Participants entering this group chat need '
    
    58
    +          'to request permission to send messages')),
    
    59
    +    'muc_unmoderated': (
    
    60
    +        'feather-mic-symbolic',
    
    61
    +        Q_('?Group chat feature:Not Moderated'),
    
    62
    +        _('Participants entering this group chat are '
    
    63
    +          'allowed to send messages')),
    
    64
    +    'muc_public': (
    
    65
    +        'feather-eye-symbolic',
    
    66
    +        Q_('?Group chat feature:Public'),
    
    67
    +        _('Group chat can be found via search')),
    
    68
    +    'muc_hidden': (
    
    69
    +        'feather-eye-off-symbolic',
    
    70
    +        Q_('?Group chat feature:Hidden'),
    
    71
    +        _('This group chat can not be found via search')),
    
    86 72
         'muc_passwordprotected': (
    
    87 73
             'feather-lock-symbolic',
    
    88 74
             Q_('?Group chat feature:Password Required'),
    
    ... ... @@ -93,6 +79,20 @@ MUC_FEATURES = {
    93 79
             Q_('?Group chat feature:No Password Required'),
    
    94 80
             _('This group chat does not require '
    
    95 81
               'a password upon entry')),
    
    82
    +    'muc_persistent': (
    
    83
    +        'feather-hard-drive-symbolic',
    
    84
    +        Q_('?Group chat feature:Persistent'),
    
    85
    +        _('This group chat persists '
    
    86
    +          'even if there are no participants')),
    
    87
    +    'muc_temporary': (
    
    88
    +        'feather-clock-symbolic',
    
    89
    +        Q_('?Group chat feature:Temporary'),
    
    90
    +        _('This group chat will be destroyed '
    
    91
    +          'once the last participant left')),
    
    92
    +    'mam': (
    
    93
    +        'feather-server-symbolic',
    
    94
    +        Q_('?Group chat feature:Archiving'),
    
    95
    +        _('Messages are archived on the server')),
    
    96 96
     }
    
    97 97
     
    
    98 98
     
    
    ... ... @@ -211,13 +211,16 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow):
    211 211
                 features.append('mam')
    
    212 212
     
    
    213 213
             row = 10
    
    214
    -        for feature in features:
    
    215
    -            icon, name, tooltip = MUC_FEATURES.get(feature, (None, None, None))
    
    216
    -            if icon is None:
    
    217
    -                continue
    
    218
    -            grid.attach(self._get_feature_icon(icon, tooltip), 0, row, 1, 1)
    
    219
    -            grid.attach(self._get_feature_label(name), 1, row, 1, 1)
    
    220
    -            row += 1
    
    214
    +
    
    215
    +        for feature in MUC_FEATURES:
    
    216
    +            if feature in features:
    
    217
    +                icon, name, tooltip = MUC_FEATURES.get(feature,
    
    218
    +                                                       (None, None, None))
    
    219
    +                if icon is None:
    
    220
    +                    continue
    
    221
    +                grid.attach(self._get_feature_icon(icon, tooltip), 0, row, 1, 1)
    
    222
    +                grid.attach(self._get_feature_label(name), 1, row, 1, 1)
    
    223
    +                row += 1
    
    221 224
             grid.show_all()
    
    222 225
     
    
    223 226
         @staticmethod