diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-04-17 18:52:38 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-04-17 18:52:38 +0200 |
| commit | 00f6c7380ed4ec9c578cca5dd93cae0b92c57b10 (patch) | |
| tree | dd7a39a246862c2154e17f923f528963e010fa12 | |
| parent | 398593a6b1273667a4f62dc6bcdab2ce83c4d5a7 (diff) | |
| download | Ishtar-00f6c7380ed4ec9c578cca5dd93cae0b92c57b10.tar.bz2 Ishtar-00f6c7380ed4ec9c578cca5dd93cae0b92c57b10.zip | |
ooo_replace became oook_replace!
| -rw-r--r-- | example_project/settings.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 4 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index a7bcdf8f1..f81e3e984 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -47,7 +47,7 @@ LANGUAGE_CODE = 'fr-fr' COUNTRY = "fr" -DATE_FORMAT = u"%-d %B %Y" +OOOK_DATE_FORMAT = u"%-d %B %Y" SITE_ID = 1 diff --git a/ishtar_common/models.py b/ishtar_common/models.py index c81d291be..a11eed783 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -48,7 +48,7 @@ from django.contrib import admin from simple_history.models import HistoricalRecords as BaseHistoricalRecords -from ooo_replace import ooo_replace +from oook_replace import oook_replace from ishtar_common.model_merging import merge_model_objects from ishtar_common.utils import get_cache @@ -861,7 +861,7 @@ class DocumentTemplate(models.Model): slugify(self.name.replace(' ', '_').lower()) + u'-' +\ datetime.date.today().strftime('%Y-%m-%d') +\ u"." + self.template.name.split('.')[-1] - missing = ooo_replace(self.template, output_name, c_object.get_values()) + missing = oook_replace(self.template, output_name, c_object.get_values()) return output_name class Department(models.Model): diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index a511ce6c2..4b4f38e4a 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -27,18 +27,18 @@ from django.template.defaultfilters import slugify from django.test import TestCase from ishtar_common import models -from ooo_replace import ooo_replace +from oook_replace.oook_replace import oook_replace class OOOGenerationTest(TestCase): def testGeneration(self): context = {'test_var':u"Testé", 'test_var2':u"", "test_date":datetime.date(2015, 1, 1)} tmp = tempfile.TemporaryFile() - ooo_replace("../ishtar_common/tests/test-file.odt", tmp, context) + oook_replace("../ishtar_common/tests/test-file.odt", tmp, context) inzip = ZipFile(tmp, 'r', ZIP_DEFLATED) value = inzip.read('content.xml') - self.assertTrue("Testé" in value) - self.assertTrue("testé 2" not in value) + self.assertTrue(u"Testé" in value or "Testé" in value) + self.assertTrue("testé 2" not in value and "testé 2" not in value) self.assertTrue("2015" in value) lg, ct = settings.LANGUAGE_CODE.split('-') if lg == 'fr': |