diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-14 22:28:18 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-14 22:28:18 +0100 |
| commit | ad0a54a1b7560d1c6db5c709dfed7779010a24b9 (patch) | |
| tree | 5f07f21cc80eef197d3a7e833b1758d49d794250 /archaeological_files | |
| parent | f6e548fa6980fc9bd4987a26dfd5b21eba2214ea (diff) | |
| parent | cdc78be87e57b871f1c535a13dbd46b98714f2c5 (diff) | |
| download | Ishtar-ad0a54a1b7560d1c6db5c709dfed7779010a24b9.tar.bz2 Ishtar-ad0a54a1b7560d1c6db5c709dfed7779010a24b9.zip | |
Merge branch 'master-trad'
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/models.py | 10 | ||||
| -rw-r--r-- | archaeological_files/wizards.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 7f5655c0c..330fe019a 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -220,13 +220,13 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, verbose_name = _(u"Archaeological file") verbose_name_plural = _(u"Archaeological files") permissions = ( - ("view_file", ugettext(u"Can view all Archaelogical files")), - ("view_own_file", ugettext(u"Can view own Archaelogical file")), - ("add_own_file", ugettext(u"Can add own Archaelogical file")), + ("view_file", ugettext(u"Can view all Archaeological files")), + ("view_own_file", ugettext(u"Can view own Archaeological file")), + ("add_own_file", ugettext(u"Can add own Archaeological file")), ("change_own_file", - ugettext(u"Can change own Archaelogical file")), + ugettext(u"Can change own Archaeological file")), ("delete_own_file", - ugettext(u"Can delete own Archaelogical file")), + ugettext(u"Can delete own Archaeological file")), ("close_file", ugettext(u"Can close File")), ) ordering = ('cached_label',) diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py index ea06a48f7..4c3a13ee2 100644 --- a/archaeological_files/wizards.py +++ b/archaeological_files/wizards.py @@ -151,7 +151,7 @@ class FileAdministrativeActWizard(OperationAdministrativeActWizard): file_id = self.session_get_value(form_key, "pk") try: return ( - (_(u"Archaelogical file"), + (_(u"Archaeological file"), unicode(models.File.objects.get(pk=file_id))),) except models.File.DoesNotExist: return @@ -161,7 +161,7 @@ class FileAdministrativeActWizard(OperationAdministrativeActWizard): admin = AdministrativeAct.objects.get(pk=admin_id) if not admin.associated_file: return - return ((_(u"Archaelogical file"), + return ((_(u"Archaeological file"), unicode(admin.associated_file)),) except AdministrativeAct.DoesNotExist: return |