diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 16:53:10 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-06 16:53:10 +0100 |
| commit | 67208dbd830ce4eb75d77f59d1ffd31c63b19d80 (patch) | |
| tree | cff73359a85d362bd3b24f853fb6d461a583b91b /archaeological_warehouse | |
| parent | 161d29195cb9719b9c6ae4903c2c526f797bdf5f (diff) | |
| parent | ad5d9f7c0d5b0ca5a0ba76e279fc5d6e2683216a (diff) | |
| download | Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.tar.bz2 Ishtar-67208dbd830ce4eb75d77f59d1ffd31c63b19d80.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/locale/django.pot | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/tests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 1de8d8f51..5f7ac6fd1 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -137,7 +137,7 @@ msgstr "" msgid "Localisation" msgstr "" -#: forms.py:288 forms.py:289 +#: forms.py:289 forms.py:290 msgid "Would you like to delete this container?" msgstr "" diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py index 7eb3017bc..10b2318b2 100644 --- a/archaeological_warehouse/tests.py +++ b/archaeological_warehouse/tests.py @@ -18,11 +18,11 @@ # See the file COPYING for details. from django.conf import settings -from django.test import TestCase from archaeological_finds.tests import FindInit -from ishtar_common.tests import WizardTest, WizardTestFormData as FormData +from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \ + TestCase from archaeological_warehouse import models, views, forms |