Commit 422f9fe2 authored by Daniel Brötzmann's avatar Daniel Brötzmann Committed by Philipp Hörist

Replace JID with XMPP Address

parent c931cd0c
......@@ -298,7 +298,7 @@ class StandardGroupChatCommands(CommandContainer):
'room_jid': self.room_jid}
@command(raw=True, empty=True)
@doc(_("Join a group chat given by a JID"))
@doc(_("Join a group chat given by an XMPP Address"))
def join(self, jid):
if '@' not in jid:
jid = jid + '@' + app.get_server_from_jid(self.room_jid)
......
......@@ -187,8 +187,8 @@ class Config:
'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')],
'confirm_paste_image': [opt_bool, True, _('Ask before pasting an image.')],
'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')],
'confirm_close_muc_rooms': [opt_str, '', _('Always ask for confirmation before closing groupchats with any of the JIDs on this space separated list.')],
'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask for confirmation before closing groupchats with any of the JIDs on this space separated list.')],
'confirm_close_muc_rooms': [opt_str, '', _('Always ask for confirmation before closing groupchats with any of the XMPP Addresses on this space separated list.')],
'noconfirm_close_muc_rooms': [opt_str, '', _('Never ask for confirmation before closing groupchats with any of the XMPP Addresses on this space separated list.')],
'confirm_close_multiple_tabs': [opt_bool, True, _('Ask before closing tabbed chat window if there are controls that can lose data (chat, private chat, groupchat that will not be minimized)')],
'notify_on_file_complete': [opt_bool, True],
'file_transfers_port': [opt_int, 28011],
......@@ -338,8 +338,8 @@ class Config:
'custom_port': [opt_int, 5222, '', True],
'custom_host': [opt_str, '', '', True],
'sync_with_global_status': [opt_bool, False, ],
'no_log_for': [opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')],
'allow_no_log_for': [opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')],
'no_log_for': [opt_str, '', _('Space separated list of XMPP Addresses for which you do not want to store logs. You can also add account name to log nothing for this account.')],
'allow_no_log_for': [opt_str, '', _('Space separated list of XMPP Addresses for which you accept to not log conversations if he does not want to.')],
'attached_gpg_keys': [opt_str, ''],
'keep_alives_enabled': [opt_bool, True, _('Whitespace sent after inactivity')],
'ping_alives_enabled': [opt_bool, True, _('XMPP ping sent after inactivity')],
......@@ -383,7 +383,7 @@ class Config:
'roster_version': [opt_str, ''],
'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')],
'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IPs so your contact can connect to your machine to transfer files.')],
'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which chat window will be re-opened on next startup.')],
'opened_chat_controls': [opt_str, '', _('Space separated list of XMPP Addresses for which chat window will be re-opened on next startup.')],
'recent_groupchats': [opt_str, ''],
'httpupload_verify': [opt_bool, True, _('HTTP Upload: Enable HTTPS Verification')],
'filetransfer_preference' : [opt_str, 'httpupload', _('Preferred file transfer mechanism for file drag&drop on chat window. Can be \'httpupload\' (default) or \'jingle\'')],
......
......@@ -28,14 +28,14 @@ Message = namedtuple('Message', ['title', 'text', 'dialog'])
messages = {
'invalid-jid-with-error': Message(
_('Invalid JID'),
_('Invalid XMPP Address'),
'%s',
ErrorDialog),
'invalid-jid': Message(
_('Invalid JID'),
_('Invalid XMPP Address'),
_('It is not possible to send a message '
'to %s, this JID is not valid.'),
'to %s, this XMPP Address is not valid.'),
ErrorDialog),
'unread-events-on-remove-account': Message(
......@@ -59,8 +59,8 @@ messages = {
ErrorDialog),
'jid-in-list': Message(
_('JID already in list'),
_('The JID you entered is already in the list. Choose another one.'),
_('XMPP Address already in list'),
_('The XMPP Address you entered is already in the list. Choose another one.'),
ErrorDialog),
'invalid-answer': Message(
......
......@@ -81,7 +81,7 @@ class EditGroupsDialog:
self.xml.get_object('nickname_label').set_markup(
_('Contact name: <i>%s</i>') % contact.get_shown_name())
self.xml.get_object('jid_label').set_markup(
_('JID: <i>%s</i>') % contact.jid)
_('XMPP Address: <i>%s</i>') % contact.jid)
else:
self.xml.get_object('nickname_label').set_no_show_all(True)
self.xml.get_object('nickname_label').hide()
......
......@@ -117,7 +117,7 @@ class GajimRemote:
'send_chat_message': [
_('Sends new chat message to a contact in the contact list. Account is optional.'),
[
('jid', _('JID of the contact that will receive the message'), True),
('jid', _('XMPP Address of the contact that will receive the message'), True),
(Q_('?CLI:message'), _('message contents'), True),
(Q_('?CLI:account'), _('if specified, the message will be sent '
'using this account'), False),
......@@ -127,7 +127,7 @@ class GajimRemote:
_('Sends a chat message to someone on your contact list. '
'Account is optional.'),
[
('jid', _('JID of the contact that will receive the message'), True),
('jid', _('XMPP Address of the contact that will receive the message'), True),
(_('subject'), _('message subject'), True),
(Q_('?CLI:message'), _('message contents'), True),
(Q_('?CLI:account'), _('if specified, the message will be sent '
......@@ -137,7 +137,7 @@ class GajimRemote:
'send_groupchat_message': [
_('Sends new message to a groupchat you\'ve joined.'),
[
('room_jid', _('JID of the room that will receive the message'), True),
('room_jid', _('XMPP Address of the room that will receive the message'), True),
(Q_('?CLI:message'), _('message contents'), True),
(Q_('?CLI:account'), _('if specified, the message will be sent '
'using this account'), False),
......@@ -146,7 +146,7 @@ class GajimRemote:
'contact_info': [
_('Gets detailed info on a contact'),
[
('jid', _('JID of the contact'), True)
('jid', _('XMPP Address of the contact'), True)
]
],
'account_info': [
......@@ -159,7 +159,7 @@ class GajimRemote:
_('Sends file to a contact'),
[
(_('file'), _('File path'), True),
('jid', _('JID of the contact'), True),
('jid', _('XMPP Address of the contact'), True),
(Q_('?CLI:account'), _('if specified, file will be sent using this '
'account'), False)
]
......@@ -189,7 +189,7 @@ class GajimRemote:
'remove_contact': [
_('Removes contact from contact list'),
[
('jid', _('JID of the contact'), True),
('jid', _('XMPP Address of the contact'), True),
(Q_('?CLI:account'), _('if specified, contact is taken from the '
'contact list of this account'), False)
......
......@@ -653,8 +653,8 @@ class GroupchatControl(ChatControlBase):
jid = helpers.parse_jid(jid)
except Exception:
ErrorDialog(
_('Invalid group chat JID'),
_('The group chat JID has not allowed characters.'))
_('Invalid group chat XMPP Address'),
_('The group chat XMPP Address has not allowed characters.'))
return
self._wait_for_destruction = True
......@@ -1700,7 +1700,7 @@ class GroupchatControl(ChatControlBase):
if StatusCode.NON_ANONYMOUS in status_codes:
self.add_info_message(
_('Any occupant is allowed to see your full JID'))
_('Any occupant is allowed to see your full XMPP Address'))
self.is_anonymous = False
if StatusCode.CONFIG_ROOM_LOGGING in status_codes:
......
......@@ -226,7 +226,7 @@ class AccountCreationWizard:
try:
jid = helpers.parse_jid(jid)
except helpers.InvalidFormat as s:
pritext = _('Invalid JID')
pritext = _('Invalid XMPP Address')
ErrorDialog(pritext, str(s))
return
......
......@@ -826,7 +826,7 @@ class AgentBrowser:
self.window.services_treeview.insert_column(col, -1)
col.set_resizable(True)
# Address column
col = Gtk.TreeViewColumn(_('JID'))
col = Gtk.TreeViewColumn(_('XMPP Address'))
renderer = Gtk.CellRendererText()
col.pack_start(renderer, True)
col.add_attribute(renderer, 'text', 3)
......
......@@ -209,7 +209,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow):
try:
self.room_jid = helpers.parse_jid(self.room_jid)
except helpers.InvalidFormat as error:
ErrorDialog(_('Invalid JID'), str(error), transient_for=self)
ErrorDialog(_('Invalid XMPP Address'), str(error), transient_for=self)
return
if app.in_groupchat(account, self.room_jid):
......
......@@ -302,9 +302,9 @@ class SingleMessageWindow(Gtk.ApplicationWindow):
try:
to_whom_jid = helpers.parse_jid(to_whom_jid)
except helpers.InvalidFormat:
ErrorDialog(_('Invalid JID'),
_('It is not possible to send a message to %s, this JID '
'is not valid.') % to_whom_jid)
ErrorDialog(_('Invalid XMPP Address'),
_('It is not possible to send a message to %s, this '
'XMPP Address is not valid.') % to_whom_jid)
return True
if '/announce/' in to_whom_jid:
......
......@@ -1443,7 +1443,7 @@ class Interface:
try:
room_jid = helpers.parse_jid(room_jid)
except helpers.InvalidFormat:
ErrorDialog('Invalid JID',
ErrorDialog(_('Invalid XMPP Address'),
transient_for=app.app.get_active_window())
return
......@@ -1459,7 +1459,7 @@ class Interface:
def _on_discover_result():
if not muc_caps_cache.is_cached(room_jid):
ErrorDialog(_('JID is not a Groupchat'),
ErrorDialog(_('XMPP Address is not a Groupchat'),
transient_for=app.app.get_active_window())
return
JoinGroupchatWindow(account, room_jid, password=password,
......
......@@ -776,12 +776,12 @@ def get_conv_context_menu(account, uri):
if uri.type == URIType.XMPP:
if uri.action == URIAction.JOIN:
context_menu = [
('copy-text', _('Copy JID')),
('copy-text', _('Copy XMPP Address')),
('-join-groupchat', _('Join Groupchat')),
]
else:
context_menu = [
('copy-text', _('Copy JID')),
('copy-text', _('Copy XMPP Address')),
('-start-chat', _('Start Chat')),
('-add-contact', _('Add to Contact List…')),
]
......@@ -806,7 +806,7 @@ def get_conv_context_menu(account, uri):
elif uri.type == URIType.AT:
context_menu = [
('copy-text', _('Copy JID/Email')),
('copy-text', _('Copy XMPP Address/Email')),
('open-link', _('Open Email Composer')),
('-start-chat', _('Start Chat')),
('-join-groupchat', _('Join Groupchat')),
......
......@@ -137,7 +137,7 @@ class HistoryManager:
self._ui.jids_listview.get_selection().set_mode(Gtk.SelectionMode.MULTIPLE)
renderer_text = Gtk.CellRendererText() # holds jid
col = Gtk.TreeViewColumn(_('JID'), renderer_text, text=0)
col = Gtk.TreeViewColumn(_('XMPP Address'), renderer_text, text=0)
self._ui.jids_listview.append_column(col)
self._ui.jids_listview.get_selection().connect('changed',
......@@ -191,7 +191,7 @@ class HistoryManager:
self._ui.search_results_listview.set_model(self.search_results_liststore)
renderer_text = Gtk.CellRendererText() # holds JID (who said this)
col = Gtk.TreeViewColumn(_('JID'), renderer_text, text=1)
col = Gtk.TreeViewColumn(_('XMPP Address'), renderer_text, text=1)
# user can click this header and sort
col.set_sort_column_id(1)
col.set_resizable(True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment