Changeset 235 for trunk

Timestamp:

07/06/07 09:35:55 (5 years ago)

Author:

marc

Message:

Major changes to docs, makefiles, debian rules to support translations.

Location:

trunk

Files:

• COPYRIGHT (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Makefile (modified) (4 diffs)
• Makefile.Debian (deleted)
• README (modified) (3 diffs)
• debian/control (modified) (1 diff)
• debian/itaka.dirs (modified) (1 diff)
• debian/rules (modified) (2 diffs)
• itaka.spec (modified) (2 diffs)
• uigtk.py (modified) (1 diff)

trunk/COPYRIGHT

@@ -1 @@
-Marc E. <santusmarc@gmail.com>
+Marc E. <santusmarc@users.sourceforge.net>
 Kurt Erickson <psychogenicshk@users.sourceforge.net> (RPM packager)
 Tango Project (http://tango.freedesktop.org)

trunk/ChangeLog

@@ -1 @@
-trunk:
+1.0:
  * Added RPM packages
+ * Added interface translations.
 
 0.2 (I've been watching you...):

trunk/Makefile

@@ -7 +7 @@
 FIND ?= find
 
-# autodetect GNOME prefix, change this if you want it elsewhere
-#PREFIX ?= `pkg-config libgnome-2.0 --variable=prefix || echo /usr`
 PREFIX = /usr
 DESTDIR = $(PREFIX)
@@ -16 +14 @@
 DATADIR = $(DESTDIR)/share/itaka
 IMAGESDIR = $(DATADIR)/images
-# For debian compatibility
-REPLACEIMAGESDIR = $(PREFIX)/share/itaka/images
+LOCALEDIR = $(DESTDIR)/locale
 APPLICATIONSDIR = $(DESTDIR)/share/applications
 ICONDIR = $(DESTDIR)/share/pixmaps
@@ -26 +23 @@
 install: 
         mv config.py config.py.old
-        sed -e "s|/usr/share/itaka/images/|$(REPLACEIMAGESDIR)|g" config.py.old > config.py
+        sed -e "s|/usr/share/itaka/images/|$(IMAGESDIR)|g" config.py.old > config.py
         $(INSTALL) -m 755 -d $(BINDIR) $(DATADIR) $(LIBDIR) $(IMAGESDIR) $(APPLICATIONSDIR) $(ICONDIR) $(MANDIR)
         $(INSTALL) -m 755 *.py $(LIBDIR)
@@ -39 +36 @@
         chmod +x $(BINDIR)/itaka
         mv config.py.old config.py
-        rm share/itaka.1.gz
-        for lang in i18n/*; do for pofile in $lang/LC_MESSAGES/*.po; do msgfmt $pofile -o $lang/LC_MESSAGES/itaka.mo; done; done
+        
+        for lang in locale/*; do 
+            if [[ -e $lang/LC_MESSAGES/itaka.po ]]; then 
+                for pofile in $lang/LC_MESSAGES/itaka.po; do
+                    msgfmt $pofile -o $lang/LC_MESSAGES/itaka.mo && $(INSTALL) -m 644 $pofile $(LOCALEDIR)/${lang#locale/}/LC_MESSAGES/itaka.mo; 
+                done;
+            fi;
+        done
+
 uninstall:
         rm -r $(BINDIR)/itaka $(DATADIR) $(LIBDIR) $(ICONDIR)/itaka.png $(APPLICATIONSDIR)/itaka.desktop $(MANDIR)/itaka.1.gz
+
+clean:
+        find . -name '*.pyc' -o -name '*.pyo' -exec rm {} \;
+        rm locale/*/LC_MESSAGES/*.mo
+        rm share/itaka.1.gz
+
+help:
+        @echo Usage:
+        @echo make clean                - delete built modules and object files
+        @echo make install              - install binaries into the official directories
+        @echo make uninstall            - uninstall binaries from the official directories
+        @echo make help                 - prints this help
+        @echo
+

trunk/README

@@ -11 +11 @@
 4. DOCUMENTATION
 5. HACKING
-6. RELEASE NOTES
-7. PROGRAM CREDITS
+6. TRANSLATING
+7. RELEASE NOTES
+8. PROGRAM CREDITS
 
 1. REQUIRED LIBRARIES:
@@ -59 +60 @@
 If you intend to change Itaka source code, please read the HACKING file.
 
-6. RELEASE NOTES:
+6. TRANSLATING:
+
+Translating Itaka to another language is quite easy, you first need GNU gettext installed. 
+
+Each stable Itaka version will ship with a .pot template file located in
+locale/itaka.pot. This template includes all the up to date code strings, and
+is the base you should use to create your translation.
+
+If you've changed any strings, the itaka.pot file can be regenerated by doing:
+    $ xgettext -o locale/itaka.pot *.py
+    $ msguniq -o locale/itaka.pot locale/itaka.pot
+
+The last command cleans up duplicate entries, which saves you a lot of time and avoids errors.
+
+If you want to create a brand new translation, and have not modified code, do the following:
+
+    $ mkdir -p locale/de/LC_MESSAGES/
+    $ LANG=de_DE msginit -o locale/de/LC_MESSAGES/itaka.po
+    $ msgmerge -U locale/de/LC_MESSAGES/itaka.po locale/itaka.pot
+
+Now edit the itaka.po file. When you are done translating the strings, submit
+the .po file to the bug tracker (see BUGS file) as an enhancement. If you want
+to start using the translation right away, you need to create a binary by doing
+the following:
+
+    $ msgfmt locale/de/LC_MESSAGES/de.po -o locale/de/LC_MESSAGES/de.mo
+    $ LANG=de_DE itaka
+
+If you want to update existings translations, follow the steps to regenerate
+the .pot template if code was changed, then do the following:
+
+    $ msgmerge -U language.po itaka.pot
+
+For more information, please see the GNU gettext manual at http://www.gnu.org/software/gettext/manual/gettext.html
+
+7. RELEASE NOTES:
 
 See the ChangeLog for more detailed information.
@@ -75 +111 @@
 See COPYING file for further license information.
 
-7. PROGRAM CREDITS:
+8. PROGRAM CREDITS:
 
 Special thanks to James Henstridge for the excellent Python-GTK bindings and 

trunk/debian/control

@@ -3 +3 @@
 Priority: extra
 Maintainer: Marc E. <santusmarc@gmail.com>
-Build-Depends: imagemagick, docbook-to-man, python, debhelper (>= 5.0.37.2)
+Build-Depends: imagemagick, docbook-to-man, python, intltool, gettext, debhelper (>= 5.0.37.2)
 Standards-Version: 3.7.2
 

trunk/debian/itaka.dirs

@@ -4 +4 @@
 usr/share/pixmaps
 usr/share/applications
+usr/share/locale

trunk/debian/rules

@@ -36 +36 @@
 
         # Add here commands to clean up after the build process.
-        #-$(MAKE) clean
+        -$(MAKE) clean
 
         -rm -f debian/files
@@ -49 +49 @@
 
         # Add here commands to install the package into debian/itaka.
-        $(MAKE) -f Makefile.Debian DESTDIR=$(CURDIR)/debian/itaka install
-        #$(MAKE) install
+        $(MAKE) DESTDIR=$(CURDIR)/debian/itaka/usr install
 
         # And other miscellaneous tasks

trunk/itaka.spec

@@ -1 +1 @@
 Summary: On-demand screenshooting server
 Name: itaka
-Version: 0.2
+Version: 1.0
 Release: 1
 License: GPL
@@ -43 +43 @@
 
 %clean
+# Might want to add a make clean, since I've added it.
 rm -rf $RPM_BUILD_ROOT
 

trunk/uigtk.py

@@ -936 +936 @@
         self.aboutdialog.set_copyright(u'© 2003-2007 Marc E.')
         self.aboutdialog.set_comments('Screenshooting de mercado.')
-        self.aboutdialog.set_authors(['Marc E. <santusmarc@users.sourceforge.net>', 'Kurt Erickson <psychogenicshk@users.sourceforge.net> (Packaging)'])
+        self.aboutdialog.set_authors(['Marc E. <santusmarc@users.sourceforge.net>', _('Kurt Erickson <psychogenicshk@users.sourceforge.net> (Packaging)')])
         self.aboutdialog.set_artists(['Marc E. <santusmarc@users.sourceforge.net>', 'Tango Project (http://tango.freedesktop.org)'])
         self.aboutdialog.set_license('''Itaka is free software; you can redistribute it and/or modify