Changeset 269 for trunk


Ignore:
Timestamp:
07/20/09 07:59:45 (3 years ago)
Author:
marc
Message:

Fixed locale support, fixed some Pynotify issues

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r268 r269  
    77 * Switch to GPLv3 
    88 * Better console help 
     9 * Report Itaka version in HTTP headers 
    910 * Don't clean out status labels when restarting server 
    1011 * Don't check for system compatibility of Libnotify 

  • trunk/Makefile

    r237 r269  
    1515DATADIR = $(DESTDIR)/share/itaka 
    1616IMAGESDIR = $(DATADIR)/images 
    17 LOCALEDIR = $(DESTDIR)/locale 
     17LOCALEDIR = $(DATADIR)/locale 
    1818APPLICATIONSDIR = $(DESTDIR)/share/applications 
    1919ICONDIR = $(DESTDIR)/share/pixmaps 
    … …  
    2222# For debian compatibility, these are hardcoded 
    2323REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images/ 
    24 REPLACELOCALEDIR = $(PREFIX)/locale/ 
     24REPLACELOCALEDIR = $(PREFIX)/share/itaka/locale/ 
    2525 
    2626PYFILES := $(shell $(FIND) . -name "*.py" -print) 

  • trunk/README

    r268 r269  
    101101For more information, please see the GNU gettext manual at http://www.gnu.org/software/gettext/manual/gettext.html 
    102102 
     103NOTE: Your system must have the locale you want to work with installed prior to working with Itaka, if not you might get this message from Python "locale.Error: unsupported locale setting". Refer to your system documentations on how to install/set locales/languages. 
     104 
    1031057. RELEASE NOTES: 
    104106 

  • trunk/itaka.py

    r268 r269  
    4747 
    4848#: To be changed on install to specify where the installed files actually are 
    49 locale_prefix = "/usr/share/locale/" 
     49locale_prefix = "/usr/share/itaka/locale/" 
    5050 
    5151if os.path.exists(locale_prefix): 

  • trunk/server.py

    r268 r269  
    475475        if self.configuration['server']['notify'] and self.itaka_globals.notify_available: 
    476476            import pynotify 
    477             uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka64x64.png"))  
    478             print_m(uri) 
    479  
    480             n = pynotify.Notification(_('Screenshot taken'), _('%s requested screenshot' % (self.ip)), uri) 
     477            # 48x48 image by default looks bad in Ubuntu 
     478            uri = "file://" + (os.path.join(self.itaka_globals.image_dir, "itaka-take.png"))  
     479 
     480            n = pynotify.Notification(_('Screenshot taken'), _('%s captured the screen' % (self.ip)), uri) 
    481481 
    482482            n.set_timeout(1500) 
Note: See TracChangeset for help on using the changeset viewer.