pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

"information" is already plural, fix wording

Browse source
This commit is contained in:
mathieui 2016-10-04 00:54:57 +02:00
parent f1bfec332f
commit 9dd5f0b4de
12 changed files with 47 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/source/configuration.rst
View file

@ -456,7 +456,7 @@ to understand what is :ref:`carbons <carbons-details>` or
If ``true``, information about the Operation System you're using
will be sent when requested by anyone
Set to ``false`` if you don't want people to know these informations.
Set to ``false`` if you don't want people to know these information.
Note that this information will not be sent if :term:`send_poezio_info` is False

4
doc/source/misc/personal_events.rst
View file

@ -6,8 +6,8 @@ Personal Events
Starting from poezio 0.8, poezio now supports `user mood`_, `user activity`_,
`user tune`_, and `user gaming`_.
Those extensions are standardized ways to broadcast informations that might be
useful to your contacts (they will receive those informations only if they
Those extensions are standardized ways to broadcast information that might be
useful to your contacts (they will receive those information only if they
have indicated their interest in them).
The events are also shown in the contact list, next to the contact line:

2
doc/source/usage.rst
View file

@ -110,7 +110,7 @@ fold or unfold a group or a contact.
#. Area where information messages are displayed.
#. Actual list of contacts. The first level is group, the second is the
contacts and the third is the resources of your online contacts.
#. More informations about the selected contact.
#. More information about the selected contact.
.. _muctab:

2
plugins/close_all.py
View file

@ -1,5 +1,5 @@
"""
``close_all`` plugin: close all tabs except chatrooms and the contact lis.
``close_all`` plugin: close all tabs except chatrooms and the contact list.
Commands
--------

9
poezio/common.py
View file

@ -106,7 +106,7 @@ DISTRO_INFO = {
def get_os_info():
"""
Returns a detailed and well formated string containing
informations about the operating system
information about the operating system
:rtype: str
"""
@ -401,7 +401,7 @@ def format_tune_string(infos):
"""
Contruct a string from a dict created from an "User tune" event.
:param dict infos: The informations
:param dict infos: Tune information
:return: The formatted string
:rtype: :py:class:`str`
"""
@ -436,11 +436,10 @@ def format_tune_string(infos):
def format_gaming_string(infos):
"""
Construct a string from a dict containing the "user gaming"
informations.
Construct a string from a dict containing "user gaming" information.
(for now, only use address and name)
:param dict infos: The informations
:param dict infos: Gaming information
:returns: The formatted string
:rtype: :py:class:`str`
"""

4
poezio/core/core.py
View file

@ -77,7 +77,7 @@ class Core(object):
self.bookmarks = BookmarkList()
self.debug = False
self.remote_fifo = None
# a unique buffer used to store global informations
# a unique buffer used to store global information
# that are displayed in almost all tabs, in an
# information window.
self.information_buffer = TextBuffer()
@ -926,7 +926,7 @@ class Core(object):
def get_error_message(self, stanza, deprecated=False):
"""
Takes a stanza of the form <message type='error'><error/></message>
and return a well formed string containing the error informations
and return a well formed string containing error information
"""
sender = stanza['from']
msg = stanza['error']['type']

2
poezio/tabs/basetabs.py
View file

@ -383,7 +383,7 @@ class Tab(object):
def on_info_win_size_changed(self):
"""
Called when the window with the informations is resized
Called when the window with the information is resized
"""
pass

14
poezio/tabs/conversationtab.py
View file

@ -36,7 +36,7 @@ class ConversationTab(OneToOneTab):
"""
plugin_commands = {}
plugin_keys = {}
additional_informations = {}
additional_information = {}
message_type = 'chat'
def __init__(self, core, jid):
OneToOneTab.__init__(self, core, jid)
@ -78,11 +78,11 @@ class ConversationTab(OneToOneTab):
"""
Lets a plugin add its own information to the ConversationInfoWin
"""
ConversationTab.additional_informations[plugin_name] = callback
ConversationTab.additional_information[plugin_name] = callback
@staticmethod
def remove_information_element(plugin_name):
del ConversationTab.additional_informations[plugin_name]
del ConversationTab.additional_information[plugin_name]
def completion(self):
self.complete_commands(self.input)
@ -267,7 +267,7 @@ class ConversationTab(OneToOneTab):
if display_bar:
self.upper_bar.refresh(self.get_dest_jid(), roster[self.get_dest_jid()])
self.info_header.refresh(self.get_dest_jid(), roster[self.get_dest_jid()], self.text_win, self.chatstate, ConversationTab.additional_informations)
self.info_header.refresh(self.get_dest_jid(), roster[self.get_dest_jid()], self.text_win, self.chatstate, ConversationTab.additional_information)
if display_info_win:
self.info_win.refresh()
@ -276,7 +276,7 @@ class ConversationTab(OneToOneTab):
def refresh_info_header(self):
self.info_header.refresh(self.get_dest_jid(), roster[self.get_dest_jid()],
self.text_win, self.chatstate, ConversationTab.additional_informations)
self.text_win, self.chatstate, ConversationTab.additional_information)
self.input.refresh()
def get_nick(self):
@ -452,7 +452,7 @@ class DynamicConversationTab(ConversationTab):
displayed_jid = self.name
self.info_header.refresh(displayed_jid, roster[self.name],
self.text_win, self.chatstate,
ConversationTab.additional_informations)
ConversationTab.additional_information)
if display_info_win:
self.info_win.refresh()
@ -468,7 +468,7 @@ class DynamicConversationTab(ConversationTab):
else:
displayed_jid = self.name
self.info_header.refresh(displayed_jid, roster[self.name],
self.text_win, self.chatstate, ConversationTab.additional_informations)
self.text_win, self.chatstate, ConversationTab.additional_information)
self.input.refresh()
class StaticConversationTab(ConversationTab):

10
poezio/tabs/privatetab.py
View file

@ -33,7 +33,7 @@ class PrivateTab(OneToOneTab):
"""
message_type = 'chat'
plugin_commands = {}
additional_informations = {}
additional_information = {}
plugin_keys = {}
def __init__(self, core, name, nick):
OneToOneTab.__init__(self, core, name)
@ -84,11 +84,11 @@ class PrivateTab(OneToOneTab):
"""
Lets a plugin add its own information to the PrivateInfoWin
"""
PrivateTab.additional_informations[plugin_name] = callback
PrivateTab.additional_information[plugin_name] = callback
@staticmethod
def remove_information_element(plugin_name):
del PrivateTab.additional_informations[plugin_name]
del PrivateTab.additional_information[plugin_name]
def load_logs(self, log_nb):
logs = logger.get_logs(safeJID(self.name).full.replace('/', '\\'), log_nb)
@ -254,7 +254,7 @@ class PrivateTab(OneToOneTab):
self.text_win.refresh()
self.info_header.refresh(self.name, self.text_win, self.chatstate,
PrivateTab.additional_informations)
PrivateTab.additional_information)
if display_info_win:
self.info_win.refresh()
@ -262,7 +262,7 @@ class PrivateTab(OneToOneTab):
self.input.refresh()
def refresh_info_header(self):
self.info_header.refresh(self.name, self.text_win, self.chatstate, PrivateTab.additional_informations)
self.info_header.refresh(self.name, self.text_win, self.chatstate, PrivateTab.additional_information)
self.input.refresh()
def get_nick(self):

2
poezio/text_buffer.py
View file

@ -96,7 +96,7 @@ class AckError(Exception):
class TextBuffer(object):
"""
This class just keep trace of messages, in a list with various
informations and attributes.
information and attributes.
"""
def __init__(self, messages_nb_limit=None):

40
poezio/windows/info_wins.py
View file

@ -53,29 +53,29 @@ class XMLInfoWin(InfoWin):
class PrivateInfoWin(InfoWin):
"""
The line above the information window, displaying informations
The line above the information window, displaying information
about the MUC user we are talking to
"""
def __init__(self):
InfoWin.__init__(self)
def refresh(self, name, window, chatstate, informations):
def refresh(self, name, window, chatstate, information):
log.debug('Refresh: %s', self.__class__.__name__)
self._win.erase()
self.write_room_name(name)
self.print_scroll_position(window)
self.write_chatstate(chatstate)
self.write_additional_informations(informations, name)
self.write_additional_information(information, name)
self.finish_line(get_theme().COLOR_INFORMATION_BAR)
self._refresh()
def write_additional_informations(self, informations, jid):
def write_additional_information(self, information, jid):
"""
Write all informations added by plugins by getting the
Write all information added by plugins by getting the
value returned by the callbacks.
"""
for key in informations:
self.addstr(informations[key](jid), to_curses_attr(get_theme().COLOR_INFORMATION_BAR))
for key in information:
self.addstr(information[key](jid), to_curses_attr(get_theme().COLOR_INFORMATION_BAR))
def write_room_name(self, name):
jid = safeJID(name)
@ -90,7 +90,7 @@ class PrivateInfoWin(InfoWin):
class MucListInfoWin(InfoWin):
"""
The live above the information window, displaying informations
The live above the information window, displaying informatios
about the muc server being listed
"""
def __init__(self, message=''):
@ -111,14 +111,14 @@ class MucListInfoWin(InfoWin):
class ConversationInfoWin(InfoWin):
"""
The line above the information window, displaying informations
The line above the information window, displaying information
about the user we are talking to
"""
def __init__(self):
InfoWin.__init__(self)
def refresh(self, jid, contact, window, chatstate, informations):
def refresh(self, jid, contact, window, chatstate, information):
# contact can be None, if we receive a message
# from someone not in our roster. In this case, we display
# only the maximum information from the message we can get.
@ -139,26 +139,26 @@ class ConversationInfoWin(InfoWin):
self._win.erase()
if config.get('show_jid_in_conversations'):
self.write_contact_jid(jid)
self.write_contact_informations(contact)
self.write_contact_information(contact)
self.write_resource_information(resource)
self.print_scroll_position(window)
self.write_chatstate(chatstate)
self.write_additional_informations(informations, jid)
self.write_additional_information(information, jid)
self.finish_line(get_theme().COLOR_INFORMATION_BAR)
self._refresh()
def write_additional_informations(self, informations, jid):
def write_additional_information(self, information, jid):
"""
Write all informations added by plugins by getting the
Write all information added by plugins by getting the
value returned by the callbacks.
"""
for key in informations:
self.addstr(informations[key](jid),
for key in information:
self.addstr(information[key](jid),
to_curses_attr(get_theme().COLOR_INFORMATION_BAR))
def write_resource_information(self, resource):
"""
Write the informations about the resource
Write the information about the resource
"""
if not resource:
presence = "unavailable"
@ -169,9 +169,9 @@ class ConversationInfoWin(InfoWin):
self.addstr(get_theme().CHAR_STATUS, to_curses_attr(color))
self.addstr(']', to_curses_attr(get_theme().COLOR_INFORMATION_BAR))
def write_contact_informations(self, contact):
def write_contact_information(self, contact):
"""
Write the informations about the contact
Write the information about the contact
"""
if not contact:
self.addstr("(contact not in roster)", to_curses_attr(get_theme().COLOR_INFORMATION_BAR))
@ -207,7 +207,7 @@ class DynamicConversationInfoWin(ConversationInfoWin):
class MucInfoWin(InfoWin):
"""
The line just above the information window, displaying informations
The line just above the information window, displaying information
about the MUC we are viewing
"""
def __init__(self):

4
poezio/windows/roster_win.py
View file

@ -215,8 +215,8 @@ class RosterWin(Win):
def draw_contact_line(self, y, contact, colored, group, show_roster_sub=False,
show_s2s_errors=True, show_roster_jids=False):
"""
Draw on a line all informations about one contact.
This is basically the highest priority resource's informations
Draw on a line all information about one contact.
This is basically the highest priority resource's information
Use 'color' to draw the jid/display_name to show what is
the currently selected contact in the list
"""