diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | locale/poezio.pot | 148 | ||||
| -rw-r--r-- | src/client.py | 7 | ||||
| -rw-r--r-- | src/config.py | 7 | ||||
| -rw-r--r-- | src/gui.py | 15 |
5 files changed, 90 insertions, 92 deletions
@@ -1,4 +1,4 @@ -prefix=/usr/local +prefix=/usr LIBDIR=$(DESTDIR)$(prefix)/lib BINDIR=$(DESTDIR)$(prefix)/bin DATADIR=$(DESTDIR)$(prefix)/share @@ -18,8 +18,9 @@ install: $(INSTALL) -m644 $$sourcefile $(DATADIR)/poezio/src; \ done - echo "#!/usr/bin/env python" > $(BINDIR)/poezio + echo "#!/bin/sh" > $(BINDIR)/poezio echo "cd $(DATADIR)/poezio/src/ && python client.py" >> $(BINDIR)/poezio + chmod 755 $(BINDIR)/poezio for localename in `find locale/ -maxdepth 1 -type d | grep -v '.svn' | sed 's:locale/::g'` ; do \ if [ -d locale/$$localename ]; then \ diff --git a/locale/poezio.pot b/locale/poezio.pot index e7941a63..a848a45f 100644 --- a/locale/poezio.pot +++ b/locale/poezio.pot @@ -3,216 +3,214 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-31 05:55+0100\n" -"PO-Revision-Date: 2010-01-31 06:07+0100\n" -"Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n" +"POT-Creation-Date: 2010-01-31 07:21+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/gui.py:98 +#: src/gui.py:106 #, python-format msgid "Your nickname is %s" -msgstr "Votre pseudo est %s" +msgstr "" -#: src/gui.py:99 +#: src/gui.py:107 #, python-format msgid "%s is in the room" -msgstr "%s est dans le salon" +msgstr "" -#: src/gui.py:106 +#: src/gui.py:114 #, python-format msgid "%(nick)s joined the room %(roomname)s" -msgstr "%(nick)s est entré dans le salon %(roomname)s" +msgstr "" -#: src/gui.py:112 +#: src/gui.py:120 #, python-format msgid "%(old_nick)s is now known as %(new_nick)s" -msgstr "%(old_nick)s s'appelle maintenant %(new_nick)s" +msgstr "" -#: src/gui.py:124 +#: src/gui.py:132 #, python-format msgid "You have been kicked by %(by)s. Reason: %(reason)s" -msgstr "Vous avez été kické(e) par %(by)s. Raison : %(reason)s" +msgstr "" -#: src/gui.py:126 +#: src/gui.py:134 #, python-format msgid "You have been kicked. Reason: %s" -msgstr "Vous avez été kické(e). Raison : %s" +msgstr "" -#: src/gui.py:129 +#: src/gui.py:137 #, python-format msgid "%(nick)s has been kicked by %(by)s. Reason: %(reason)s" -msgstr "%(nick)s a été kické(e) par %(by)s. Raison : %(reason)s" +msgstr "" -#: src/gui.py:131 +#: src/gui.py:139 #, python-format msgid "%(nick)s has been kicked. Reason: %(reason)s" -msgstr "%(nick)s a été kické(e). Raison : %(reason)s" +msgstr "" -#: src/gui.py:135 +#: src/gui.py:143 #, python-format msgid "%s has left the room" -msgstr "%s a quitté le salon" +msgstr "" -#: src/gui.py:138 +#: src/gui.py:146 #, python-format msgid "%(nick)s changed his/her status : %(a)s, %(b)s, %(c)s, %(d)s" -msgstr "%(nick)s a changé son statut : %(a)s, %(b)s, %(c)s, %(d)s" +msgstr "" -#: src/gui.py:158 +#: src/gui.py:166 msgid "OLOL, this is SOOO recursive" -msgstr "OLOL, this is SOOO recursive" +msgstr "" -#: src/gui.py:159 +#: src/gui.py:167 msgid "" "Usage: /join [room_name][/nick]\n" -"Join: Join the specified room. You can specify a nickname after a slash (/). If no nickname is specified, you will use the default_nick in the configuration file. You can omit the room name: you will then join the room you're looking at (useful if you were kicked). Examples:\n" +"Join: Join the specified room. You can specify a nickname after a slash (/). " +"If no nickname is specified, you will use the default_nick in the " +"configuration file. You can omit the room name: you will then join the room " +"you're looking at (useful if you were kicked). Examples:\n" "/join room@server.tld\n" "/join room@server.tld/John\n" "/join /me_again\n" "/join" msgstr "" -"Utilisation : /join [room_name][/nick]\n" -"Join : Entre dans le salon spécifié. Vous pouvez spécifier un pseudoname après un slash (/). Si aucun pseudonyme n'est spécifié, vous utiliserez le pseudonyme par défaut (default_nick) du fichier de configuration. Vous pouvez omettre le nom du salon : vous entrerez alors dans le salon que vous êtes en train de voir (utile après avoir été kické). Exemples :\n" -"/join room@server.tld\n" -"/join room@server.tld/Martin\n" -"/join /encore_moi\n" -"/join" -#: src/gui.py:160 +#: src/gui.py:168 msgid "" "Usage: /quit\n" "Quit: Just disconnect from the server and exit poezio." msgstr "" -"Utilisation : /quit\n" -"Quit : Se déconnecte tout simplement du serveur et quitte poezio." -#: src/gui.py:161 +#: src/gui.py:169 msgid "" "Usage: /exit\n" "Exit: Just disconnect from the server and exit poezio." msgstr "" -"Utilisation : /exit\n" -"Exit : Se déconnecte tout simplement du serveur et quitte poezio." -#: src/gui.py:162 +#: src/gui.py:170 msgid "" "Usage: /next\n" "Next: Go to the next room." msgstr "" -"Utilisation : /next\n" -"Next : Va au salon suivant." -#: src/gui.py:163 +#: src/gui.py:171 msgid "" "Usage: /prev\n" "Prev: Go to the previous room." msgstr "" -"Utilisation : /prev\n" -"Prev : Va au salon précédent." -#: src/gui.py:164 +#: src/gui.py:172 msgid "" "Usage: /part [message]\n" -"Part: disconnect from a room. You can specify an optionnal message." +"Part: disconnect from a room. You can specify an optional message." msgstr "" -"Utilisation : /part [message]\n" -"Part : Se déconnecte d'un salon. Vous pouvez spécifier un message optionnel" -#: src/gui.py:165 +#: src/gui.py:173 msgid "" "Usage: /show <availability> [status]\n" -"Show: Change your availability and (optionnaly) your status. The <availability> argument is one of \"avail, available, ok, here, chat, away, afk, dnd, busy, xa\" and the optional [message] argument will be your status message" +"Show: Change your availability and (optionaly) your status. The " +"<availability> argument is one of \"avail, available, ok, here, chat, away, " +"afk, dnd, busy, xa\" and the optional [message] argument will be your status " +"message" msgstr "" -#: src/gui.py:166 +#: src/gui.py:174 msgid "" "Usage: /away [message]\n" -"Away: Sets your availability to away and (optional) sets your status message. This is equivalent do \"/show away [message]\"" +"Away: Sets your availability to away and (optional) sets your status " +"message. This is equivalent to \"/show away [message]\"" msgstr "" -#: src/gui.py:167 +#: src/gui.py:175 msgid "" "Usage: /busy [message]\n" -"Busy: Sets your availability to busy and (optional) sets your status message. This is equivalent do \"/show busy [message]\"" +"Busy: Sets your availability to busy and (optional) sets your status " +"message. This is equivalent to \"/show busy [message]\"" msgstr "" -#: src/gui.py:168 +#: src/gui.py:176 msgid "" "Usage: /avail [message]\n" -"Avail: Sets your availability to available and (optional) sets your status message. This is equivalent do \"/show available [message]\"" +"Avail: Sets your availability to available and (optional) sets your status " +"message. This is equivalent to \"/show available [message]\"" msgstr "" -#: src/gui.py:169 +#: src/gui.py:177 msgid "" "Usage: /available [message]\n" -"Available: Sets your availability to available and (optional) sets your status message. This is equivalent do \"/show available [message]\"" +"Available: Sets your availability to available and (optional) sets your " +"status message. This is equivalent to \"/show available [message]\"" msgstr "" -#: src/gui.py:170 +#: src/gui.py:178 msgid "" "Usage: /bookmark [roomname][/nick]\n" -"Bookmark: Bookmark the specified room (you will then auto-join it on each poezio start). This commands uses the same syntaxe as /nick. Type /help nick for syntaxe examples. Note that when typing \"/bookmark\" on its own, the room will be bookmarked with the nickname you're currently using in this room (instead of default_nick)" +"Bookmark: Bookmark the specified room (you will then auto-join it on each " +"poezio start). This commands uses the same syntaxe as /nick. Type /help nick " +"for syntaxe examples. Note that when typing \"/bookmark\" on its own, the " +"room will be bookmarked with the nickname you're currently using in this " +"room (instead of default_nick)" msgstr "" -#: src/gui.py:171 +#: src/gui.py:179 msgid "" "Usage: /nick <nickname>\n" "Nick: Change your nickname in the current room" msgstr "" -#: src/gui.py:258 +#: src/gui.py:266 msgid "Welcome on Poezio \\o/!" msgstr "" -#: src/gui.py:259 +#: src/gui.py:267 #, python-format msgid "Your JID is %s" msgstr "" -#: src/gui.py:285 +#: src/gui.py:293 #, python-format msgid "message received for a non-existing room: %s" msgstr "" -#: src/gui.py:290 +#: src/gui.py:298 #, python-format msgid "%(nick)s changed the subject to: %(subject)s" msgstr "" -#: src/gui.py:311 +#: src/gui.py:319 #, python-format msgid "presence received for a non-existing room: %s" msgstr "" -#: src/gui.py:313 +#: src/gui.py:321 #, python-format msgid "Error: %s" msgstr "" -#: src/gui.py:348 +#: src/gui.py:356 msgid "Available commands are:" msgstr "" -#: src/gui.py:351 +#: src/gui.py:359 msgid "" "\n" "Type /help <command_name> to know what each command does" msgstr "" -#: src/gui.py:356 +#: src/gui.py:364 #, python-format -msgid "Unknown command : %s" +msgid "Unknown command: %s" msgstr "" -#: src/gui.py:384 +#: src/gui.py:393 #, python-format msgid "already in room [%s]" msgstr "" - diff --git a/src/client.py b/src/client.py index 263ed08f..a224bc9c 100644 --- a/src/client.py +++ b/src/client.py @@ -17,13 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Poezio. If not, see <http://www.gnu.org/licenses/>. -from gettext import (bindtextdomain, textdomain, bind_textdomain_codeset, - gettext as _) - -bindtextdomain('poezio') -textdomain('poezio') -bind_textdomain_codeset('poezio', 'UTF-8') - import sys from connection import Connection from multiuserchat import MultiUserChat diff --git a/src/config.py b/src/config.py index 4a507522..4d751072 100644 --- a/src/config.py +++ b/src/config.py @@ -84,10 +84,7 @@ if not CONFIG_HOME: CONFIG_HOME = environ.get('HOME')+'/.config/' CONFIG_PATH = CONFIG_HOME + 'poezio/' -try: - makedirs(CONFIG_PATH) - copy2('../data/default_config.cfg', CONFIG_PATH+'poezio.cfg') -except: - pass +makedirs(CONFIG_PATH) +copy2('../data/default_config.cfg', CONFIG_PATH+'poezio.cfg') config = Config(CONFIG_PATH+'poezio.cfg') @@ -20,6 +20,10 @@ from gettext import (bindtextdomain, textdomain, bind_textdomain_codeset, gettext as _) +bindtextdomain('poezio') +textdomain('poezio') +bind_textdomain_codeset('poezio', 'utf-8') + import locale locale.setlocale(locale.LC_ALL, '') import sys @@ -75,8 +79,12 @@ class Room(object): def add_info(self, info): """ info, like join/quit/status messages""" - self.lines.append((datetime.now(), info.encode('utf-8'))) - return info.encode('utf-8') + try: + self.lines.append((datetime.now(), info.encode('utf-8'))) + return info.encode('utf-8') + except: # I JUST FUCKING HATE THIS .encode.decode.shit !!! + self.lines.append((datetime.now(), info)) + return info def get_user_by_name(self, nick): for user in self.users: @@ -162,7 +170,7 @@ class Gui(object): 'next': (self.rotate_rooms_left, _('Usage: /next\nNext: Go to the next room.')), 'prev': (self.rotate_rooms_right, _('Usage: /prev\nPrev: Go to the previous room.')), 'part': (self.command_part, _('Usage: /part [message]\nPart: disconnect from a room. You can specify an optional message.')), - 'show': (self.command_show, _('Usage: /show <availability> [status]\nShow: Change your availability and (optionaly) your status. The <availability> argument is one of "avail, available, ok, here, chat, away, afk, dnd, busy, xa" and the optional [message] argument will be your status message')), + 'show': (self.command_show, _(u'Usage: /show <availability> [status]\nShow: Change your availability and (optionaly) your status. The <availability> argument is one of "avail, available, ok, here, chat, away, afk, dnd, busy, xa" and the optional [message] argument will be your status message')), 'away': (self.command_away, _('Usage: /away [message]\nAway: Sets your availability to away and (optional) sets your status message. This is equivalent to "/show away [message]"')), 'busy': (self.command_busy, _('Usage: /busy [message]\nBusy: Sets your availability to busy and (optional) sets your status message. This is equivalent to "/show busy [message]"')), 'avail': (self.command_avail, _('Usage: /avail [message]\nAvail: Sets your availability to available and (optional) sets your status message. This is equivalent to "/show available [message]"')), @@ -354,6 +362,7 @@ class Gui(object): msg = self.commands[args[0]][1] else: msg = _('Unknown command: %s') % args[0] +# open('fion', 'w').write(msg) room.add_info(msg) self.window.text_win.add_line(room, (datetime.now(), msg)) self.window.text_win.refresh(room.name) |