=== modified file 'Makefile'
--- Makefile	2008-12-11 03:57:07 +0000
+++ Makefile	2008-12-19 05:56:12 +0000
@@ -21,23 +21,22 @@
 DOCS_CLEAN=rm -rf docs entertainer-docs.tar.gz
 DOCS_TAR=${DOCS_DIR}; tar -czf entertainer-docs.tar.gz docs
 
-TRANS_DIR=cd tools/translations
-TRANSLATE=./generate_new_pot.sh
-UPDATE=./update.sh
+TOOLS_DIR=cd tools
+TRANSLATE= ${PYTHON} translations_generator.py
 
 check: test lint
 
 lint:
-	${LINT} ${LINT_FLAGS} entertainer* tools/pytools/* setup.py
+	${LINT} ${LINT_FLAGS} entertainer* tools/*.py setup.py
 
 test:
 	${TEST}
 
 mo: pot
-	${TRANS_DIR};${UPDATE}
+	${TOOLS_DIR};${TRANSLATE} po mo
 
 pot:
-	${TRANS_DIR};${TRANSLATE}
+	${TOOLS_DIR};${TRANSLATE} pot
 
 tags:
 	${CTAGS} ${CTAGS_FLAGS} entertainerlib

=== removed directory 'locale'
=== removed directory 'locale/da'
=== removed directory 'locale/da/LC_MESSAGES'
=== removed file 'locale/da/LC_MESSAGES/entertainer.mo'
Binary files locale/da/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/da/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/de'
=== removed directory 'locale/de/LC_MESSAGES'
=== removed file 'locale/de/LC_MESSAGES/entertainer.mo'
Binary files locale/de/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/de/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/en_GB'
=== removed directory 'locale/en_GB/LC_MESSAGES'
=== removed file 'locale/en_GB/LC_MESSAGES/entertainer.mo'
Binary files locale/en_GB/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/en_GB/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/es_ES'
=== removed directory 'locale/es_ES/LC_MESSAGES'
=== removed file 'locale/es_ES/LC_MESSAGES/entertainer.mo'
Binary files locale/es_ES/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/es_ES/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/fi'
=== removed directory 'locale/fi/LC_MESSAGES'
=== removed file 'locale/fi/LC_MESSAGES/entertainer.mo'
Binary files locale/fi/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/fi/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/fr'
=== removed directory 'locale/fr/LC_MESSAGES'
=== removed file 'locale/fr/LC_MESSAGES/entertainer.mo'
Binary files locale/fr/LC_MESSAGES/entertainer.mo	2008-12-02 12:20:35 +0000 and locale/fr/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/fr_FR'
=== removed directory 'locale/fr_FR/LC_MESSAGES'
=== removed file 'locale/fr_FR/LC_MESSAGES/entertainer.mo'
Binary files locale/fr_FR/LC_MESSAGES/entertainer.mo	2008-10-04 21:48:20 +0000 and locale/fr_FR/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/gl'
=== removed directory 'locale/gl/LC_MESSAGES'
=== removed file 'locale/gl/LC_MESSAGES/entertainer.mo'
Binary files locale/gl/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/gl/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/he'
=== removed directory 'locale/he/LC_MESSAGES'
=== removed file 'locale/he/LC_MESSAGES/entertainer.mo'
Binary files locale/he/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/he/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/it'
=== removed directory 'locale/it/LC_MESSAGES'
=== removed file 'locale/it/LC_MESSAGES/entertainer.mo'
Binary files locale/it/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/it/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/nl'
=== removed directory 'locale/nl/LC_MESSAGES'
=== removed file 'locale/nl/LC_MESSAGES/entertainer.mo'
Binary files locale/nl/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/nl/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/pt'
=== removed directory 'locale/pt/LC_MESSAGES'
=== removed file 'locale/pt/LC_MESSAGES/entertainer.mo'
Binary files locale/pt/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/pt/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/pt_BR'
=== removed directory 'locale/pt_BR/LC_MESSAGES'
=== removed file 'locale/pt_BR/LC_MESSAGES/entertainer.mo'
Binary files locale/pt_BR/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/pt_BR/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/sv'
=== removed directory 'locale/sv/LC_MESSAGES'
=== removed file 'locale/sv/LC_MESSAGES/entertainer.mo'
Binary files locale/sv/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/sv/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== removed directory 'locale/zh_CN'
=== removed directory 'locale/zh_CN/LC_MESSAGES'
=== removed file 'locale/zh_CN/LC_MESSAGES/entertainer.mo'
Binary files locale/zh_CN/LC_MESSAGES/entertainer.mo	2008-10-04 18:04:03 +0000 and locale/zh_CN/LC_MESSAGES/entertainer.mo	1970-01-01 00:00:00 +0000 differ
=== modified file 'setup.py'
--- setup.py	2008-12-16 03:58:48 +0000
+++ setup.py	2008-12-19 05:56:12 +0000
@@ -4,6 +4,13 @@
 from distutils.core import setup
 import os
 
+from tools.translations_generator import TranslationsGenerator
+
+# Before we build anything, create all the locales and mos from the current pos
+os.chdir('tools')
+translations_generator = TranslationsGenerator()
+translations_generator.update_mos()
+os.chdir('..')
 
 def find_files(dirs, dest_root='share'):
     '''Walk files and directories and return them in a form for data_files'''

=== added file 'tools/__init__.py'
--- tools/__init__.py	1970-01-01 00:00:00 +0000
+++ tools/__init__.py	2008-12-19 05:56:12 +0000
@@ -0,0 +1,1 @@
+'''Entertainer tools'''

=== renamed file 'tools/pytools/loc.py' => 'tools/loc.py'
=== renamed file 'tools/pytools/log-viewer' => 'tools/log-viewer'
=== renamed file 'tools/pytools/messagebus-notifier' => 'tools/messagebus-notifier'
=== added directory 'tools/po'
=== renamed file 'tools/translations/entertainer-da.po' => 'tools/po/entertainer-da.po'
=== renamed file 'tools/translations/entertainer-de.po' => 'tools/po/entertainer-de.po'
=== renamed file 'tools/translations/entertainer-en_GB.po' => 'tools/po/entertainer-en_GB.po'
=== renamed file 'tools/translations/entertainer-es_ES.po' => 'tools/po/entertainer-es_ES.po'
=== renamed file 'tools/translations/entertainer-fi.po' => 'tools/po/entertainer-fi.po'
=== renamed file 'tools/translations/entertainer-fr.po' => 'tools/po/entertainer-fr.po'
=== renamed file 'tools/translations/entertainer-fr_FR.po' => 'tools/po/entertainer-fr_FR.po'
=== renamed file 'tools/translations/entertainer-gl.po' => 'tools/po/entertainer-gl.po'
=== renamed file 'tools/translations/entertainer-he.po' => 'tools/po/entertainer-he.po'
=== renamed file 'tools/translations/entertainer-hu.po' => 'tools/po/entertainer-hu.po'
=== renamed file 'tools/translations/entertainer-it.po' => 'tools/po/entertainer-it.po'
=== renamed file 'tools/translations/entertainer-nl.po' => 'tools/po/entertainer-nl.po'
=== renamed file 'tools/translations/entertainer-pl.po' => 'tools/po/entertainer-pl.po'
=== renamed file 'tools/translations/entertainer-pt.po' => 'tools/po/entertainer-pt.po'
=== renamed file 'tools/translations/entertainer-pt_BR.po' => 'tools/po/entertainer-pt_BR.po'
=== renamed file 'tools/translations/entertainer-sv.po' => 'tools/po/entertainer-sv.po'
=== renamed file 'tools/translations/entertainer-zh_CN.po' => 'tools/po/entertainer-zh_CN.po'
=== renamed file 'tools/translations/entertainer.pot' => 'tools/po/entertainer.pot'
=== removed directory 'tools/pytools'
=== renamed file 'tools/pytools/run_debug.py' => 'tools/run_debug.py'
=== removed directory 'tools/translations'
=== removed file 'tools/translations/generate_new_pot.sh'
--- tools/translations/generate_new_pot.sh	2008-12-11 04:21:27 +0000
+++ tools/translations/generate_new_pot.sh	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Authors: Joshua Scotton, Matt Layman
-# License: GPLv2
-# Copyright: 2008, Joshua Scotton <email address hidden>
-#            2008, Matt Layman <email address hidden>
-
-# Create the header files from all the glade files
-find ../../entertainerlib/ -name "*.glade" > glade.txt
-for glade in $(cat glade.txt)
-do
-    intltool-extract --type=gettext/glade $glade
-done
-
-# Generate the POTFILE.in
-find ../../entertainerlib/ -name "*.py" > tmp.txt
-find ../../entertainerlib/ -name "*.glade.h" > headers.txt
-cat headers.txt >> tmp.txt
-# Remove entertainerlib/utils/EXIF.py as it causes problems
-sed tmp.txt -e 's/..\/..\/entertainerlib\/utils\/EXIF.py//' > POTFILE.in
-rm tmp.txt
-
-# Generate the pot file
-xgettext --language=Python --keyword=_ --keyword=N_ --output=tmp.pot --files-from=POTFILE.in
-sed tmp.pot -e 's/charset=CHARSET/charset=UTF-8/' > entertainer.pot
-rm tmp.pot
-
-# Clean up the unnecessary files
-rm POTFILE.in
-rm glade.txt
-xargs -a headers.txt rm
-rm headers.txt
-

=== removed file 'tools/translations/update.sh'
--- tools/translations/update.sh	2008-12-11 03:57:07 +0000
+++ tools/translations/update.sh	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Update the po files from whatever is in the pot file
-# Authors: Matt Layman
-# License: GPLv2
-# Copyright: 2008, Matt Layman <email address hidden>
-
-for po in *.po
-do
-    # Update the po file
-    msgmerge -U $po entertainer.pot
-
-    # Extract the language out of entertainer-foo.po for language foo
-    basename=${po%.po}
-    language=${basename#entertainer-}
-
-    # Add a mo file for each po
-    language_dir=../../locale/$language/LC_MESSAGES
-    mkdir -p $language_dir
-    msgfmt $po -o $language_dir/entertainer.mo
-
-    echo "$po updated and mo generated ..."
-done
-

=== added file 'tools/translations_generator.py'
--- tools/translations_generator.py	1970-01-01 00:00:00 +0000
+++ tools/translations_generator.py	2008-12-19 05:56:12 +0000
@@ -0,0 +1,130 @@
+'''Generate translations related files, pot/po/mo'''
+
+__license__ = 'GPLv2'
+__copyright__ = '2008, Matt Layman'
+__author__ = 'Matt Layman <email address hidden>'
+
+import glob
+import os
+import re
+from subprocess import call
+import sys
+
+class TranslationsGenerator(object):
+    '''Translation file generator'''
+
+    def __init__(self, lib_dir = '../entertainerlib', pot_dir = 'po',
+        po_dir = 'po', mo_dir = '.', exclude_dir_pattern = 'tests'):
+
+        # Directory of python library files to search for for translations
+        self.lib_dir = lib_dir
+
+        # A directory pattern to exclude when searching
+        self.exclude = exclude_dir_pattern
+
+        # Directory where pot file is stored
+        self.pot_dir = pot_dir
+
+        # Directory where po files are stored
+        self.po_dir = po_dir
+
+        # Directory to output mo files and related directories
+        self.mo_dir = mo_dir
+
+    def update_pot(self, pot_file = 'entertainer.pot'):
+        '''Update the pot file
+
+        If the pot file does not exist, create one.
+        '''
+
+        def generate_header(glade_file):
+            '''Create a header file from the glade file with intltool-extract'''
+
+            call(['intltool-extract', '--type=gettext/glade', glade_file])
+
+            return '%s.h' % glade_file
+
+        # List of file names to feed to xgettext
+        files_to_translate = []
+        # Store header file names to clean up after pot generation is complete
+        headers = []
+
+        # Cycle through all the files and collect the necessary data
+        for root, dirs, files in os.walk(self.lib_dir):
+            if self.exclude in root:
+                continue
+            for file in files:
+                full_path = os.path.join(root, file)
+
+                (path, ext) = os.path.splitext(full_path)
+                if ext == '.py':
+                    # XXX: laymansterms - EXIF is coming out but it still needs
+                    # filtering out of the list for now
+                    if 'EXIF' in full_path:
+                        continue
+                    files_to_translate.append(full_path)
+                elif ext == '.glade':
+                    header = generate_header(full_path)
+                    files_to_translate.append(header)
+                    headers.append(header)
+
+        # Generate pot file
+        tmp = 'tmp.pot'
+        command = ['xgettext', '--language=Python', '--keyword=_',
+            '--keyword=N_', '--output=%s' % tmp]
+        command.extend(files_to_translate)
+        call(command)
+
+        # Replace CHARSET with UTF-8 and write to final pot filename
+        pot_path = os.path.join(self.pot_dir, pot_file)
+        out = open(pot_path, 'w')
+        data = open(tmp).read()
+        out.write(re.sub('charset=CHARSET', 'charset=UTF-8', data))
+        out.close()
+
+        # Remove unnecessary files
+        for header in headers:
+            os.remove(header)
+        os.remove(tmp)
+
+    def update_pos(self, pot_file = 'entertainer.pot'):
+        '''Update all po files with the data in the pot reference file'''
+
+        pot_path = os.path.join(self.pot_dir, pot_file)
+
+        pos = glob.glob(os.path.join(self.po_dir, '*.po'))
+        for po in pos:
+            call(['msgmerge', '-U', po, pot_path])
+
+    def update_mos(self, search_pattern = 'entertainer-(.*)\.po',
+        mo_name = 'entertainer'):
+        '''Generate mo files for all po files
+
+        Search pattern is the pattern that all the po files are in. The saved
+        value is the locale that is pulled out of the po filename.
+        '''
+
+        pos = glob.glob(os.path.join(self.po_dir, '*.po'))
+        for po in pos:
+            match = re.search(search_pattern, po)
+            lang = match.group(1)
+            lang_dir = '../locale/%s/LC_MESSAGES' % lang
+
+            # Create the directory and all its intermediates if needed
+            if not os.path.exists(lang_dir):
+                os.makedirs(lang_dir)
+
+            # Create the mo file from the po file
+            mo_out = os.path.join(lang_dir, '%s.mo' % mo_name)
+            call(['msgfmt', po, '-o', mo_out])
+
+if __name__ == '__main__':
+    translation_generator = TranslationsGenerator()
+
+    if 'pot' in sys.argv:
+        translation_generator.update_pot()
+    if 'po' in sys.argv:
+        translation_generator.update_pos()
+    if 'mo' in sys.argv:
+        translation_generator.update_mos()
+