From 3fdfa8fab9ccfa661baa823d892ed563958ebba4 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 25 Apr 2010 00:18:15 +0000 Subject: Move locale out of fixtures and into localeapp to prevent test runner weirdness (finding nonminimal.txt.py). --- repoze/bfg/tests/fixtures/__init__.py | 1 - repoze/bfg/tests/fixtures/locale/GARBAGE | 1 - repoze/bfg/tests/fixtures/locale/be/LC_MESSAGES | 1 - .../fixtures/locale/de/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../fixtures/locale/de/LC_MESSAGES/deformsite.po | 31 --------------------- .../fixtures/locale/en/LC_MESSAGES/deformsite.mo | Bin 543 -> 0 bytes .../fixtures/locale/en/LC_MESSAGES/deformsite.po | 31 --------------------- repoze/bfg/tests/localeapp/__init__.py | 1 + repoze/bfg/tests/localeapp/locale/GARBAGE | 1 + repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES | 1 + .../localeapp/locale/de/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale/de/LC_MESSAGES/deformsite.po | 31 +++++++++++++++++++++ .../localeapp/locale/en/LC_MESSAGES/deformsite.mo | Bin 0 -> 543 bytes .../localeapp/locale/en/LC_MESSAGES/deformsite.po | 31 +++++++++++++++++++++ repoze/bfg/tests/test_configuration.py | 8 +++--- repoze/bfg/tests/test_i18n.py | 10 +++---- repoze/bfg/tests/test_zcml.py | 2 +- 17 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 repoze/bfg/tests/fixtures/__init__.py delete mode 100644 repoze/bfg/tests/fixtures/locale/GARBAGE delete mode 100644 repoze/bfg/tests/fixtures/locale/be/LC_MESSAGES delete mode 100644 repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.mo delete mode 100644 repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.po delete mode 100644 repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.mo delete mode 100644 repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.po create mode 100644 repoze/bfg/tests/localeapp/__init__.py create mode 100644 repoze/bfg/tests/localeapp/locale/GARBAGE create mode 100644 repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES create mode 100644 repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo create mode 100644 repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po create mode 100644 repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo create mode 100644 repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po diff --git a/repoze/bfg/tests/fixtures/__init__.py b/repoze/bfg/tests/fixtures/__init__.py deleted file mode 100644 index 1a35cdb4a..000000000 --- a/repoze/bfg/tests/fixtures/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# a file diff --git a/repoze/bfg/tests/fixtures/locale/GARBAGE b/repoze/bfg/tests/fixtures/locale/GARBAGE deleted file mode 100644 index 032c55584..000000000 --- a/repoze/bfg/tests/fixtures/locale/GARBAGE +++ /dev/null @@ -1 +0,0 @@ -Garbage file. diff --git a/repoze/bfg/tests/fixtures/locale/be/LC_MESSAGES b/repoze/bfg/tests/fixtures/locale/be/LC_MESSAGES deleted file mode 100644 index 909cf6a3b..000000000 --- a/repoze/bfg/tests/fixtures/locale/be/LC_MESSAGES +++ /dev/null @@ -1 +0,0 @@ -busted. diff --git a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.mo b/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.po b/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/repoze/bfg/tests/fixtures/locale/de/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.mo b/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.mo deleted file mode 100644 index 2924a5eb5..000000000 Binary files a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.mo and /dev/null differ diff --git a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.po b/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.po deleted file mode 100644 index 17f87bc19..000000000 --- a/repoze/bfg/tests/fixtures/locale/en/LC_MESSAGES/deformsite.po +++ /dev/null @@ -1,31 +0,0 @@ -# German translations for deformsite. -# Copyright (C) 2010 ORGANIZATION -# This file is distributed under the same license as the deformsite project. -# FIRST AUTHOR , 2010. -# -msgid "" -msgstr "" -"Project-Id-Version: deformsite 0.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2010-04-22 14:17+0400\n" -"PO-Revision-Date: 2010-04-22 14:17-0400\n" -"Last-Translator: FULL NAME \n" -"Language-Team: de \n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.5\n" - -#: deformsite/__init__.py:458 -msgid "Approve" -msgstr "Genehmigen" - -#: deformsite/__init__.py:459 -msgid "Show approval" -msgstr "Zeigen Genehmigung" - -#: deformsite/__init__.py:466 -msgid "Submit" -msgstr "Beugen" - diff --git a/repoze/bfg/tests/localeapp/__init__.py b/repoze/bfg/tests/localeapp/__init__.py new file mode 100644 index 000000000..1a35cdb4a --- /dev/null +++ b/repoze/bfg/tests/localeapp/__init__.py @@ -0,0 +1 @@ +# a file diff --git a/repoze/bfg/tests/localeapp/locale/GARBAGE b/repoze/bfg/tests/localeapp/locale/GARBAGE new file mode 100644 index 000000000..032c55584 --- /dev/null +++ b/repoze/bfg/tests/localeapp/locale/GARBAGE @@ -0,0 +1 @@ +Garbage file. diff --git a/repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES b/repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES new file mode 100644 index 000000000..909cf6a3b --- /dev/null +++ b/repoze/bfg/tests/localeapp/locale/be/LC_MESSAGES @@ -0,0 +1 @@ +busted. diff --git a/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.mo differ diff --git a/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/repoze/bfg/tests/localeapp/locale/de/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo new file mode 100644 index 000000000..2924a5eb5 Binary files /dev/null and b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.mo differ diff --git a/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po new file mode 100644 index 000000000..17f87bc19 --- /dev/null +++ b/repoze/bfg/tests/localeapp/locale/en/LC_MESSAGES/deformsite.po @@ -0,0 +1,31 @@ +# German translations for deformsite. +# Copyright (C) 2010 ORGANIZATION +# This file is distributed under the same license as the deformsite project. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: deformsite 0.0\n" +"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" +"POT-Creation-Date: 2010-04-22 14:17+0400\n" +"PO-Revision-Date: 2010-04-22 14:17-0400\n" +"Last-Translator: FULL NAME \n" +"Language-Team: de \n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.5\n" + +#: deformsite/__init__.py:458 +msgid "Approve" +msgstr "Genehmigen" + +#: deformsite/__init__.py:459 +msgid "Show approval" +msgstr "Zeigen Genehmigung" + +#: deformsite/__init__.py:466 +msgid "Submit" +msgstr "Beugen" + diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py index a1e753179..90e074e9a 100644 --- a/repoze/bfg/tests/test_configuration.py +++ b/repoze/bfg/tests/test_configuration.py @@ -1825,9 +1825,9 @@ class ConfiguratorTests(unittest.TestCase): import os from repoze.bfg.interfaces import ITranslationDirectories config = self._makeOne() - config.add_translation_dirs('repoze.bfg.tests.fixtures:locale') + config.add_translation_dirs('repoze.bfg.tests.localeapp:locale') here = os.path.dirname(__file__) - locale = os.path.join(here, 'fixtures', 'locale') + locale = os.path.join(here, 'localeapp', 'locale') self.assertEqual(config.registry.getUtility(ITranslationDirectories), [locale]) @@ -1838,7 +1838,7 @@ class ConfiguratorTests(unittest.TestCase): config = self._makeOne() manager.push({'request':request, 'registry':config.registry}) try: - config.add_translation_dirs('repoze.bfg.tests.fixtures:locale') + config.add_translation_dirs('repoze.bfg.tests.localeapp:locale') translate = config.registry.getUtility(IChameleonTranslate) self.assertEqual(translate('Approve'), u'Approve') finally: @@ -1849,7 +1849,7 @@ class ConfiguratorTests(unittest.TestCase): from repoze.bfg.interfaces import ITranslationDirectories config = self._makeOne() here = os.path.dirname(__file__) - locale = os.path.join(here, 'fixtures', 'locale') + locale = os.path.join(here, 'localeapp', 'locale') config.add_translation_dirs(locale) self.assertEqual(config.registry.getUtility(ITranslationDirectories), [locale]) diff --git a/repoze/bfg/tests/test_i18n.py b/repoze/bfg/tests/test_i18n.py index 9c4b226e4..fb79a802c 100644 --- a/repoze/bfg/tests/test_i18n.py +++ b/repoze/bfg/tests/test_i18n.py @@ -179,7 +179,7 @@ class Test_get_localizer(unittest.TestCase): from repoze.bfg.i18n import Localizer registry = get_current_registry() here = os.path.dirname(__file__) - localedir = os.path.join(here, 'fixtures', 'locale') + localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] registry.registerUtility(localedirs, ITranslationDirectories) request = DummyRequest() @@ -198,7 +198,7 @@ class Test_get_localizer(unittest.TestCase): from repoze.bfg.i18n import Localizer registry = get_current_registry() here = os.path.dirname(__file__) - localedir = os.path.join(here, 'fixtures', 'locale') + localedir = os.path.join(here, 'localeapp', 'locale') localedirs = [localedir] registry.registerUtility(localedirs, ITranslationDirectories) request = DummyRequest() @@ -270,7 +270,7 @@ class TestTranslations(unittest.TestCase): import gettext import os here = os.path.dirname(__file__) - localedir = os.path.join(here, 'fixtures', 'locale') + localedir = os.path.join(here, 'localeapp', 'locale') locales = ['de', 'en'] klass = self._getTargetClass() result = klass.load(localedir, locales, domain=None) @@ -279,7 +279,7 @@ class TestTranslations(unittest.TestCase): def test_load_found_locale_and_domain(self): import os here = os.path.dirname(__file__) - localedir = os.path.join(here, 'fixtures', 'locale') + localedir = os.path.join(here, 'localeapp', 'locale') locales = ['de', 'en'] klass = self._getTargetClass() result = klass.load(localedir, locales, domain='deformsite') @@ -288,7 +288,7 @@ class TestTranslations(unittest.TestCase): def test_load_found_locale_and_domain_locale_is_string(self): import os here = os.path.dirname(__file__) - localedir = os.path.join(here, 'fixtures', 'locale') + localedir = os.path.join(here, 'localeapp', 'locale') locales = 'de' klass = self._getTargetClass() result = klass.load(localedir, locales, domain='deformsite') diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py index 5fdf25f33..0c8cccb06 100644 --- a/repoze/bfg/tests/test_zcml.py +++ b/repoze/bfg/tests/test_zcml.py @@ -1055,7 +1055,7 @@ class TestTranslationDirDirective(unittest.TestCase): def test_it(self): from repoze.bfg.configuration import Configurator context = DummyContext() - tdir = 'repoze.bfg.tests.fixtures:locale' + tdir = 'repoze.bfg.tests.localeapp:locale' self._callFUT(context, tdir) actions = context.actions self.assertEqual(len(actions), 1) -- cgit v1.2.3