diff -Nru /tmp/Eb08lLh8Ky/linda-0.3.17/debian/changelog /tmp/T16GpwIJjC/linda-0.3.17/debian/changelog --- /tmp/Eb08lLh8Ky/linda-0.3.17/debian/changelog 2006-01-15 06:12:08.000000000 +0200 +++ /tmp/T16GpwIJjC/linda-0.3.17/debian/changelog 2005-11-21 13:47:38.000000000 +0200 @@ -1,10 +1,3 @@ -linda (0.3.17-0ubuntu1) dapper; urgency=low - - * Teach Linda's custom gettext routines how to find '.mo' translation - files in Ubuntu's '/usr/share/locale-langpack' location. - - -- Paul Sladen Sun, 15 Jan 2006 06:11:23 +0200 - linda (0.3.17) unstable; urgency=low * Linda: diff -Nru /tmp/Eb08lLh8Ky/linda-0.3.17/mygettext.py /tmp/T16GpwIJjC/linda-0.3.17/mygettext.py --- /tmp/Eb08lLh8Ky/linda-0.3.17/mygettext.py 2006-01-15 06:08:27.000000000 +0200 +++ /tmp/T16GpwIJjC/linda-0.3.17/mygettext.py 2005-08-08 15:42:53.000000000 +0300 @@ -21,7 +21,7 @@ return result def find(domain): - localedirs = ['/usr/share/locale', '/usr/share/locale-langpack'] + localedir = '/usr/share/locale' languages = [] for envar in ('LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG'): if os.environ.get(envar): @@ -38,23 +38,10 @@ for lang in nelangs: if linda.root != '/usr/share/linda': mofile = os.path.join(linda.root, 'po', 'en.mo') - if os.path.exists(mofile): - result.append(mofile) else: - # Check the main locale directories. - # Ubuntu has messages split out and stored in language- - # packs which install to a separate location. The - # instruction is to use the '.mo' with the most recent - # timestamp if there at multiple copies. - latest_seen = 0 - for localedir in localedirs: - mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % \ - domain) - if os.path.exists(mofile): - modified = os.stat(mofile)[8] - if modified > latest_seen: - latest_file, latest_seen = mofile, modified - if latest_seen > 0: - result.append(latest_file) + mofile = os.path.join(localedir, lang, 'LC_MESSAGES', '%s.mo' % \ + domain) + if os.path.exists(mofile): + result.append(mofile) return result diff -Nru /tmp/Eb08lLh8Ky/linda-0.3.17/po/linda.pot /tmp/T16GpwIJjC/linda-0.3.17/po/linda.pot --- /tmp/Eb08lLh8Ky/linda-0.3.17/po/linda.pot 2006-01-15 06:08:38.000000000 +0200 +++ /tmp/T16GpwIJjC/linda-0.3.17/po/linda.pot 2005-11-21 11:44:19.000000000 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-01-15 06:08+EET\n" +"POT-Creation-Date: 2005-11-21 20:44+EST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"