summaryrefslogtreecommitdiff
path: root/archaeological_files
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_files')
-rw-r--r--archaeological_files/forms.py2
-rw-r--r--archaeological_files/ishtar_menu.py2
-rw-r--r--archaeological_files/locale/django.pot37
-rw-r--r--archaeological_files/models.py2
-rw-r--r--archaeological_files/templates/ishtar/sheet_file.html2
5 files changed, 24 insertions, 21 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index 8b3513438..128fd2ebc 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -56,7 +56,7 @@ class FileSelect(TableSelect):
parcel = ParcelField(label=_("Parcel (section/number)"))
if settings.ISHTAR_DPTS:
towns__numero_insee__startswith = forms.ChoiceField(
- label="Department", choices=[])
+ label=_(u"Department"), choices=[])
name = forms.CharField(label=_(u"File name"), max_length=200)
file_type = forms.ChoiceField(label=_("File type"), choices=[])
end_date = forms.NullBooleanField(label=_(u"Is active?"))
diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py
index b120d18d1..326fec23b 100644
--- a/archaeological_files/ishtar_menu.py
+++ b/archaeological_files/ishtar_menu.py
@@ -31,6 +31,7 @@ MENU_SECTIONS = [
(20,
SectionItem(
'file_management', _(u"Archaeological file"),
+ profile_restriction='files',
childs=[
MenuItem(
'file_search', _(u"Search"),
@@ -79,6 +80,7 @@ MENU_SECTIONS = [
(100,
SectionItem(
'dashboard', _(u"Dashboard"),
+ profile_restriction='files',
childs=[MenuItem('dashboard_main', _(u"General informations"),
model=models.File,
access_controls=['change_file', 'change_own_file']),
diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index b1732ae06..ef6db9a16 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the Ishtar package.
# Étienne Loks <etienne.loks at peacefrogs net>, 2010-2014.
# Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata
+# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
msgid ""
msgstr ""
@@ -24,6 +25,10 @@ msgstr ""
msgid "Parcel (section/number)"
msgstr ""
+#: forms.py:59 forms.py:405 forms.py:432 models.py:518
+msgid "Department"
+msgstr ""
+
#: forms.py:60 forms.py:441
msgid "File name"
msgstr ""
@@ -207,10 +212,6 @@ msgstr ""
msgid "Object (full text search)"
msgstr ""
-#: forms.py:405 forms.py:432 models.py:518
-msgid "Department"
-msgstr ""
-
#: forms.py:427
msgid "Indexed?"
msgstr ""
@@ -251,47 +252,47 @@ msgstr ""
msgid "Archaeological file"
msgstr ""
-#: ishtar_menu.py:36 ishtar_menu.py:59
+#: ishtar_menu.py:37 ishtar_menu.py:60
msgid "Search"
msgstr ""
-#: ishtar_menu.py:40
+#: ishtar_menu.py:41
msgid "Creation"
msgstr ""
-#: ishtar_menu.py:44 ishtar_menu.py:67
+#: ishtar_menu.py:45 ishtar_menu.py:68
msgid "Modification"
msgstr ""
-#: ishtar_menu.py:48
+#: ishtar_menu.py:49
msgid "Closing"
msgstr ""
-#: ishtar_menu.py:52 ishtar_menu.py:71
+#: ishtar_menu.py:53 ishtar_menu.py:72
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:56
+#: ishtar_menu.py:57
msgid "Administrative act"
msgstr ""
-#: ishtar_menu.py:63
+#: ishtar_menu.py:64
msgid "Add"
msgstr ""
-#: ishtar_menu.py:75
+#: ishtar_menu.py:76
msgid "Documents"
msgstr ""
-#: ishtar_menu.py:81
+#: ishtar_menu.py:82
msgid "Dashboard"
msgstr ""
-#: ishtar_menu.py:82
+#: ishtar_menu.py:84
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:85 models.py:186
+#: ishtar_menu.py:87 models.py:186
#: templates/ishtar/dashboards/dashboard_file.html:8
msgid "Archaeological files"
msgstr ""
@@ -377,7 +378,7 @@ msgid "Imported line"
msgstr ""
#: models.py:188
-msgid "Can view all Archaelogical file"
+msgid "Can view all Archaelogical files"
msgstr ""
#: models.py:189
@@ -456,7 +457,7 @@ msgstr ""
msgid "Associated operations"
msgstr ""
-#: wizards.py:141 wizards.py:151
+#: wizards.py:142 wizards.py:152
msgid "Archaelogical file"
msgstr ""
@@ -584,7 +585,7 @@ msgid "Associated parcels"
msgstr ""
#: templates/ishtar/sheet_file.html:118
-msgid "Administrativ acts"
+msgid "Administrative acts"
msgstr ""
#: templates/ishtar/sheet_file.html:124 templates/ishtar/sheet_file.html:151
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index bd6a39340..519d3ced3 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -185,7 +185,7 @@ class File(BaseHistorizedItem, OwnPerms, ValueGetter, ShortMenuItem,
verbose_name = _(u"Archaeological file")
verbose_name_plural = _(u"Archaeological files")
permissions = (
- ("view_file", ugettext(u"Can view all Archaelogical file")),
+ ("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")),
("change_own_file",
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index c14327b5b..3272e87e3 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -115,7 +115,7 @@
{% trans "Associated parcels" as parcels_label %}
{% include "ishtar/blocks/window_tables/parcels.html" %}
-{% trans "Administrativ acts" as administrativeacts_label %}
+{% trans "Administrative acts" as administrativeacts_label %}
{% table_administrativact administrativeacts_label item.administrative_act.all %}
<table class='simple'>