copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make file transfer labels sound less technical

This commit is contained in:
Philipp Hörist 2018-02-22 22:45:15 +01:00
parent 994244c910
commit a94276f6e9
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gajim/chat_control.py
View File

@ -314,20 +314,9 @@ class ChatControl(ChatControlBase):
jingle.get_enabled() or httpupload.get_enabled()) jingle.get_enabled() or httpupload.get_enabled())
# Set File Transfer Button tooltip # Set File Transfer Button tooltip
ft_pref = app.config.get_per('accounts', self.account, if online and (httpupload.get_enabled() or jingle.get_enabled()):
'filetransfer_preference') tooltip_text = _('Send File…')
else:
tooltip_text = None
if httpupload.get_enabled() and jingle.get_enabled():
if ft_pref == 'httpupload':
tooltip_text = _('HTTP File Upload')
else:
tooltip_text = _('Jingle File Transfer')
elif httpupload.get_enabled():
tooltip_text = _('HTTP File Upload')
elif jingle.get_enabled():
tooltip_text = _('Jingle File Transfer')
elif online:
tooltip_text = _('No File Transfer available') tooltip_text = _('No File Transfer available')
self.sendfile_button.set_tooltip_text(tooltip_text) self.sendfile_button.set_tooltip_text(tooltip_text)

11
gajim/groupchat_control.py
View File

@ -631,13 +631,10 @@ class GroupchatControl(ChatControlBase):
win.lookup_action('send-file-' + self.control_id).set_enabled( win.lookup_action('send-file-' + self.control_id).set_enabled(
httpupload.get_enabled()) httpupload.get_enabled())
tooltip_text = None if online and httpupload.get_enabled():
if online: tooltip_text = _('Send File…')
if httpupload.get_enabled(): else:
tooltip_text = _('HTTP File Upload') tooltip_text = _('No File Transfer available')
else:
tooltip_text = _('HTTP File Upload not supported '
'by your server')
self.sendfile_button.set_tooltip_text(tooltip_text) self.sendfile_button.set_tooltip_text(tooltip_text)
# Actions # Actions

6
gajim/gui_menu_builder.py
View File

@ -608,9 +608,9 @@ Build dynamic Application Menus
def get_singlechat_menu(control_id): def get_singlechat_menu(control_id):
singlechat_menu = [ singlechat_menu = [
(_('Send File...'), [ (_('Send File…'), [
('win.send-file-httpupload-', 'HTTP Upload'), ('win.send-file-httpupload-', _('Upload File…')),
('win.send-file-jingle-', 'Jingle'), ('win.send-file-jingle-', _('Send File Directly…')),
]), ]),
('win.invite-contacts-', _('Invite Contacts')), ('win.invite-contacts-', _('Invite Contacts')),
('win.add-to-roster-', _('Add to Roster')), ('win.add-to-roster-', _('Add to Roster')),