diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-29 17:50:20 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-29 17:50:20 +0200 |
| commit | d0d3fbc24424f4d369850ff7c5b561eea16435d0 (patch) | |
| tree | 06c905007d620ed0953cb541585f205a4f77e9a7 | |
| parent | d30f75d0cecebd960ca1f1b5044f8802e0215613 (diff) | |
| parent | 661218e0acd24fc3bca76229b61d0cb91a54be1c (diff) | |
| download | Ishtar-d0d3fbc24424f4d369850ff7c5b561eea16435d0.tar.bz2 Ishtar-d0d3fbc24424f4d369850ff7c5b561eea16435d0.zip | |
Merge branch 'v0.9' into wheezy
37 files changed, 4663 insertions, 1372 deletions
diff --git a/CHANGES.md b/CHANGES.md index e06bbb50e..0e12ef0f0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,25 @@ Ishtar changelog ================ +0.97.3 (2016-08-29) +------------------- + +### Features ### + +- Automatically generate raw_name on save for person - formula set in profile +- UI: better simple table layout +- UI: rework on dashboard +- Autocomplete widget: larger and full content on hover +- Import: target form - better display of the key +- Update french translation +- Imports: loading indicator + +### Bug fixes ### + +- Cache: fix caching key for models with the same name on different app (such as Rela +tionType) +- Fix french translation + 0.97.2 (2016-08-25) ------------------- @@ -1,7 +1,7 @@ Ishtar ====== -[](https://gitlab.com/iggdrasil/ishtar/commits/master) +[](https://gitlab.com/iggdrasil/ishtar/commits/master) [](http://ishtar.readthedocs.io/fr/latest/) [](https://badge.fury.io/py/ishtar) Description ----------- diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 35050a176..8daef7bec 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" #: forms.py:46 forms.py:123 models.py:130 -#: templates/ishtar/sheet_contextrecord.html:57 +#: templates/ishtar/sheet_contextrecord.html:59 msgid "ID" msgstr "" @@ -61,12 +61,12 @@ msgid "General" msgstr "" #: forms.py:122 models.py:117 models.py:126 -#: templates/ishtar/sheet_contextrecord.html:61 +#: templates/ishtar/sheet_contextrecord.html:63 msgid "Parcel" msgstr "" #: forms.py:125 models.py:131 templates/ishtar/sheet_contextrecord.html:26 -#: templates/ishtar/sheet_contextrecord.html:60 +#: templates/ishtar/sheet_contextrecord.html:62 msgid "Description" msgstr "" @@ -376,7 +376,7 @@ msgstr "" msgid "Inverse relation" msgstr "" -#: models.py:324 templates/ishtar/sheet_contextrecord.html:56 +#: models.py:324 templates/ishtar/sheet_contextrecord.html:58 msgid "Relation type" msgstr "" @@ -433,7 +433,7 @@ msgid "Complete ID:" msgstr "" #: templates/ishtar/sheet_contextrecord.html:11 -#: templates/ishtar/sheet_contextrecord.html:86 +#: templates/ishtar/sheet_contextrecord.html:89 msgid "Patriarche OA code not yet recorded!" msgstr "" @@ -450,7 +450,7 @@ msgid "Created by:" msgstr "" #: templates/ishtar/sheet_contextrecord.html:18 -#: templates/ishtar/sheet_contextrecord.html:98 +#: templates/ishtar/sheet_contextrecord.html:101 msgid "Type:" msgstr "" @@ -526,83 +526,83 @@ msgstr "" msgid "In relation with" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:58 +#: templates/ishtar/sheet_contextrecord.html:60 msgid "Type" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:59 +#: templates/ishtar/sheet_contextrecord.html:61 msgid "Chronology" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:83 msgid "Operation summary" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:81 +#: templates/ishtar/sheet_contextrecord.html:84 msgid "Year:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:84 +#: templates/ishtar/sheet_contextrecord.html:87 msgid "Patriarche OA code:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:89 +#: templates/ishtar/sheet_contextrecord.html:92 msgid "Head scientist:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:93 msgid "State:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:92 +#: templates/ishtar/sheet_contextrecord.html:95 msgid "Active file" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:94 +#: templates/ishtar/sheet_contextrecord.html:97 msgid "Closed operation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:95 +#: templates/ishtar/sheet_contextrecord.html:98 msgid "Closing date:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:96 +#: templates/ishtar/sheet_contextrecord.html:99 msgid "by" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:99 +#: templates/ishtar/sheet_contextrecord.html:102 msgid "Remains:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:100 +#: templates/ishtar/sheet_contextrecord.html:103 msgid "Periods:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:103 +#: templates/ishtar/sheet_contextrecord.html:106 msgid "Localisation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:104 +#: templates/ishtar/sheet_contextrecord.html:107 msgid "Towns:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:105 +#: templates/ishtar/sheet_contextrecord.html:108 msgid "Related operation:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:108 +#: templates/ishtar/sheet_contextrecord.html:111 msgid "No operation linked to this context unit!" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:111 +#: templates/ishtar/sheet_contextrecord.html:114 msgid "Document from this context record" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:116 +#: templates/ishtar/sheet_contextrecord.html:119 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:121 +#: templates/ishtar/sheet_contextrecord.html:124 msgid "Documents from associated finds" msgstr "" diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 04532838a..91054a87b 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -51,7 +51,9 @@ {% if item.right_relations.count %} <h3>{% trans "In relation with"%}</h3> -<table class='simple'> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Relation type" %}</th> <th>{% trans "ID" %}</th> @@ -72,7 +74,8 @@ <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-contextrecord relation.right_record.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> </tr> {% endfor %} -<table class='simple'> +</table> +</div></div> {% endif %} diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index a1af3680f..d1d5e5820 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" #: forms.py:51 forms.py:210 forms.py:254 forms.py:395 forms.py:422 -#: models.py:76 templates/ishtar/sheet_file.html:133 +#: models.py:76 templates/ishtar/sheet_file.html:139 msgid "Year" msgstr "" @@ -58,7 +58,7 @@ msgstr "" msgid "Comment" msgstr "" -#: forms.py:69 templates/ishtar/sheet_file.html:110 +#: forms.py:69 templates/ishtar/sheet_file.html:112 msgid "In charge" msgstr "" @@ -164,7 +164,7 @@ msgid "Total developed surface (m2)" msgstr "" #: forms.py:333 templates/ishtar/sheet_file.html:84 -#: templates/ishtar/dashboards/dashboard_file.html:42 +#: templates/ishtar/dashboards/dashboard_file.html:45 msgid "Research archaeology" msgstr "" @@ -457,7 +457,7 @@ msgstr "" msgid "File: administrative act deletion" msgstr "" -#: wizards.py:124 templates/ishtar/sheet_file.html:105 +#: wizards.py:124 templates/ishtar/sheet_file.html:104 msgid "Associated operations" msgstr "" @@ -560,35 +560,35 @@ msgstr "" msgid "Administrative acts" msgstr "" -#: templates/ishtar/sheet_file.html:107 templates/ishtar/sheet_file.html:134 +#: templates/ishtar/sheet_file.html:109 templates/ishtar/sheet_file.html:140 msgid "Ref." msgstr "" -#: templates/ishtar/sheet_file.html:109 templates/ishtar/sheet_file.html:135 +#: templates/ishtar/sheet_file.html:111 templates/ishtar/sheet_file.html:141 msgid "Type" msgstr "" -#: templates/ishtar/sheet_file.html:111 +#: templates/ishtar/sheet_file.html:113 msgid "Start date" msgstr "" -#: templates/ishtar/sheet_file.html:112 +#: templates/ishtar/sheet_file.html:114 msgid "Excavation end date" msgstr "" -#: templates/ishtar/sheet_file.html:126 +#: templates/ishtar/sheet_file.html:128 msgid "No operation associated to this archaelogical file" msgstr "" -#: templates/ishtar/sheet_file.html:131 +#: templates/ishtar/sheet_file.html:134 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: templates/ishtar/sheet_file.html:136 +#: templates/ishtar/sheet_file.html:142 msgid "Date" msgstr "" -#: templates/ishtar/sheet_file.html:146 +#: templates/ishtar/sheet_file.html:152 msgid "No administrative act linked to operations" msgstr "" @@ -601,66 +601,70 @@ msgid "Global informations" msgstr "" #: templates/ishtar/dashboards/dashboard_file.html:12 -#: templates/ishtar/dashboards/dashboard_file.html:44 -#: templates/ishtar/dashboards/dashboard_file.html:97 +#: templates/ishtar/dashboards/dashboard_file.html:47 +#: templates/ishtar/dashboards/dashboard_file.html:102 msgid "Total:" msgstr "" #: templates/ishtar/dashboards/dashboard_file.html:18 -#: templates/ishtar/dashboards/dashboard_file.html:47 -#: templates/ishtar/dashboards/dashboard_file.html:125 -msgid "By year" +#: templates/ishtar/dashboards/dashboard_file.html:49 +#: templates/ishtar/dashboards/dashboard_file.html:133 +msgid "by year" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:30 -#: templates/ishtar/dashboards/dashboard_file.html:59 -#: templates/ishtar/dashboards/dashboard_file.html:137 -msgid "By month" +#: templates/ishtar/dashboards/dashboard_file.html:22 +msgid "no year" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:71 -#: templates/ishtar/dashboards/dashboard_file.html:164 -msgid "By department" +#: templates/ishtar/dashboards/dashboard_file.html:32 +#: templates/ishtar/dashboards/dashboard_file.html:61 +#: templates/ishtar/dashboards/dashboard_file.html:147 +msgid "by month" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:83 -msgid "Main towns" +#: templates/ishtar/dashboards/dashboard_file.html:73 +#: templates/ishtar/dashboards/dashboard_file.html:178 +msgid "by department" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:95 +#: templates/ishtar/dashboards/dashboard_file.html:85 +msgid "main towns" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_file.html:100 msgid "Rescue archaeology" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:101 -msgid "By saisine type" +#: templates/ishtar/dashboards/dashboard_file.html:105 +msgid "by saisine type" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:113 -msgid "By administrative act" +#: templates/ishtar/dashboards/dashboard_file.html:119 +msgid "by administrative act" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:147 +#: templates/ishtar/dashboards/dashboard_file.html:160 msgid "Archaeological files linked to at least one operation:" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:148 +#: templates/ishtar/dashboards/dashboard_file.html:161 #, python-format msgid "Archaeological files linked to at least one operation (%%):" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:152 +#: templates/ishtar/dashboards/dashboard_file.html:164 #, python-format -msgid "Archaeological files linked to at least one operation (%%)" +msgid "archaeological files linked to at least one operation (%%)" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:176 -msgid "Surface by department (ha)" +#: templates/ishtar/dashboards/dashboard_file.html:192 +msgid "surface by department (ha)" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:188 -msgid "Main towns by number" +#: templates/ishtar/dashboards/dashboard_file.html:206 +msgid "main towns by number" msgstr "" -#: templates/ishtar/dashboards/dashboard_file.html:200 -msgid "Main towns by surface (ha)" +#: templates/ishtar/dashboards/dashboard_file.html:220 +msgid "main towns by surface (ha)" msgstr "" diff --git a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html index de8be7d30..163f89bb8 100644 --- a/archaeological_files/templates/ishtar/dashboards/dashboard_file.html +++ b/archaeological_files/templates/ishtar/dashboards/dashboard_file.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n range units %} +{% load i18n range units humanize %} {% block extra_head %} {{form.media}} {% endblock %} @@ -9,30 +9,33 @@ <h3>{% trans "Global informations" %}</h3> <div> - <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p> + <p><label>{% trans "Total:" %}</label> <span class='value numeric'>{{dashboard.total_number|intcomma}}</span></p> {% for type in dashboard.types %} - <p><strong>{{type.file_type__label}}{% trans ":"%}</strong> {{type.number}}</p> + <p><label>{{type.file_type__label}}{% trans ":"%}</label> <span class='value numeric'>{{type.number|intcomma}}</span></p> {% endfor %} - <div class='table'> - <table> - <caption>{% trans "By year"%}</caption> - <tr> - {% for year in dashboard.by_year %}<th>{{year.date.year}}</th>{% endfor %} - </tr> - <tr> - {% for year in dashboard.by_year %}<td>{{year.number}}</td>{% endfor%} - </tr> - </table> + + <div class='clean-table'> + <h4>{% trans "by year"%}</h4> + <div class='clean-table-wrap'> + <table> + <tr> + {% for year in dashboard.by_year %}<th>{% if year.date.year %}{{year.date.year}}{% else %}{% trans "no year" %}{% endif %}</th>{% endfor %} + </tr> + <tr> + {% for year in dashboard.by_year %}<td>{{year.number|intcomma}}</td>{% endfor%} + </tr> + </table> + </div> </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by month"%}</h4> <table> - <caption>{% trans "By month"%}</caption> <tr> - {% for month in dashboard.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %} + {% for month in dashboard.by_month %}<th>{{month.date|date:"N Y"|capfirst}}</th>{% endfor %} </tr> <tr> - {% for month in dashboard.by_month %}<td>{{month.number}}</td>{% endfor%} + {% for month in dashboard.by_month %}<td>{{month.number|intcomma}}</td>{% endfor%} </tr> </table> </div> @@ -41,171 +44,191 @@ <h3>{% trans "Research archaeology" %}</h3> <div> - <p><strong>{% trans "Total:" %}</strong> {{dashboard.research.total_number}}</p> - <div class='table'> + <p><label>{% trans "Total:" %}</label><span class='value numeric'>{{dashboard.research.total_number|intcomma}}</span></p> + <div class='clean-table'> + <h4>{% trans "by year"%}</h4> <table> - <caption>{% trans "By year"%}</caption> <tr> {% for year in dashboard.research.by_year %}<th>{{year.date.year}}</th>{% endfor %} </tr> <tr> - {% for year in dashboard.research.by_year %}<td>{{year.number}}</td>{% endfor%} + {% for year in dashboard.research.by_year %}<td>{{year.number|intcomma}}</td>{% endfor%} </tr> </table> </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by month"%}</h4> <table> - <caption>{% trans "By month"%}</caption> <tr> {% for month in dashboard.research.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %} </tr> <tr> - {% for month in dashboard.research.by_month %}<td>{{month.number}}</td>{% endfor%} + {% for month in dashboard.research.by_month %}<td>{{month.number|intcomma}}</td>{% endfor%} </tr> </table> </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by department"%}</h4> <table> - <caption>{% trans "By department"%}</caption> <tr> {% for dpt in dashboard.research.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %} </tr> <tr> - {% for dpt in dashboard.research.by_dpt %}<td>{{dpt.number}}</td>{% endfor%} + {% for dpt in dashboard.research.by_dpt %}<td>{{dpt.number|intcomma}}</td>{% endfor%} </tr> </table> </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns"%}</caption> <tr> {% for town in dashboard.research.towns %}<th>{{town.town__name}}</th>{% endfor %} </tr> <tr> - {% for town in dashboard.research.towns %}<td>{{town.number}}</td>{% endfor%} + {% for town in dashboard.research.towns %}<td>{{town.number|intcomma}}</td>{% endfor%} </tr> </table> + </div> </div> </div> <h3>{% trans "Rescue archaeology" %}</h3> <div> - <p><strong>{% trans "Total:" %}</strong> {{dashboard.rescue.total_number}}</p> + <p><label>{% trans "Total:" %}</label> <span class='value numeric'>{{dashboard.rescue.total_number|intcomma}}</span></p> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by saisine type"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By saisine type"%}</caption> <tr> {% for saisine in dashboard.rescue.saisine %}<th>{{saisine.saisine_type__label}}</th>{% endfor %} </tr> <tr> - {% for saisine in dashboard.rescue.saisine %}<td>{{saisine.number}}</td>{% endfor%} + {% for saisine in dashboard.rescue.saisine %}<td>{{saisine.number|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by administrative act"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By administrative act"%}</caption> <tr> {% for act in dashboard.rescue.administrative_act %}<th>{{act.act_type__label}}</th>{% endfor %} </tr> <tr> - {% for act in dashboard.rescue.administrative_act %}<td>{{act.number}}</td>{% endfor%} + {% for act in dashboard.rescue.administrative_act %}<td>{{act.number|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by year"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By year"%}</caption> <tr> {% for year in dashboard.rescue.by_year %}<th>{{year.date.year}}</th>{% endfor %} </tr> <tr> - {% for year in dashboard.rescue.by_year %}<td>{{year.number}}</td>{% endfor%} + {% for year in dashboard.rescue.by_year %}<td>{{year.number|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by month"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By month"%}</caption> <tr> {% for month in dashboard.rescue.by_month %}<th>{{month.date|date:"F Y"|capfirst}}</th>{% endfor %} </tr> <tr> - {% for month in dashboard.rescue.by_month %}<td>{{month.number}}</td>{% endfor%} + {% for month in dashboard.rescue.by_month %}<td>{{month.number|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <p><strong>{% trans "Archaeological files linked to at least one operation:" %}</strong> {{dashboard.rescue.with_associated_operation}}</p> - <p><strong>{% trans "Archaeological files linked to at least one operation (%):" %}</strong> {{dashboard.rescue.with_associated_operation_percent}}</p> + <p><label>{% trans "Archaeological files linked to at least one operation:" %}</label> <span class='value numeric'>{{dashboard.rescue.with_associated_operation|intcomma}}</span></p> + <p><label>{% trans "Archaeological files linked to at least one operation (%):" %}</label> <span class='value numeric'>{{dashboard.rescue.with_associated_operation_percent|intcomma}}</span></p> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "archaeological files linked to at least one operation (%)"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Archaeological files linked to at least one operation (%)"%}</caption> <tr> {% for year in dashboard.rescue.operational_by_year %}<th>{{year.date.year}}</th>{% endfor %} </tr> <tr> - {% for year in dashboard.rescue.operational_by_year %}<td>{{year.number}}</td>{% endfor%} + {% for year in dashboard.rescue.operational_by_year %}<td>{{year.number|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by department"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By department"%}</caption> <tr> {% for dpt in dashboard.rescue.by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %} </tr> <tr> - {% for dpt in dashboard.rescue.by_dpt %}<td>{{dpt.number}}</td>{% endfor%} + {% for dpt in dashboard.rescue.by_dpt %}<td>{{dpt.number|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "surface by department (ha)"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Surface by department (ha)"%}</caption> <tr> {% for dpt in dashboard.rescue.surface_by_dpt %}<th>{{dpt.department__label}}</th>{% endfor %} </tr> <tr> - {% for dpt in dashboard.rescue.surface_by_dpt %}<td>{{dpt.number|m2_to_ha}}</td>{% endfor%} + {% for dpt in dashboard.rescue.surface_by_dpt %}<td>{{dpt.number|m2_to_ha|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by number"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by number"%}</caption> <tr> {% for town in dashboard.rescue.towns %}<th>{{town.town__name}}</th>{% endfor %} </tr> <tr> - {% for town in dashboard.rescue.towns %}<td>{{town.number}}</td>{% endfor%} + {% for town in dashboard.rescue.towns %}<td>{{town.number|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by surface (ha)"%}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by surface (ha)"%}</caption> <tr> {% for town in dashboard.rescue.surface_by_town %}<th>{{town.town__name}}</th>{% endfor %} </tr> <tr> - {% for town in dashboard.rescue.surface_by_town %}<td>{{town.number|m2_to_ha}}</td>{% endfor%} + {% for town in dashboard.rescue.surface_by_town %}<td>{{town.number|m2_to_ha|intcomma}}</td>{% endfor%} </tr> </table> </div> + </div> </div> </div> diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 9ff6e8356..782a7656d 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -101,8 +101,10 @@ {% trans "Administrative acts" as administrativeacts_label %} {% table_administrativact administrativeacts_label item.administrative_act.all %} -<table class='simple'> - <caption>{%trans "Associated operations"%}</caption> +<h4>{%trans "Associated operations"%}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Ref." %}</th> <th>Code Patriarche</th> @@ -126,9 +128,13 @@ <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr> {% endfor %} </table> +</div> +</div> -<table class='simple'> - <caption>{%trans "Admninistrative acts linked to associated operations"%}</caption> +<h4>{%trans "Admninistrative acts linked to associated operations"%}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Year" %}</th> <th>{% trans "Ref." %}</th> @@ -146,4 +152,6 @@ <tr><td colspan="4" class='no_items'>{% trans "No administrative act linked to operations" %}</td></tr> {% endfor %} </table> +</div> +</div> {% endblock %} diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index b7a64ec92..19327cda6 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -142,12 +142,12 @@ msgid "Period" msgstr "" #: forms.py:180 forms.py:579 models.py:695 models.py:760 models.py:896 -#: templates/ishtar/sheet_find.html:79 templates/ishtar/sheet_find.html:104 +#: templates/ishtar/sheet_find.html:81 templates/ishtar/sheet_find.html:110 msgid "Start date" msgstr "" #: forms.py:182 forms.py:581 models.py:696 models.py:761 models.py:897 -#: templates/ishtar/sheet_find.html:80 templates/ishtar/sheet_find.html:105 +#: templates/ishtar/sheet_find.html:82 templates/ishtar/sheet_find.html:111 msgid "End date" msgstr "" @@ -284,7 +284,7 @@ msgid "Treatment type" msgstr "" #: forms.py:566 models.py:693 models.py:764 -#: templates/ishtar/sheet_find.html:77 templates/ishtar/sheet_find.html:102 +#: templates/ishtar/sheet_find.html:79 templates/ishtar/sheet_find.html:108 msgid "Doer" msgstr "" @@ -520,16 +520,16 @@ msgstr "" msgid "Weight unit" msgstr "" -#: models.py:337 templates/ishtar/sheet_find.html:73 +#: models.py:337 templates/ishtar/sheet_find.html:72 msgid "Upstream treatment" msgstr "" -#: models.py:340 templates/ishtar/sheet_find.html:98 +#: models.py:340 templates/ishtar/sheet_find.html:101 msgid "Downstream treatment" msgstr "" #: models.py:344 models.py:679 models.py:763 -#: templates/ishtar/sheet_find.html:78 templates/ishtar/sheet_find.html:103 +#: templates/ishtar/sheet_find.html:80 templates/ishtar/sheet_find.html:109 msgid "Container" msgstr "" @@ -629,8 +629,8 @@ msgstr "" msgid "by" msgstr "" -#: models.py:765 models.py:766 templates/ishtar/sheet_find.html:76 -#: templates/ishtar/sheet_find.html:101 +#: models.py:765 models.py:766 templates/ishtar/sheet_find.html:78 +#: templates/ishtar/sheet_find.html:107 msgid "Related finds" msgstr "" @@ -714,36 +714,36 @@ msgstr "" msgid "Operation" msgstr "" -#: templates/ishtar/sheet_find.html:75 templates/ishtar/sheet_find.html:100 -#: templates/ishtar/sheet_find.html:166 +#: templates/ishtar/sheet_find.html:77 templates/ishtar/sheet_find.html:106 +#: templates/ishtar/sheet_find.html:175 msgid "Type" msgstr "" -#: templates/ishtar/sheet_find.html:93 +#: templates/ishtar/sheet_find.html:97 msgid "Export as CSV" msgstr "" -#: templates/ishtar/sheet_find.html:93 templates/ishtar/sheet_find.html:118 +#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:127 msgid "CSV" msgstr "" -#: templates/ishtar/sheet_find.html:123 +#: templates/ishtar/sheet_find.html:132 msgid "Associated base finds" msgstr "" -#: templates/ishtar/sheet_find.html:161 templates/ishtar/sheet_find.html:163 +#: templates/ishtar/sheet_find.html:170 templates/ishtar/sheet_find.html:172 msgid "Documents" msgstr "" -#: templates/ishtar/sheet_find.html:165 +#: templates/ishtar/sheet_find.html:174 msgid "Title" msgstr "" -#: templates/ishtar/sheet_find.html:167 +#: templates/ishtar/sheet_find.html:176 msgid "Authors" msgstr "" -#: templates/ishtar/sheet_find.html:168 +#: templates/ishtar/sheet_find.html:177 msgid "Link" msgstr "" diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index f7c3838b8..85647ac61 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -69,8 +69,10 @@ <h3>{% trans "Treatments"%}</h3> {% if item.upstream_treatment %} -<table class='simple' id='{{window_id}}-upstream'> - <caption>{% trans "Upstream treatment" %}</caption> +<h4>{% trans "Upstream treatment" %}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table id='{{window_id}}-upstream'> <tr> <th>{% trans "Type" %}</th> <th>{% trans "Related finds" %}</th> @@ -90,12 +92,16 @@ </tr> {% endfor %} </table> +</div> +</div> <p class='tool'><a class='badge' href="{% url 'get-upstreamtreatment' 'csv' %}?submited=1&find_id={{item.pk}}" target="_blank" title='{% trans "Export as CSV"%}'>{% trans "CSV" %}</a> ({{ENCODING}})</p> {% endif %} {% if item.downstream_treatment %} -<table class='simple' id='{{window_id}}-downstream'> - <caption>{% trans "Downstream treatment" %}</caption> +<h4>{% trans "Downstream treatment" %}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table id='{{window_id}}-downstream'> <tr> <th>{% trans "Type" %}</th> <th>{% trans "Related finds" %}</th> @@ -115,6 +121,9 @@ </tr> {% endfor %} </table> +</div> +</div> + <p class='tool'><a class='badge' href="{% url 'get-downstreamtreatment' 'csv' %}?submited=1&find_id={{item.pk}}" target="_blank">{% trans "CSV" %}</a> ({{ENCODING}})</p> {% endif %} diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 86e6febcb..7c2ea0d62 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -9,27 +9,27 @@ msgid "" msgstr "" #: forms.py:66 forms.py:368 forms.py:952 forms.py:974 forms.py:978 -#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:8 +#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "" #: forms.py:69 forms.py:202 forms.py:928 models.py:801 -#: templates/ishtar/blocks/window_tables/parcels.html:5 -#: templates/ishtar/dashboards/dashboard_operation.html:302 -#: templates/ishtar/dashboards/dashboard_operation.html:315 -#: templates/ishtar/dashboards/dashboard_operation.html:482 -#: templates/ishtar/dashboards/dashboard_operation.html:495 +#: templates/ishtar/blocks/window_tables/parcels.html:7 +#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:446 +#: templates/ishtar/dashboards/dashboard_operation.html:685 +#: templates/ishtar/dashboards/dashboard_operation.html:699 msgid "Town" msgstr "" #: forms.py:71 forms.py:457 forms.py:731 forms.py:1192 models.py:194 #: models.py:618 models.py:799 -#: templates/ishtar/blocks/window_tables/parcels.html:6 +#: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "" #: forms.py:74 models.py:802 -#: templates/ishtar/blocks/window_tables/parcels.html:7 +#: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "" @@ -108,15 +108,15 @@ msgid "Parcel (section/number/public domain)" msgstr "" #: forms.py:467 forms.py:1206 models.py:519 -#: templates/ishtar/dashboards/dashboard_operation.html:273 -#: templates/ishtar/dashboards/dashboard_operation.html:286 -#: templates/ishtar/dashboards/dashboard_operation.html:453 -#: templates/ishtar/dashboards/dashboard_operation.html:466 +#: templates/ishtar/dashboards/dashboard_operation.html:390 +#: templates/ishtar/dashboards/dashboard_operation.html:411 +#: templates/ishtar/dashboards/dashboard_operation.html:643 +#: templates/ishtar/dashboards/dashboard_operation.html:664 msgid "Department" msgstr "" #: forms.py:468 forms.py:1038 models.py:78 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Name" msgstr "" @@ -141,12 +141,12 @@ msgid "Operator" msgstr "" #: forms.py:497 forms.py:1043 models.py:82 models.py:204 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "" #: forms.py:498 forms.py:1022 forms.py:1040 models.py:80 models.py:209 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "" @@ -344,7 +344,7 @@ msgid "Preventive informations - excavation" msgstr "" #: forms.py:899 models.py:207 -#: templates/ishtar/dashboards/dashboard_operation.html:495 +#: templates/ishtar/dashboards/dashboard_operation.html:699 msgid "Cost (euros)" msgstr "" @@ -465,7 +465,7 @@ msgid "Indexed?" msgstr "" #: forms.py:1207 forms.py:1272 models.py:619 -#: templates/ishtar/blocks/window_tables/administrativacts.html:8 +#: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -821,8 +821,8 @@ msgid "Can delete own Administrative act" msgstr "" #: models.py:656 -#: templates/ishtar/blocks/window_tables/administrativacts.html:5 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:5 +#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "" @@ -1151,24 +1151,23 @@ msgstr "" msgid "Operation source" msgstr "" -#: templates/ishtar/blocks/window_tables/administrativacts.html:6 -#: templates/ishtar/dashboards/dashboard_operation.html:82 +#: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "" -#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/administrativacts.html:9 msgid "Date" msgstr "" -#: templates/ishtar/blocks/window_tables/administrativacts.html:18 +#: templates/ishtar/blocks/window_tables/administrativacts.html:20 msgid "No administrative act associated" msgstr "" -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:18 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:20 msgid "No archaeological site associated" msgstr "" -#: templates/ishtar/blocks/window_tables/parcels.html:20 +#: templates/ishtar/blocks/window_tables/parcels.html:22 msgid "No parcel" msgstr "" @@ -1176,229 +1175,228 @@ msgstr "" msgid "Global informations" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:15 -#: templates/ishtar/dashboards/dashboard_operation.html:111 -#: templates/ishtar/dashboards/dashboard_operation.html:329 -msgid "Total" +#: templates/ishtar/dashboards/dashboard_operation.html:14 +#: templates/ishtar/dashboards/dashboard_operation.html:160 +#: templates/ishtar/dashboards/dashboard_operation.html:459 +msgid "total" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:17 -#: templates/ishtar/dashboards/dashboard_operation.html:30 -#: templates/ishtar/dashboards/dashboard_operation.html:113 -#: templates/ishtar/dashboards/dashboard_operation.html:152 -#: templates/ishtar/dashboards/dashboard_operation.html:184 -#: templates/ishtar/dashboards/dashboard_operation.html:331 -#: templates/ishtar/dashboards/dashboard_operation.html:370 +#: templates/ishtar/dashboards/dashboard_operation.html:18 +#: templates/ishtar/dashboards/dashboard_operation.html:32 +#: templates/ishtar/dashboards/dashboard_operation.html:164 +#: templates/ishtar/dashboards/dashboard_operation.html:254 +#: templates/ishtar/dashboards/dashboard_operation.html:463 +#: templates/ishtar/dashboards/dashboard_operation.html:517 msgid "Status" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:17 -#: templates/ishtar/dashboards/dashboard_operation.html:113 -#: templates/ishtar/dashboards/dashboard_operation.html:302 -#: templates/ishtar/dashboards/dashboard_operation.html:331 -#: templates/ishtar/dashboards/dashboard_operation.html:482 +#: templates/ishtar/dashboards/dashboard_operation.html:18 +#: templates/ishtar/dashboards/dashboard_operation.html:164 +#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:463 +#: templates/ishtar/dashboards/dashboard_operation.html:685 msgid "Number" msgstr "" #: templates/ishtar/dashboards/dashboard_operation.html:28 -msgid "Area by type of operation" +msgid "area by type of operation" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:30 +#: templates/ishtar/dashboards/dashboard_operation.html:32 msgid "Area (ha)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:41 -msgid "By types" +#: templates/ishtar/dashboards/dashboard_operation.html:42 +msgid "by types" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:43 -#: templates/ishtar/dashboards/dashboard_operation.html:56 -#: templates/ishtar/dashboards/dashboard_operation.html:69 -#: templates/ishtar/dashboards/dashboard_operation.html:95 -#: templates/ishtar/dashboards/dashboard_operation.html:126 +#: templates/ishtar/dashboards/dashboard_operation.html:48 +#: templates/ishtar/dashboards/dashboard_operation.html:70 +#: templates/ishtar/dashboards/dashboard_operation.html:92 #: templates/ishtar/dashboards/dashboard_operation.html:139 -#: templates/ishtar/dashboards/dashboard_operation.html:260 -#: templates/ishtar/dashboards/dashboard_operation.html:344 -#: templates/ishtar/dashboards/dashboard_operation.html:357 -#: templates/ishtar/dashboards/dashboard_operation.html:440 +#: templates/ishtar/dashboards/dashboard_operation.html:180 +#: templates/ishtar/dashboards/dashboard_operation.html:202 +#: templates/ishtar/dashboards/dashboard_operation.html:369 +#: templates/ishtar/dashboards/dashboard_operation.html:479 +#: templates/ishtar/dashboards/dashboard_operation.html:499 +#: templates/ishtar/dashboards/dashboard_operation.html:623 msgid "State" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:54 -#: templates/ishtar/dashboards/dashboard_operation.html:124 -#: templates/ishtar/dashboards/dashboard_operation.html:342 -msgid "By year" +#: templates/ishtar/dashboards/dashboard_operation.html:64 +#: templates/ishtar/dashboards/dashboard_operation.html:174 +#: templates/ishtar/dashboards/dashboard_operation.html:473 +msgid "by year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:67 -#: templates/ishtar/dashboards/dashboard_operation.html:137 -#: templates/ishtar/dashboards/dashboard_operation.html:355 -msgid "By realisation year" +#: templates/ishtar/dashboards/dashboard_operation.html:86 +#: templates/ishtar/dashboards/dashboard_operation.html:196 +#: templates/ishtar/dashboards/dashboard_operation.html:493 +msgid "by realisation year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:80 -msgid "Effective operation by type and year" +#: templates/ishtar/dashboards/dashboard_operation.html:108 +msgid "effective operation by type and year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:93 -msgid "By realisation month" +#: templates/ishtar/dashboards/dashboard_operation.html:133 +msgid "by realisation month" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:106 +#: templates/ishtar/dashboards/dashboard_operation.html:156 msgid "Survey informations" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:150 -msgid "Current year" +#: templates/ishtar/dashboards/dashboard_operation.html:218 +msgid "current year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:155 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:187 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:289 -#: templates/ishtar/dashboards/dashboard_operation.html:373 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:225 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:257 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:415 +#: templates/ishtar/dashboards/dashboard_operation.html:520 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Area" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:158 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:190 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:376 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:228 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:260 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:523 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Man-day" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:161 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:193 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:379 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:231 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:263 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:526 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Man-day/hectare" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:165 +#: templates/ishtar/dashboards/dashboard_operation.html:234 msgid "Man-day/hectare for effective operations (current year):" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:169 -msgid "Organizations (current year)" +#: templates/ishtar/dashboards/dashboard_operation.html:236 +msgid "organizations (current year)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:182 -#: templates/ishtar/dashboards/dashboard_operation.html:368 -msgid "Current realisation year" +#: templates/ishtar/dashboards/dashboard_operation.html:250 +#: templates/ishtar/dashboards/dashboard_operation.html:513 +msgid "current realisation year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:197 -#: templates/ishtar/dashboards/dashboard_operation.html:383 +#: templates/ishtar/dashboards/dashboard_operation.html:267 +#: templates/ishtar/dashboards/dashboard_operation.html:530 msgid "Man-day/hectare for effective operations (current realisation year):" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:201 -#: templates/ishtar/dashboards/dashboard_operation.html:387 -msgid "Organizations (current realisation year)" +#: templates/ishtar/dashboards/dashboard_operation.html:270 +#: templates/ishtar/dashboards/dashboard_operation.html:533 +msgid "organizations (current realisation year)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:214 -#: templates/ishtar/dashboards/dashboard_operation.html:400 -msgid "Area by organization by year" +#: templates/ishtar/dashboards/dashboard_operation.html:283 +#: templates/ishtar/dashboards/dashboard_operation.html:547 +msgid "area by organization by year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:216 -#: templates/ishtar/dashboards/dashboard_operation.html:402 -#: templates/ishtar/dashboards/dashboard_operation.html:421 +#: templates/ishtar/dashboards/dashboard_operation.html:292 +#: templates/ishtar/dashboards/dashboard_operation.html:555 +#: templates/ishtar/dashboards/dashboard_operation.html:590 msgid "Organization" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:224 -#: templates/ishtar/dashboards/dashboard_operation.html:413 -#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:309 +#: templates/ishtar/dashboards/dashboard_operation.html:575 +#: templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:230 -msgid "Effective operations areas (ha)" +#: templates/ishtar/dashboards/dashboard_operation.html:315 +msgid "effective operations areas (ha)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:235 -#: templates/ishtar/dashboards/dashboard_operation.html:273 -#: templates/ishtar/dashboards/dashboard_operation.html:286 -#: templates/ishtar/dashboards/dashboard_operation.html:410 -#: templates/ishtar/dashboards/dashboard_operation.html:429 -#: templates/ishtar/dashboards/dashboard_operation.html:453 -#: templates/ishtar/dashboards/dashboard_operation.html:466 +#: templates/ishtar/dashboards/dashboard_operation.html:327 +#: templates/ishtar/dashboards/dashboard_operation.html:392 +#: templates/ishtar/dashboards/dashboard_operation.html:412 +#: templates/ishtar/dashboards/dashboard_operation.html:569 +#: templates/ishtar/dashboards/dashboard_operation.html:605 +#: templates/ishtar/dashboards/dashboard_operation.html:645 +#: templates/ishtar/dashboards/dashboard_operation.html:665 msgid "Sum" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:238 -#: templates/ishtar/dashboards/dashboard_operation.html:252 +#: templates/ishtar/dashboards/dashboard_operation.html:332 +#: templates/ishtar/dashboards/dashboard_operation.html:356 msgid "Average" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:244 -msgid "Man-Days/hectare by Year" +#: templates/ishtar/dashboards/dashboard_operation.html:338 +msgid "man-days/hectare by year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:249 +#: templates/ishtar/dashboards/dashboard_operation.html:350 msgid "Man-Days/hectare" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:258 -#: templates/ishtar/dashboards/dashboard_operation.html:438 -msgid "By month" +#: templates/ishtar/dashboards/dashboard_operation.html:363 +#: templates/ishtar/dashboards/dashboard_operation.html:617 +msgid "by month" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:271 -#: templates/ishtar/dashboards/dashboard_operation.html:451 -msgid "By department" +#: templates/ishtar/dashboards/dashboard_operation.html:384 +#: templates/ishtar/dashboards/dashboard_operation.html:637 +msgid "by department" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:284 -#: templates/ishtar/dashboards/dashboard_operation.html:464 -msgid "Effective operation by department" +#: templates/ishtar/dashboards/dashboard_operation.html:405 +#: templates/ishtar/dashboards/dashboard_operation.html:658 +msgid "effective operation by department" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:289 -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:415 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "Nb." msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:300 -#: templates/ishtar/dashboards/dashboard_operation.html:480 -msgid "Main towns by number" +#: templates/ishtar/dashboards/dashboard_operation.html:428 +#: templates/ishtar/dashboards/dashboard_operation.html:681 +msgid "main towns by number" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:313 -msgid "Main towns by surface" +#: templates/ishtar/dashboards/dashboard_operation.html:442 +msgid "main towns by surface" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:315 +#: templates/ishtar/dashboards/dashboard_operation.html:446 msgid "Total surface (ha)" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:325 +#: templates/ishtar/dashboards/dashboard_operation.html:456 msgid "Excavation informations" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:419 -msgid "Area by organization by realisation year" +#: templates/ishtar/dashboards/dashboard_operation.html:581 +msgid "area by organization by realisation year" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "Cost" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "FNAP cost" msgstr "" -#: templates/ishtar/dashboards/dashboard_operation.html:493 -msgid "Main towns by cost" +#: templates/ishtar/dashboards/dashboard_operation.html:695 +msgid "main towns by cost" msgstr "" #: templates/ishtar/wizard/wizard_adminact_deletion.html:6 diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html index 426669cca..4c41ed89e 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{caption}}</caption> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Ref." %}</th> <th>{% trans "Type" %}</th> @@ -18,3 +20,5 @@ <tr><td colspan="4" class='no_items'>{% trans "No administrative act associated" %}</td></tr> {% endfor %} </table> +</div> +</div> diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html b/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html index d72291c5b..d570b9db2 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{caption}}</caption> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Ref." %}</th> <th>{% trans "Name" %}</th> @@ -18,3 +20,5 @@ <tr><td colspan="4" class='no_items'>{% trans "No archaeological site associated" %}</td></tr> {% endfor %} </table> +</div> +</div> diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html index 9885680d7..37be138b1 100644 --- a/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html +++ b/archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{ parcels_label }}</caption> +<h4>{{ parcels_label }}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Town" %}</th> <th>{% trans "Year" %}</th> @@ -20,3 +22,4 @@ <tr><td colspan="4" class='no_items'>{% trans "No parcel" %}</td></tr> {% endfor %} </table> +</div></div> diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html index b3b75c4ae..a661d304d 100644 --- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html +++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n range units %} +{% load i18n range units humanize %} {% block extra_head %} {{form.media}} {% endblock %} @@ -10,496 +10,700 @@ <h3>{% trans "Global informations" %}</h3> <div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "total" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Total" %}</caption> <tr> <th>{% trans "Status" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.total %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "area by type of operation" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Area by type of operation" %}</caption> <tr> <th>{% trans "Status" %}</th><th>{% trans "Area (ha)" %}</th> </tr> {% for surface in dashboard.surface_by_type %} <tr> - <th class='sub'>{{surface.operation_type__label}}</th><td>{{surface.number|m2_to_ha}}</td> + <th class='sub'>{{surface.operation_type__label}}</th><td>{{surface.number|m2_to_ha|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by types" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By types" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for typ in dashboard.types %}<th>{{typ.label}}</th>{% endfor %} + {% for typ in dashboard.types %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{typ.label}}</th> + {% endfor %} </tr> {% for lbl, types in dashboard.by_type %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in types %}<td>{{nb}}</td>{% endfor %} + {%for nb in types %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.by_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.realisation_years %}<th>{{yr.year}}</th>{% endfor %} + {%for yr in dashboard.realisation_years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr.year|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.by_realisation_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> - <table> - <caption>{% trans "Effective operation by type and year" %}</caption> + <div class='clean-table'> + <h4>{% trans "effective operation by type and year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> + {% for lbl, years in dashboard.effective %} + + {% if forloop.counter0|divisibleby:6 %} <tr> - <th>{% trans "Type" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th></th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> - {% for lbl, years in dashboard.effective %} + {% endif %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation month" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation month" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for mt in dashboard.last_months %}<th>{{mt.date|date:"F Y"|capfirst}}</th>{% endfor %} + {%for mt in dashboard.last_months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{mt.date|date:"N Y"|capfirst}}</th>{% endfor %} </tr> {% for lbl, months in dashboard.by_realisation_month %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in months %}<td>{{nb}}</td>{% endfor %} + {%for nb in months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> </div> <h3>{% trans "Survey informations" %}</h3> <div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "total" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Total" %}</caption> <tr> <th>{% trans "Status" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.survey.total %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.survey.by_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.realisation_years %}<th>{{yr.year}}</th>{% endfor %} + {%for yr in dashboard.realisation_years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th> + {% endif %} + <th>{{yr.year|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.survey.by_realisation_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "current year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Current year" %}</caption> <tr> - <th>{% trans "Status" %}</th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} + <th></th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> - </table></div> - + </table></div></div> <p><strong>{% trans "Man-day/hectare for effective operations (current year):" %}</strong> {{dashboard.survey.mandayhect_effective}}</p> - - <div class='table'> + <div class='clean-table'> + <h4>{% trans "organizations (current year)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Organizations (current year)" %}</caption> <tr> <th> </th><th>{% trans "Area" %}</th><th>{% trans "Man-day" %}</th><th>{% trans "Man-day/hectare" %}</th> </tr> {% for org in dashboard.survey.org %} <tr> - <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> + <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area|intcomma}}</td><td>{{org.manday|intcomma}}</td><td>{{org.mandayhect|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "current realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Current realisation year" %}</caption> <tr> <th>{% trans "Status" %}</th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.survey.area_realised %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.survey.manday_realised %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.survey.mandayhect_realised %}<td>{{nb|intcomma}}</td>{%endfor%} </tr> - </table></div> + </table></div></div> <p><strong>{% trans "Man-day/hectare for effective operations (current realisation year):" %}</strong> {{dashboard.survey.mandayhect_real_effective}}</p> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "organizations (current realisation year)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Organizations (current realisation year)" %}</caption> <tr> <th> </th><th>{% trans "Area" %}</th><th>{% trans "Man-day" %}</th><th>{% trans "Man-day/hectare" %}</th> </tr> {% for org in dashboard.survey.org_realised %} <tr> - <th class='sub'>{{org.in_charge__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> + <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area|intcomma}}</td><td>{{org.manday|intcomma}}</td><td>{{org.mandayhect|intcomma}}</td> </tr> {% endfor %} - </table></div> - - <div class='table'> - <table> - <caption>{% trans "Area by organization by year" %}</caption> + </table></div></div> + <div class='clean-table'> + <h4>{% trans "area by organization by year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> <tr> - <th>{% trans "Organization" %}</th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} </tr> {% for org, vals in dashboard.survey.org_by_year %} - <tr> - <th class='sub'>{{org}}</th>{% for area, cost in vals %}<td>{{area}}</td>{% endfor %} + {% if forloop.counter0|divisibleby:4 %} + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "Organization" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th> + {% endfor %} + {% endif %} + + <tr> + {% for area, cost in vals %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{org}}</th> + {% endif %} + <td>{{area|intcomma}}</td>{% endfor %} </tr> {% endfor %} <tr> - <th>{% trans "Mean" %}</th>{% for area in dashboard.survey.org_by_year_area_mean %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.survey.org_by_year_area_mean %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Mean" %}</th>{% endif%} + <td>{{area|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "effective operations areas (ha)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Effective operations areas (ha)" %}</caption> <tr> - <th> </th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th></th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> <tr> - <th>{% trans "Sum" %}</th>{% for nb, mean in dashboard.survey.effective %}<td>{{nb|m2_to_ha}}</td>{% endfor %} + {% for nb, mean in dashboard.survey.effective %} + {% if forloop.counter0|divisibleby:5 %}<th>{% trans "Sum" %}</th>{%endif%} + <td>{{nb|m2_to_ha|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Average" %}</th>{% for nb, avg in dashboard.survey.effective %}<td>{{avg|m2_to_ha}}</td>{% endfor %} + {% for nb, avg in dashboard.survey.effective %} + {% if forloop.counter0|divisibleby:5 %}<th>{% trans "Average" %}</th>{%endif%} + <td>{{avg|m2_to_ha|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "man-days/hectare by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Man-Days/hectare by Year" %}</caption> <tr> - <th> </th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th></th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> <tr> - <th>{% trans "Man-Days/hectare" %}</th>{% for nb, mean in dashboard.survey.mandayshect %}<td>{{nb}}</td>{% endfor %} + {% for nb, mean in dashboard.survey.mandayshect %} + {% if forloop.counter0|divisibleby:5 %}<th>{% trans "Man-Days/hectare" %}</th>{%endif%} + <td>{{nb|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Average" %}</th>{% for nb, avg in dashboard.survey.mandayshect %}<td>{{avg}}</td>{% endfor %} + {% for nb, avg in dashboard.survey.mandayshect %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Average" %}</th> + {%endif%} + <td>{{avg|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by month" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By month" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for mt in dashboard.last_months %}<th>{{mt.date|date:"F Y"|capfirst}}</th>{% endfor %} + {% for mt in dashboard.last_months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th>{% endif %} + <th>{{mt.date|date:"N Y"|capfirst}}</th>{% endfor %} </tr> {% for lbl, months in dashboard.survey.by_month %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in months %}<td>{{nb}}</td>{% endfor %} + {%for nb in months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td> + {% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By department" %}</caption> <tr> - <th>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %}<th>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "Department" %}</th> + {% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %}<th>{% trans "Sum" %}</th> </tr> {% for lbl, years in dashboard.survey.by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "effective operation by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Effective operation by department" %}</caption> <tr> - <th rowspan='2'>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th colspan='2'>{{yr}}</th>{% endfor %}<th colspan='2'>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:4 %} + <th rowspan='2'>{% trans "Department" %}</th>{% endif %} + <th class='sub' colspan='2'>{{yr|default_if_none:''}}</th>{% endfor %}<th colspan='2'>{% trans "Sum" %}</th> </tr> <tr> {%for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Area"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Area"%}</th> </tr> {% for lbl, years in dashboard.survey.effective_by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb, area, cost, fnap in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{area}}</td>{% endfor %} + {%for nb, area, cost, fnap in years %} + {% if forloop.counter0|divisibleby:4 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|intcomma}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{area|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by number" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by number" %}</caption> <tr> <th>{% trans "Town" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.survey.towns %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by surface" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by surface" %}</caption> <tr> <th>{% trans "Town" %}</th><th>{% trans "Total surface (ha)" %}</th> </tr> {% for lbl, nb in dashboard.survey.towns_surface %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb|m2_to_ha}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|m2_to_ha|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> </div> <h3>{% trans "Excavation informations" %}</h3> <div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "total" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Total" %}</caption> <tr> <th>{% trans "Status" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.excavation.total %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %} + {%for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "State" %}</th>{% endif %} + <th>{{yr|default_if_none:''}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.excavation.by_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By realisation year" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for yr in dashboard.realisation_years %}<th>{{yr.year}}</th>{% endfor %} + {% for yr in dashboard.realisation_years %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "State" %}</th>{% endif %} + <th>{{yr.year}}</th>{% endfor %} </tr> {% for lbl, years in dashboard.excavation.by_realisation_year %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "current realisation year" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Current realisation year" %}</caption> <tr> <th>{% trans "Status" %}</th>{% for lbl in dashboard.filters_label %}<th>{{lbl}}</th>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.excavation.area_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Area"%}</th>{% for nb in dashboard.excavation.area_realised %}<td>{{nb|default_if_none:'-'|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.excavation.manday_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day"%}</th>{% for nb in dashboard.excavation.manday_realised %}<td>{{nb|default_if_none:'-'|intcomma}}</td>{%endfor%} </tr> <tr> - <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.excavation.mandayhect_realised %}<td>{{nb}}</td>{%endfor%} + <th class='sub'>{% trans "Man-day/hectare"%}</th>{% for nb in dashboard.excavation.mandayhect_realised %}<td>{{nb|default_if_none:'-'|intcomma}}</td>{%endfor%} </tr> - </table></div> + </table></div></div> <p><strong>{% trans "Man-day/hectare for effective operations (current realisation year):" %}</strong> {{dashboard.excavation.mandayhect_real_effective}}</p> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "organizations (current realisation year)" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Organizations (current realisation year)" %}</caption> <tr> <th> </th><th>{% trans "Area" %}</th><th>{% trans "Man-day" %}</th><th>{% trans "Man-day/hectare" %}</th> </tr> {% for org in dashboard.excavation.org_realised %} <tr> - <th class='sub'>{{org.in_charge__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> + <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area|default_if_none:'-'|intcomma}}</td><td>{{org.manday|default_if_none:'-'|intcomma}}</td><td>{{org.mandayhect|default_if_none:'-'|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> - <table> - <caption>{% trans "Area by organization by year" %}</caption> + <div class='clean-table'> + <h4>{% trans "area by organization by year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> + {% for org, vals in dashboard.excavation.org_by_year %} + {% if forloop.counter0|divisibleby:5 %} <tr> - <th>{% trans "Organization" %}</th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {% for yr in dashboard.years%} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Organization" %}</th>{% endif %} + <th>{{yr|default_if_none:'-'}}</th>{% endfor %} </tr> - {% for org, vals in dashboard.excavation.org_by_year %} + {% endif %} <tr> - <th class='sub'>{{org}}</th>{% for area, cost in vals %}<td>{{area}}</td>{% endfor %} + {% for area, cost in vals %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{org}}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} <tr> - <th>{% trans "Sum" %}</th>{% for area in dashboard.excavation.org_by_year_area_sum %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_sum %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Sum" %}</th>{% endif %} + <td>{{area|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Mean" %}</th>{% for area in dashboard.excavation.org_by_year_area_mean %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_mean %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Mean" %}</th>{% endif %} + <td>{{area|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> - <table> - <caption>{% trans "Area by organization by realisation year" %}</caption> + <div class='clean-table'> + <h4>{% trans "area by organization by realisation year" %}</h4> + <div class='clean-table-wrap'> + <table class='mini-table'> + {% for org, vals in dashboard.excavation.org_by_year %} + + {% if forloop.counter0|divisibleby:5 %} <tr> - <th>{% trans "Organization" %}</th>{% for yr in dashboard.years%}<th>{{yr}}</th>{% endfor %} + {% for yr in dashboard.years%} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Organization" %}</th>{% endif %} + <th>{{yr|default_if_none:'-'}}</th>{% endfor %} </tr> - {% for org, vals in dashboard.excavation.org_by_year %} + {% endif %} + <tr> - <th class='sub'>{{org}}</th>{% for area, cost in vals %}<td>{{area}}</td>{% endfor %} + {% for area, cost in vals %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{org}}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} <tr> - <th>{% trans "Sum" %}</th>{% for area in dashboard.excavation.org_by_year_area_sum %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_sum %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Sum" %}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> <tr> - <th>{% trans "Mean" %}</th>{% for area in dashboard.excavation.org_by_year_area_mean %}<td>{{area}}</td>{% endfor %} + {% for area in dashboard.excavation.org_by_year_area_mean %} + {% if forloop.counter0|divisibleby:5 %} + <th>{% trans "Mean" %}</th>{% endif %} + <td>{{area|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by month" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By month" %}</caption> <tr> - <th>{% trans "State" %}</th>{%for mt in dashboard.last_months %}<th>{{mt.date|date:"F Y"|capfirst}}</th>{% endfor %} + {% for mt in dashboard.last_months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "State" %}</th>{% endif %} + <th>{{mt.date|date:"N Y"|capfirst}}</th>{% endfor %} </tr> {% for lbl, months in dashboard.excavation.by_month %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in months %}<td>{{nb}}</td>{% endfor %} + {% for nb in months %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td>{{nb|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "By department" %}</caption> <tr> - <th>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th>{{yr}}</th>{% endfor %}<th>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{% trans "Department" %}</th>{% endif %} + <th>{{yr|default_if_none:'-'}}</th>{% endfor %} + <th>{% trans "Sum" %}</th> </tr> {% for lbl, years in dashboard.excavation.by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td>{% endfor %} + {% for nb in years %} + {% if forloop.counter0|divisibleby:5 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|default_if_none:'-'|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "effective operation by department" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Effective operation by department" %}</caption> <tr> - <th rowspan='2'>{% trans "Department" %}</th>{%for yr in dashboard.years %}<th colspan='3'>{{yr}}</th>{% endfor %}<th colspan='3'>{% trans "Sum" %}</th> + {% for yr in dashboard.years %} + {% if forloop.counter0|divisibleby:3 %} + <th rowspan='2' class="sub">{% trans "Department" %}</th>{% endif %} + <th colspan='3'>{{yr|default_if_none:'-'}}</th>{% endfor %}<th colspan='3'>{% trans "Sum" %}</th> </tr> <tr> - {%for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th> + {% for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th> </tr> {% for lbl, years in dashboard.excavation.effective_by_dpt %} <tr> - <th class='sub'>{{lbl}}</th>{%for nb, area, cost, fnap in years %}<td{%if forloop.last%} class='sub'{%endif%}>{{nb}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{cost}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{fnap}}</td>{% endfor %} + {% for nb, area, cost, fnap in years %} + {% if forloop.counter0|divisibleby:3 %} + <th class='sub'>{{lbl}}</th>{% endif %} + <td{%if forloop.last%} class='sub'{%endif%}>{{nb|intcomma}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{cost|intcomma}}</td><td{%if forloop.last%} class='sub'{%endif%}>{{fnap|intcomma}}</td>{% endfor %} </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by number" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by number" %}</caption> <tr> <th>{% trans "Town" %}</th><th>{% trans "Number" %}</th> </tr> {% for lbl, nb in dashboard.excavation.towns %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> - <div class='table'> + <div class='clean-table'> + <h4>{% trans "main towns by cost" %}</h4> + <div class='clean-table-wrap'> <table> - <caption>{% trans "Main towns by cost" %}</caption> <tr> <th>{% trans "Town" %}</th><th>{% trans "Cost (euros)" %}</th> </tr> {% for lbl, nb in dashboard.excavation.towns_cost %} <tr> - <th class='sub'>{{lbl}}</th><td>{{nb}}</td> + <th class='sub'>{{lbl}}</th><td>{{nb|intcomma}}</td> </tr> {% endfor %} - </table></div> + </table></div></div> </div> diff --git a/docs/fr/source/installation.rst b/docs/fr/source/installation.rst index b2284cda1..5c6d3fdc6 100644 --- a/docs/fr/source/installation.rst +++ b/docs/fr/source/installation.rst @@ -44,14 +44,18 @@ Enfin pour créer une nouvelle instance d'Ishtar :: INSTANCE=le_nom_de_mon_instance URL=ishtar.my-organization.net ishtar-prepare-instance -INSTANCE est le nom de l'instance et URL le nom du domaine associé. D'autres variables sont disponibles : +INSTANCE est le nom de l'instance et URL le nom du domaine associé. + +.. note:: Le nom de domaine doit bien entendu pointer vers l'adresse IP du serveur. Si à l'issue de l'installation, le service n'est pas joignable, verifiez bien votre configuration DNS ou le cas échéant verifez bien auprès du gestionnaire de nom de domaine que c'est le cas. + +D'autres variables sont disponibles : - **UWSGI_PORT** : par défaut à 8891, faites bien attention d'incrémenter ce nombre pour chaque nouvelle instance. - **NGINX_PORT** : si vous voulez que le serveur web réponde sur un port différent, par exemple si vous avez déjà Apache installé. Ensuite pour accéder à l'application il faudra mettre clairement le numéro de port dans l'adresse du logiciel. Exemple : http://ishtar.my-organization.net:8000 - **DB_HOST**, **DB_PORT**, **DB_PASSWORD**, **DB_NAME** : si vous souhaitez personnaliser la base de données dans laquelle sera stockée Ishtar. Par défaut, elle sera stockée localement, sur le port par défaut de PostgreSQL (5432), le mot de passe sera généré aléatoirement, le nom de la base de données sera : « ishtar-le_nom_de_mon_instance ». .. note:: Pour le nom de l'instance, seuls sont permis le tiret bas **_** et les caractères alphanumériques en minuscule. Ce nom doit commencer par un caractères alphabétique. Évitez aussi des noms pouvant entrer en conflit avec des bibliothèques Python existantes (par exemple « test »). -.. + .. warning:: En terme de serveur Web, cette première version de l'installateur fonctionne avec la configuration que nous considérons comme la plus optimisée qui est le couple nginx / uwsgi. À terme, l'installateur prendra aussi en compte Apache. Pour l'instant, si vous avez des services tournant sous Apache, plusieurs options se présentent à vous : diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 6fdee55cb..aef94476c 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -126,6 +126,7 @@ class TargetKeyForm(forms.ModelForm): if instance and instance.pk: self.fields['target'].widget.attrs['readonly'] = True self.fields['key'].widget.attrs['readonly'] = True + self.fields['key'].widget.attrs['title'] = unicode(instance) self.fields['value'].widget.choices = list( instance.target.get_choices()) self.fields['key'].required = False diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index ba75c5e2f..79a65ce86 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -24,7 +24,7 @@ msgstr "" msgid "Archaeological file" msgstr "" -#: context_processors.py:39 models.py:1434 +#: context_processors.py:39 models.py:1457 msgid "Operation" msgstr "" @@ -147,7 +147,7 @@ msgstr "" msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "" -#: forms.py:71 forms_common.py:489 +#: forms.py:71 forms_common.py:490 msgid "Confirm" msgstr "" @@ -171,12 +171,12 @@ msgstr "" msgid "Add a new item" msgstr "" -#: forms.py:204 models.py:1211 +#: forms.py:204 models.py:1234 msgid "Template" msgstr "" -#: forms_common.py:39 forms_common.py:57 forms_common.py:169 -#: forms_common.py:292 models.py:1277 models.py:2555 +#: forms_common.py:39 forms_common.py:57 forms_common.py:170 +#: forms_common.py:293 models.py:1300 models.py:2583 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -192,283 +192,283 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: forms_common.py:66 forms_common.py:717 ishtar_menu.py:47 models.py:1432 -#: models.py:2232 models.py:2379 models.py:2436 +#: forms_common.py:66 forms_common.py:718 ishtar_menu.py:47 models.py:1455 +#: models.py:2255 models.py:2407 models.py:2464 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" -#: forms_common.py:157 forms_common.py:233 forms_common.py:335 -#: ishtar_menu.py:71 models.py:1433 models.py:2149 +#: forms_common.py:158 forms_common.py:234 forms_common.py:336 +#: ishtar_menu.py:71 models.py:1456 models.py:2172 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" -#: forms_common.py:160 forms_common.py:196 forms_common.py:228 -#: forms_common.py:262 forms_common.py:330 models.py:886 models.py:1210 -#: models.py:1478 models.py:1696 models.py:2143 models.py:2219 models.py:2541 +#: forms_common.py:161 forms_common.py:197 forms_common.py:229 +#: forms_common.py:263 forms_common.py:331 models.py:902 models.py:1233 +#: models.py:1501 models.py:1719 models.py:2166 models.py:2242 models.py:2569 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:161 models.py:1419 models.py:1827 +#: forms_common.py:162 models.py:1442 models.py:1850 msgid "Organization type" msgstr "" -#: forms_common.py:163 forms_common.py:286 models.py:1272 +#: forms_common.py:164 forms_common.py:287 models.py:1295 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:165 forms_common.py:289 models.py:1273 +#: forms_common.py:166 forms_common.py:290 models.py:1296 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:167 forms_common.py:290 models.py:1275 +#: forms_common.py:168 forms_common.py:291 models.py:1298 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:170 forms_common.py:293 models.py:1278 +#: forms_common.py:171 forms_common.py:294 models.py:1301 msgid "Country" msgstr "" -#: forms_common.py:172 forms_common.py:230 forms_common.py:266 -#: forms_common.py:332 forms_common.py:445 models.py:1305 +#: forms_common.py:173 forms_common.py:231 forms_common.py:267 +#: forms_common.py:333 forms_common.py:446 models.py:1328 msgid "Email" msgstr "" -#: forms_common.py:173 forms_common.py:269 models.py:1290 +#: forms_common.py:174 forms_common.py:270 models.py:1313 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:18 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:174 forms_common.py:278 models.py:1302 +#: forms_common.py:175 forms_common.py:279 models.py:1325 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:36 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:197 forms_common.py:231 forms_common.py:333 models.py:1854 -#: models.py:2145 models.py:2477 templates/sheet_ope.html:85 +#: forms_common.py:198 forms_common.py:232 forms_common.py:334 models.py:1877 +#: models.py:2168 models.py:2505 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 -#: templates/ishtar/blocks/window_tables/documents.html:6 +#: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" msgstr "" -#: forms_common.py:206 views.py:130 +#: forms_common.py:207 views.py:130 msgid "Organization search" msgstr "" -#: forms_common.py:229 forms_common.py:260 forms_common.py:331 models.py:2217 +#: forms_common.py:230 forms_common.py:261 forms_common.py:332 models.py:2240 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" -#: forms_common.py:245 forms_common.py:318 views.py:95 +#: forms_common.py:246 forms_common.py:319 views.py:95 msgid "Person search" msgstr "" -#: forms_common.py:257 templates/ishtar/sheet_person.html:7 +#: forms_common.py:258 templates/ishtar/sheet_person.html:7 #: templates/ishtar/wizard/wizard_person.html:6 msgid "Identity" msgstr "" -#: forms_common.py:259 forms_common.py:643 forms_common.py:684 models.py:2215 -#: models.py:2474 templates/sheet_ope.html:104 -#: templates/ishtar/blocks/window_tables/documents.html:5 +#: forms_common.py:260 forms_common.py:644 forms_common.py:685 models.py:2238 +#: models.py:2502 templates/sheet_ope.html:104 +#: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:264 models.py:2221 +#: forms_common.py:265 models.py:2244 msgid "Raw name" msgstr "" -#: forms_common.py:267 models.py:1291 +#: forms_common.py:268 models.py:1314 msgid "Phone description" msgstr "" -#: forms_common.py:270 models.py:1293 models.py:1295 +#: forms_common.py:271 models.py:1316 models.py:1318 msgid "Phone description 2" msgstr "" -#: forms_common.py:272 +#: forms_common.py:273 msgid "Phone 2" msgstr "" -#: forms_common.py:274 models.py:1299 +#: forms_common.py:275 models.py:1322 msgid "Phone description 3" msgstr "" -#: forms_common.py:276 models.py:1297 +#: forms_common.py:277 models.py:1320 msgid "Phone 3" msgstr "" -#: forms_common.py:281 +#: forms_common.py:282 msgid "Current organization" msgstr "" -#: forms_common.py:295 models.py:1280 +#: forms_common.py:296 models.py:1303 msgid "Other address: address" msgstr "" -#: forms_common.py:298 models.py:1283 +#: forms_common.py:299 models.py:1306 msgid "Other address: address complement" msgstr "" -#: forms_common.py:300 models.py:1284 +#: forms_common.py:301 models.py:1307 msgid "Other address: postal code" msgstr "" -#: forms_common.py:302 models.py:1286 +#: forms_common.py:303 models.py:1309 msgid "Other address: town" msgstr "" -#: forms_common.py:304 models.py:1288 +#: forms_common.py:305 models.py:1311 msgid "Other address: country" msgstr "" -#: forms_common.py:314 +#: forms_common.py:315 msgid "Already has an account" msgstr "" -#: forms_common.py:329 +#: forms_common.py:330 msgid "Username" msgstr "" -#: forms_common.py:347 +#: forms_common.py:348 msgid "Account search" msgstr "" -#: forms_common.py:394 forms_common.py:424 forms_common.py:428 models.py:2197 +#: forms_common.py:395 forms_common.py:425 forms_common.py:429 models.py:2220 msgid "Person type" msgstr "" -#: forms_common.py:439 forms_common.py:444 ishtar_menu.py:32 +#: forms_common.py:440 forms_common.py:445 ishtar_menu.py:32 msgid "Account" msgstr "" -#: forms_common.py:448 wizards.py:1170 +#: forms_common.py:449 wizards.py:1170 msgid "New password" msgstr "" -#: forms_common.py:451 +#: forms_common.py:452 msgid "New password (confirmation)" msgstr "" -#: forms_common.py:470 +#: forms_common.py:471 msgid "Your password and confirmation password do not match." msgstr "" -#: forms_common.py:475 +#: forms_common.py:476 msgid "You must provide a correct password." msgstr "" -#: forms_common.py:483 +#: forms_common.py:484 msgid "This username already exists." msgstr "" -#: forms_common.py:490 +#: forms_common.py:491 msgid "Send the new password by email?" msgstr "" -#: forms_common.py:499 forms_common.py:512 models.py:2556 +#: forms_common.py:500 forms_common.py:513 models.py:2584 msgid "Towns" msgstr "" -#: forms_common.py:509 +#: forms_common.py:510 msgid "There are identical towns." msgstr "" -#: forms_common.py:593 +#: forms_common.py:594 msgid "Only one choice can be checked." msgstr "" -#: forms_common.py:641 +#: forms_common.py:642 msgid "Documentation informations" msgstr "" -#: forms_common.py:645 forms_common.py:685 models.py:1828 models.py:2457 +#: forms_common.py:646 forms_common.py:686 models.py:1851 models.py:2485 msgid "Source type" msgstr "" -#: forms_common.py:647 forms_common.py:686 templates/sheet_ope.html:84 +#: forms_common.py:648 forms_common.py:687 templates/sheet_ope.html:84 msgid "Reference" msgstr "" -#: forms_common.py:650 forms_common.py:687 +#: forms_common.py:651 forms_common.py:688 msgid "Internal reference" msgstr "" -#: forms_common.py:653 models.py:2488 +#: forms_common.py:654 models.py:2516 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:654 models.py:2490 +#: forms_common.py:655 models.py:2518 msgid "Receipt date" msgstr "" -#: forms_common.py:656 models.py:1981 models.py:2492 +#: forms_common.py:657 models.py:2004 models.py:2520 msgid "Creation date" msgstr "" -#: forms_common.py:659 models.py:2495 +#: forms_common.py:660 models.py:2523 msgid "Receipt date in documentation" msgstr "" -#: forms_common.py:661 forms_common.py:689 models.py:287 models.py:516 -#: models.py:1723 models.py:2225 models.py:2502 +#: forms_common.py:662 forms_common.py:690 models.py:287 models.py:516 +#: models.py:1746 models.py:2248 models.py:2530 msgid "Comment" msgstr "" -#: forms_common.py:663 forms_common.py:688 models.py:888 models.py:1482 -#: models.py:1655 models.py:1697 models.py:2501 templates/sheet_ope.html:128 +#: forms_common.py:664 forms_common.py:689 models.py:904 models.py:1505 +#: models.py:1678 models.py:1720 models.py:2529 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:666 models.py:2503 +#: forms_common.py:667 models.py:2531 msgid "Additional information" msgstr "" -#: forms_common.py:668 forms_common.py:692 models.py:2505 +#: forms_common.py:669 forms_common.py:693 models.py:2533 msgid "Has a duplicate" msgstr "" -#: forms_common.py:681 forms_common.py:710 forms_common.py:743 models.py:2441 +#: forms_common.py:682 forms_common.py:711 forms_common.py:744 models.py:2469 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" -#: forms_common.py:691 +#: forms_common.py:692 msgid "Additional informations" msgstr "" -#: forms_common.py:702 +#: forms_common.py:703 msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:718 models.py:1829 models.py:2431 models.py:2438 +#: forms_common.py:719 models.py:1852 models.py:2459 models.py:2466 msgid "Author type" msgstr "" -#: forms_common.py:736 +#: forms_common.py:737 msgid "Author selection" msgstr "" -#: forms_common.py:750 +#: forms_common.py:751 msgid "There are identical authors." msgstr "" -#: forms_common.py:754 models.py:2442 models.py:2484 +#: forms_common.py:755 models.py:2470 models.py:2512 #: templates/sheet_ope.html:106 -#: templates/ishtar/blocks/window_tables/documents.html:7 +#: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" msgstr "" @@ -484,7 +484,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1006 views.py:1232 +#: ishtar_menu.py:39 models.py:1029 views.py:1232 msgid "Global variables" msgstr "" @@ -508,12 +508,12 @@ msgstr "" msgid "Merge" msgstr "" -#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2018 widgets.py:110 +#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2041 widgets.py:110 #: templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: ishtar_menu.py:101 models.py:1992 +#: ishtar_menu.py:101 models.py:2015 msgid "Imports" msgstr "" @@ -541,7 +541,7 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:283 models.py:515 models.py:1245 models.py:1257 +#: models.py:283 models.py:515 models.py:1268 models.py:1280 msgid "Label" msgstr "" @@ -549,11 +549,11 @@ msgstr "" msgid "Textual ID" msgstr "" -#: models.py:288 models.py:518 models.py:1214 +#: models.py:288 models.py:518 models.py:1237 msgid "Available" msgstr "" -#: models.py:537 models.py:1769 +#: models.py:537 models.py:1792 msgid "Key" msgstr "" @@ -569,7 +569,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:766 models.py:2567 +#: models.py:766 models.py:2595 msgid "Order" msgstr "" @@ -585,730 +585,741 @@ msgstr "" msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:880 +#: models.py:896 msgid "Euro" msgstr "" -#: models.py:881 +#: models.py:897 msgid "US dollar" msgstr "" -#: models.py:887 models.py:1480 +#: models.py:903 models.py:1503 msgid "Slug" msgstr "" -#: models.py:889 +#: models.py:905 msgid "Files module" msgstr "" -#: models.py:890 +#: models.py:906 msgid "Context records module" msgstr "" -#: models.py:892 +#: models.py:908 msgid "Finds module" msgstr "" -#: models.py:893 +#: models.py:909 msgid "Need context records module" msgstr "" -#: models.py:895 +#: models.py:911 msgid "Warehouses module" msgstr "" -#: models.py:896 +#: models.py:912 msgid "Need finds module" msgstr "" -#: models.py:898 +#: models.py:914 msgid "Home page" msgstr "" -#: models.py:899 +#: models.py:915 msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax." msgstr "" -#: models.py:902 +#: models.py:918 msgid "File external id" msgstr "" -#: models.py:904 +#: models.py:920 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:909 +#: models.py:925 msgid "Parcel external id" msgstr "" -#: models.py:912 +#: models.py:928 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:917 +#: models.py:933 msgid "Context record external id" msgstr "" -#: models.py:919 +#: models.py:935 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:924 +#: models.py:940 msgid "Base find external id" msgstr "" -#: models.py:926 +#: models.py:942 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:931 +#: models.py:947 msgid "Find external id" msgstr "" -#: models.py:933 +#: models.py:949 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:937 +#: models.py:954 +msgid "Raw name for person" +msgstr "" + +#: models.py:956 +msgid "" +"Formula to manage person raw_name. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:960 msgid "Current active" msgstr "" -#: models.py:938 +#: models.py:961 msgid "Currency" msgstr "" -#: models.py:942 +#: models.py:965 msgid "Ishtar site profile" msgstr "" -#: models.py:943 +#: models.py:966 msgid "Ishtar site profiles" msgstr "" -#: models.py:999 +#: models.py:1022 msgid "Variable name" msgstr "" -#: models.py:1000 +#: models.py:1023 msgid "Description of the variable" msgstr "" -#: models.py:1002 models.py:1770 +#: models.py:1025 models.py:1793 msgid "Value" msgstr "" -#: models.py:1005 +#: models.py:1028 msgid "Global variable" msgstr "" -#: models.py:1115 models.py:1145 +#: models.py:1138 models.py:1168 msgid "Total" msgstr "" -#: models.py:1122 models.py:1246 models.py:1258 +#: models.py:1145 models.py:1269 models.py:1281 #: templates/ishtar/sheet_person.html:21 -#: templates/ishtar/dashboards/dashboard_main_detail.html:135 +#: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 #: templates/ishtar/wizard/wizard_person.html:20 msgid "Number" msgstr "" -#: models.py:1209 +#: models.py:1232 msgid "Administrative Act" msgstr "" -#: models.py:1213 +#: models.py:1236 msgid "Associated object" msgstr "" -#: models.py:1217 +#: models.py:1240 msgid "Document template" msgstr "" -#: models.py:1218 +#: models.py:1241 msgid "Document templates" msgstr "" -#: models.py:1249 models.py:1259 models.py:1976 +#: models.py:1272 models.py:1282 models.py:1999 msgid "State" msgstr "" -#: models.py:1263 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1286 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1264 +#: models.py:1287 msgid "Departments" msgstr "" -#: models.py:1301 +#: models.py:1324 msgid "Raw phone" msgstr "" -#: models.py:1307 +#: models.py:1330 msgid "Alternative address is prefered" msgstr "" -#: models.py:1346 +#: models.py:1369 msgid "Tel: " msgstr "" -#: models.py:1350 +#: models.py:1373 msgid "Mobile: " msgstr "" -#: models.py:1354 +#: models.py:1377 msgid "Email: " msgstr "" -#: models.py:1359 +#: models.py:1382 msgid "Merge key" msgstr "" -#: models.py:1420 +#: models.py:1443 msgid "Organization types" msgstr "" -#: models.py:1436 +#: models.py:1459 msgid "Archaeological site" msgstr "" -#: models.py:1437 +#: models.py:1460 msgid "Parcels" msgstr "" -#: models.py:1439 +#: models.py:1462 msgid "Operation source" msgstr "" -#: models.py:1442 views.py:1057 views.py:1108 +#: models.py:1465 views.py:1057 views.py:1108 msgid "Archaeological files" msgstr "" -#: models.py:1444 views.py:1060 views.py:1116 +#: models.py:1467 views.py:1060 views.py:1116 msgid "Context records" msgstr "" -#: models.py:1446 +#: models.py:1469 msgid "Context record relations" msgstr "" -#: models.py:1448 views.py:1062 views.py:1119 +#: models.py:1471 views.py:1062 views.py:1119 msgid "Finds" msgstr "" -#: models.py:1484 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1507 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "" -#: models.py:1486 +#: models.py:1509 msgid "Associated model" msgstr "" -#: models.py:1489 +#: models.py:1512 msgid "Is template" msgstr "" -#: models.py:1490 +#: models.py:1513 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1494 +#: models.py:1517 msgid "Importer - Type" msgstr "" -#: models.py:1495 +#: models.py:1518 msgid "Importer - Types" msgstr "" -#: models.py:1585 +#: models.py:1608 msgid "Importer - Default" msgstr "" -#: models.py:1586 +#: models.py:1609 msgid "Importer - Defaults" msgstr "" -#: models.py:1621 +#: models.py:1644 msgid "Importer - Default value" msgstr "" -#: models.py:1622 +#: models.py:1645 msgid "Importer - Default values" msgstr "" -#: models.py:1654 +#: models.py:1677 msgid "Column number" msgstr "" -#: models.py:1657 +#: models.py:1680 msgid "Required" msgstr "" -#: models.py:1660 +#: models.py:1683 msgid "Importer - Column" msgstr "" -#: models.py:1661 +#: models.py:1684 msgid "Importer - Columns" msgstr "" -#: models.py:1681 +#: models.py:1704 msgid "Field name" msgstr "" -#: models.py:1683 models.py:1717 +#: models.py:1706 models.py:1740 msgid "Force creation of new items" msgstr "" -#: models.py:1685 models.py:1719 +#: models.py:1708 models.py:1742 msgid "Concatenate with existing" msgstr "" -#: models.py:1687 models.py:1721 +#: models.py:1710 models.py:1744 msgid "Concatenate character" msgstr "" -#: models.py:1691 +#: models.py:1714 msgid "Importer - Duplicate field" msgstr "" -#: models.py:1692 +#: models.py:1715 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:1699 +#: models.py:1722 msgid "Regular expression" msgstr "" -#: models.py:1702 +#: models.py:1725 msgid "Importer - Regular expression" msgstr "" -#: models.py:1703 +#: models.py:1726 msgid "Importer - Regular expressions" msgstr "" -#: models.py:1726 +#: models.py:1749 msgid "Importer - Target" msgstr "" -#: models.py:1727 +#: models.py:1750 msgid "Importer - Targets" msgstr "" -#: models.py:1751 views.py:343 +#: models.py:1774 views.py:343 msgid "True" msgstr "" -#: models.py:1752 views.py:345 +#: models.py:1775 views.py:345 msgid "False" msgstr "" -#: models.py:1771 +#: models.py:1794 msgid "Is set" msgstr "" -#: models.py:1778 +#: models.py:1801 msgid "Importer - Target key" msgstr "" -#: models.py:1779 +#: models.py:1802 msgid "Importer - Targets keys" msgstr "" -#: models.py:1830 models.py:2469 models.py:2480 +#: models.py:1853 models.py:2497 models.py:2508 msgid "Format" msgstr "" -#: models.py:1831 models.py:2571 +#: models.py:1854 models.py:2599 msgid "Operation type" msgstr "" -#: models.py:1832 +#: models.py:1855 msgid "Period" msgstr "" -#: models.py:1833 +#: models.py:1856 msgid "Report state" msgstr "" -#: models.py:1834 +#: models.py:1857 msgid "Unit" msgstr "" -#: models.py:1835 +#: models.py:1858 msgid "Material" msgstr "" -#: models.py:1837 +#: models.py:1860 msgid "Conservatory state" msgstr "" -#: models.py:1838 +#: models.py:1861 msgid "Preservation type" msgstr "" -#: models.py:1839 +#: models.py:1862 msgid "Object type" msgstr "" -#: models.py:1841 +#: models.py:1864 msgid "Identification type" msgstr "" -#: models.py:1843 +#: models.py:1866 msgid "Context record relation type" msgstr "" -#: models.py:1844 models.py:2463 +#: models.py:1867 models.py:2491 msgid "Support type" msgstr "" -#: models.py:1850 +#: models.py:1873 msgid "Integer" msgstr "" -#: models.py:1851 +#: models.py:1874 msgid "Float" msgstr "" -#: models.py:1852 +#: models.py:1875 msgid "String" msgstr "" -#: models.py:1853 templates/sheet_ope.html:86 +#: models.py:1876 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:1855 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 -#: templates/ishtar/dashboards/dashboard_main_detail.html:120 +#: models.py:1878 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:1856 +#: models.py:1879 msgid "String to boolean" msgstr "" -#: models.py:1857 +#: models.py:1880 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:1858 +#: models.py:1881 msgid "Unknow type" msgstr "" -#: models.py:1874 +#: models.py:1897 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:1875 +#: models.py:1898 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:1876 +#: models.py:1899 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:1886 +#: models.py:1909 msgid "Options" msgstr "" -#: models.py:1888 +#: models.py:1911 msgid "Split character(s)" msgstr "" -#: models.py:1892 +#: models.py:1915 msgid "Importer - Formater type" msgstr "" -#: models.py:1893 +#: models.py:1916 msgid "Importer - Formater types" msgstr "" -#: models.py:1940 templates/ishtar/dashboards/dashboard_main_detail.html:61 +#: models.py:1963 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:1941 +#: models.py:1964 msgid "Analyse in progress" msgstr "" -#: models.py:1942 +#: models.py:1965 msgid "Analysed" msgstr "" -#: models.py:1943 +#: models.py:1966 msgid "Import pending" msgstr "" -#: models.py:1944 +#: models.py:1967 msgid "Import in progress" msgstr "" -#: models.py:1945 +#: models.py:1968 msgid "Finished with errors" msgstr "" -#: models.py:1946 +#: models.py:1969 msgid "Finished" msgstr "" -#: models.py:1947 +#: models.py:1970 msgid "Archived" msgstr "" -#: models.py:1959 +#: models.py:1982 msgid "Imported file" msgstr "" -#: models.py:1962 +#: models.py:1985 msgid "Associated images (zip file)" msgstr "" -#: models.py:1964 +#: models.py:1987 msgid "Encoding" msgstr "" -#: models.py:1966 +#: models.py:1989 msgid "Skip lines" msgstr "" -#: models.py:1967 templates/ishtar/import_list.html:47 +#: models.py:1990 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "" -#: models.py:1970 +#: models.py:1993 msgid "Result file" msgstr "" -#: models.py:1973 templates/ishtar/import_list.html:53 +#: models.py:1996 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "" -#: models.py:1979 +#: models.py:2002 msgid "Conservative import" msgstr "" -#: models.py:1984 +#: models.py:2007 msgid "End date" msgstr "" -#: models.py:1986 +#: models.py:2009 msgid "Remaining seconds" msgstr "" -#: models.py:1991 +#: models.py:2014 msgid "Import" msgstr "" -#: models.py:2008 +#: models.py:2031 msgid "Analyse" msgstr "" -#: models.py:2010 models.py:2013 +#: models.py:2033 models.py:2036 msgid "Re-analyse" msgstr "" -#: models.py:2011 +#: models.py:2034 msgid "Launch import" msgstr "" -#: models.py:2014 +#: models.py:2037 msgid "Re-import" msgstr "" -#: models.py:2015 +#: models.py:2038 msgid "Archive" msgstr "" -#: models.py:2017 +#: models.py:2040 msgid "Unarchive" msgstr "" -#: models.py:2150 +#: models.py:2173 msgid "Organizations" msgstr "" -#: models.py:2152 +#: models.py:2175 msgid "Can view all Organizations" msgstr "" -#: models.py:2153 +#: models.py:2176 msgid "Can view own Organization" msgstr "" -#: models.py:2154 +#: models.py:2177 msgid "Can add own Organization" msgstr "" -#: models.py:2156 +#: models.py:2179 msgid "Can change own Organization" msgstr "" -#: models.py:2158 +#: models.py:2181 msgid "Can delete own Organization" msgstr "" -#: models.py:2193 +#: models.py:2216 msgid "Groups" msgstr "" -#: models.py:2198 +#: models.py:2221 msgid "Person types" msgstr "" -#: models.py:2205 +#: models.py:2228 msgid "Mr" msgstr "" -#: models.py:2206 +#: models.py:2229 msgid "Miss" msgstr "" -#: models.py:2207 +#: models.py:2230 msgid "Mr and Mrs" msgstr "" -#: models.py:2208 +#: models.py:2231 msgid "Mrs" msgstr "" -#: models.py:2209 +#: models.py:2232 msgid "Doctor" msgstr "" -#: models.py:2223 +#: models.py:2246 msgid "Contact type" msgstr "" -#: models.py:2226 models.py:2273 +#: models.py:2249 models.py:2296 msgid "Types" msgstr "" -#: models.py:2229 +#: models.py:2252 msgid "Is attached to" msgstr "" -#: models.py:2233 +#: models.py:2256 msgid "Persons" msgstr "" -#: models.py:2235 +#: models.py:2258 msgid "Can view all Persons" msgstr "" -#: models.py:2236 +#: models.py:2259 msgid "Can view own Person" msgstr "" -#: models.py:2237 +#: models.py:2260 msgid "Can add own Person" msgstr "" -#: models.py:2238 +#: models.py:2261 msgid "Can change own Person" msgstr "" -#: models.py:2239 +#: models.py:2262 msgid "Can delete own Person" msgstr "" -#: models.py:2383 +#: models.py:2411 msgid "Ishtar user" msgstr "" -#: models.py:2384 +#: models.py:2412 msgid "Ishtar users" msgstr "" -#: models.py:2426 +#: models.py:2454 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2432 +#: models.py:2460 msgid "Author types" msgstr "" -#: models.py:2458 +#: models.py:2486 msgid "Source types" msgstr "" -#: models.py:2464 +#: models.py:2492 msgid "Support types" msgstr "" -#: models.py:2470 +#: models.py:2498 msgid "Formats" msgstr "" -#: models.py:2475 +#: models.py:2503 msgid "External ID" msgstr "" -#: models.py:2478 +#: models.py:2506 msgid "Support" msgstr "" -#: models.py:2482 +#: models.py:2510 msgid "Scale" msgstr "" -#: models.py:2496 +#: models.py:2524 msgid "Item number" msgstr "" -#: models.py:2497 +#: models.py:2525 msgid "Ref." msgstr "" -#: models.py:2500 +#: models.py:2528 msgid "Internal ref." msgstr "" -#: models.py:2542 +#: models.py:2570 msgid "Surface (m2)" msgstr "" -#: models.py:2543 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2571 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2568 +#: models.py:2596 msgid "Is preventive" msgstr "" -#: models.py:2572 +#: models.py:2600 msgid "Operation types" msgstr "" -#: models.py:2598 +#: models.py:2626 msgid "Preventive" msgstr "" -#: models.py:2599 +#: models.py:2627 msgid "Research" msgstr "" -#: utils.py:51 +#: utils.py:52 msgid " (...)" msgstr "" @@ -1472,6 +1483,22 @@ msgstr "" msgid "Current items" msgstr "" +#: templates/base.html:125 +msgid "Processing..." +msgstr "" + +#: templates/base.html:126 +msgid "This can be long." +msgstr "" + +#: templates/base.html:127 +msgid "Time to take a coffee?" +msgstr "" + +#: templates/base.html:128 +msgid "Time to take another coffee?" +msgstr "" + #: templates/sheet_ope.html:4 msgid "Export as:" msgstr "" @@ -2033,12 +2060,12 @@ msgstr "" msgid "Export as PDF file" msgstr "" -#: templates/ishtar/blocks/window_tables/documents.html:8 +#: templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "" -#: templates/ishtar/blocks/window_tables/documents.html:9 -#: templates/ishtar/blocks/window_tables/documents.html:17 +#: templates/ishtar/blocks/window_tables/documents.html:11 +#: templates/ishtar/blocks/window_tables/documents.html:19 msgid "Link" msgstr "" @@ -2066,61 +2093,56 @@ msgstr "" msgid "Right-click on this image to save it." msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:39 +#: templates/ishtar/dashboards/dashboard_main_detail.html:41 msgid "By years" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:41 -#: templates/ishtar/dashboards/dashboard_main_detail.html:51 +#: templates/ishtar/dashboards/dashboard_main_detail.html:43 +#: templates/ishtar/dashboards/dashboard_main_detail.html:53 msgid "Average:" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:42 -#: templates/ishtar/dashboards/dashboard_main_detail.html:52 +#: templates/ishtar/dashboards/dashboard_main_detail.html:44 +#: templates/ishtar/dashboards/dashboard_main_detail.html:54 msgid "Variance:" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:43 -#: templates/ishtar/dashboards/dashboard_main_detail.html:53 +#: templates/ishtar/dashboards/dashboard_main_detail.html:45 +#: templates/ishtar/dashboards/dashboard_main_detail.html:55 msgid "Standard deviation:" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:44 -#: templates/ishtar/dashboards/dashboard_main_detail.html:54 +#: templates/ishtar/dashboards/dashboard_main_detail.html:46 +#: templates/ishtar/dashboards/dashboard_main_detail.html:56 msgid "Median:" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:45 -#: templates/ishtar/dashboards/dashboard_main_detail.html:55 +#: templates/ishtar/dashboards/dashboard_main_detail.html:47 +#: templates/ishtar/dashboards/dashboard_main_detail.html:57 msgid "Mode:" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:49 +#: templates/ishtar/dashboards/dashboard_main_detail.html:51 msgid "By operations" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:58 +#: templates/ishtar/dashboards/dashboard_main_detail.html:61 msgid "Created last" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:65 -#: templates/ishtar/dashboards/dashboard_main_detail.html:76 -msgid "Show" -msgstr "" - -#: templates/ishtar/dashboards/dashboard_main_detail.html:69 +#: templates/ishtar/dashboards/dashboard_main_detail.html:74 msgid "Recent changes" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:72 +#: templates/ishtar/dashboards/dashboard_main_detail.html:76 msgid "Modified" msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:108 +#: templates/ishtar/dashboards/dashboard_main_detail.html:114 msgid "No data for these criteria." msgstr "" -#: templates/ishtar/dashboards/dashboard_main_detail.html:126 +#: templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Month" msgstr "" diff --git a/ishtar_common/migrations/0007_auto__add_field_ishtarsiteprofile_person_raw_name.py b/ishtar_common/migrations/0007_auto__add_field_ishtarsiteprofile_person_raw_name.py new file mode 100644 index 000000000..06e380189 --- /dev/null +++ b/ishtar_common/migrations/0007_auto__add_field_ishtarsiteprofile_person_raw_name.py @@ -0,0 +1,411 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'IshtarSiteProfile.person_raw_name' + db.add_column('ishtar_common_ishtarsiteprofile', 'person_raw_name', + self.gf('django.db.models.fields.TextField')(default='{name|upper} {surname}'), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'IshtarSiteProfile.person_raw_name' + db.delete_column('ishtar_common_ishtarsiteprofile', 'person_raw_name') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}) + }, + 'ishtar_common.author': { + 'Meta': {'object_name': 'Author'}, + 'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + 'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}) + }, + 'ishtar_common.department': { + 'Meta': {'ordering': "['number']", 'object_name': 'Department'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.documenttemplate': { + 'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'}, + 'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) + }, + 'ishtar_common.format': { + 'Meta': {'object_name': 'Format'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.formatertype': { + 'Meta': {'ordering': "('formater_type', 'options')", 'unique_together': "(('formater_type', 'options', 'many_split'),)", 'object_name': 'FormaterType'}, + 'formater_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'many_split': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'options': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.globalvar': { + 'Meta': {'ordering': "['slug']", 'object_name': 'GlobalVar'}, + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.historicalorganization': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalOrganization'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'exclude_from_merge': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'organization_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.import': { + 'Meta': {'object_name': 'Import'}, + 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}), + 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}), + 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"}) + }, + 'ishtar_common.importercolumn': { + 'Meta': {'ordering': "('importer_type', 'col_number')", 'unique_together': "(('importer_type', 'col_number'),)", 'object_name': 'ImporterColumn'}, + 'col_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'columns'", 'to': "orm['ishtar_common.ImporterType']"}), + 'regexp_pre_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'ishtar_common.importerdefault': { + 'Meta': {'object_name': 'ImporterDefault'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'defaults'", 'to': "orm['ishtar_common.ImporterType']"}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerdefaultvalues': { + 'Meta': {'object_name': 'ImporterDefaultValues'}, + 'default_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'default_values'", 'to': "orm['ishtar_common.ImporterDefault']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerduplicatefield': { + 'Meta': {'object_name': 'ImporterDuplicateField'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'duplicate_fields'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'field_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.importtarget': { + 'Meta': {'object_name': 'ImportTarget'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'targets'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'formater_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.FormaterType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'regexp_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.ishtarsiteprofile': { + 'Meta': {'ordering': "['label']", 'object_name': 'IshtarSiteProfile'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'base_find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{context_record__external_id}-{label}'"}), + 'context_record': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'context_record_external_id': ('django.db.models.fields.TextField', [], {'default': "'{parcel__external_id}-{label}'"}), + 'currency': ('django.db.models.fields.CharField', [], {'default': "u'\\u20ac'", 'max_length': "'5'"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file_external_id': ('django.db.models.fields.TextField', [], {'default': "'{settings__ISHTAR_LOCAL_PREFIX}{year}-{numeric_reference}'"}), + 'files': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'find': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{get_first_base_find__context_record__external_id}-{label}'"}), + 'homepage': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'parcel_external_id': ('django.db.models.fields.TextField', [], {'default': "'{associated_file__external_id}{operation__code_patriarche}-{town__numero_insee}-{section}{parcel_number}'"}), + 'person_raw_name': ('django.db.models.fields.TextField', [], {'default': "'{name|upper} {surname}'"}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'warehouse': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'ishtar_common.ishtaruser': { + 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']}, + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}), + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'ishtar_common.itemkey': { + 'Meta': {'object_name': 'ItemKey'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}) + }, + 'ishtar_common.operationtype': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.organization': { + 'Meta': {'object_name': 'Organization'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'exclude_from_merge': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'exclude_from_merge': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.regexp': { + 'Meta': {'object_name': 'Regexp'}, + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'regexp': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.state': { + 'Meta': {'ordering': "['number']", 'object_name': 'State'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}) + }, + 'ishtar_common.supporttype': { + 'Meta': {'object_name': 'SupportType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.targetkey': { + 'Meta': {'unique_together': "(('target', 'key', 'associated_user', 'associated_import'),)", 'object_name': 'TargetKey'}, + 'associated_import': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'associated_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_set': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'key': ('django.db.models.fields.TextField', [], {}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'keys'", 'to': "orm['ishtar_common.ImportTarget']"}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + 'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}), + 'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}), + 'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['ishtar_common']
\ No newline at end of file diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 51cb16157..6228ea1d0 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -850,6 +850,13 @@ class LightHistorizedItem(BaseHistorizedItem): PARSE_FORMULA = re.compile("{([^}]*)}") +FORMULA_FILTERS = { + 'upper': lambda x: x.upper(), + 'lower': lambda x: x.lower(), + 'capitalize': lambda x: x.capitalize(), + 'slug': lambda x: slugify(x) +} + def get_external_id(key, item): profile = get_current_profile() @@ -858,6 +865,13 @@ def get_external_id(key, item): formula = getattr(profile, key) dct = {} for fkey in PARSE_FORMULA.findall(formula): + filtered = fkey.split(u'|') + initial_key = fkey[:] + fkey = filtered[0] + filters = [] + for filtr in filtered[1:]: + if filtr in FORMULA_FILTERS: + filters.append(FORMULA_FILTERS[filtr]) if fkey.startswith('settings__'): dct[fkey] = getattr(settings, fkey[len('settings__'):]) or '' continue @@ -872,9 +886,11 @@ def get_external_id(key, item): if obj is None: break if obj is None: - dct[fkey] = '' + dct[initial_key] = '' else: - dct[fkey] = obj + dct[initial_key] = unicode(obj) + for filtr in filters: + dct[initial_key] = filtr(dct[initial_key]) return formula.format(**dct) CURRENCY = ((u"€", _(u"Euro")), @@ -934,6 +950,13 @@ class IshtarSiteProfile(models.Model, Cached): u"Change this with care. With incorrect formula, the " u"application might be unusable and import of external " u"data can be destructive.")) + person_raw_name = models.TextField( + _(u"Raw name for person"), + default="{name|upper} {surname}", + help_text=_(u"Formula to manage person raw_name. " + u"Change this with care. With incorrect formula, the " + u"application might be unusable and import of external " + u"data can be destructive.")) active = models.BooleanField(_(u"Current active"), default=False) currency = models.CharField(_(u"Currency"), default=u"€", choices=CURRENCY, max_length='5') @@ -2364,6 +2387,11 @@ class Person(Address, Merge, OwnPerms, ValueGetter): def save(self, *args, **kwargs): super(Person, self).save(*args, **kwargs) + if not self.raw_name: + self.raw_name = get_external_id( + 'person_raw_name', self) + if self.raw_name: + self.save() if hasattr(self, 'responsible_town_planning_service'): for fle in self.responsible_town_planning_service.all(): fle.save() # force update of raw_town_planning_service diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index f469fc546..4d82cb238 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -108,6 +108,28 @@ $(document).on("click", '#progress-content', function(){ $('#progress').hide(); }); +function long_wait(){ + $('#progress').addClass('long'); + $('#progress').show(); + $('.progress-1').show('slow'); + setTimeout(function(){ + $('.progress-1').hide('slow'); + $('.progress-2').show('slow'); + }, 60000); + setTimeout(function(){ + $('.progress-2').hide('slow'); + $('.progress-3').show('slow'); + }, 120000); + setTimeout(function(){ + $('.progress-3').hide('slow'); + $('.progress-4').show('slow'); + }, 180000); + setTimeout(function(){ + $('.progress-4').hide('slow'); + long_wait(); + }, 240000); +} + var last_window; function load_window(url, speed, on_success){ diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 69f86784b..02f4d930b 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -710,7 +710,7 @@ ul.form .help_text{ } .autocomplete{ - width:300px; + width:350px; } .delete td{ @@ -843,7 +843,7 @@ a.photo{ .dashboard > div{ background: #FFF; text-align:left; - padding-bottom:10px; + padding:10px; border:1px solid #CCC; border-top-left-radius: 0; border-top-right-radius: 0; @@ -854,16 +854,12 @@ a.photo{ width:762px; background-color:#922; color:#FFF; - padding:0; + padding:10px; border-bottom-left-radius: 0; border-bottom-right-radius: 0; } -.dashboard h4{ - font-weight:normal; - color:#D14; -} -.dashboard h4, .dashboard p{ +.dashboard p{ margin:0; padding:0 10px; } @@ -946,10 +942,6 @@ a.photo{ border:1px solid #f1f2f6; } -#window table td.string, .dashboard table.resume td.string{ - text-align:left; -} - #window table td.ref, .dashboard table.resume td.ref{ text-align:left; white-space:nowrap; @@ -1037,17 +1029,24 @@ table td.item-list span{ border-top-right-radius: 8px; } +.dashboard label, #window label{ display:inline-table; font-weight:bold; width:245px; } +.dashboard span.value, #window span.value{ display:inline-table; width:465px; } +.dashboard span.value.numeric{ + text-align: right; + width:80px; +} + #window ul.form-flex span.value { display: inline-table; width: 230px; @@ -1200,6 +1199,27 @@ input.widget-oa{ padding:10px; } +#progress.long #progress-content{ + background-position:center 20px; + width:130px; + height: auto; + padding-top: 60px; +} + +#progress-content p{ + display: none; + padding: 0; + margin: 0; +} + +#progress.long #progress-content p{ + display: block; +} + +#progress.long #progress-content p.progress-detail{ + display: none; +} + #merge-table{ background-color:#fff; width:700px; @@ -1255,3 +1275,62 @@ table.table-form td { table.table-form td input{ border-color:#922; } + +.clean-table { + margin: 10px 0 10px 0; + width: 100%; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); +} + +.clean-table h4{ + color: #922; + font-size: 1.2em; + padding:0.3em; + margin:0; + text-align: center; +} + +.clean-table-wrap{ + overflow: auto; +} + +.clean-table table{ + width: 100%; + border-collapse: collapse; + margin-left: auto; + margin-right: auto; +} + +.clean-table tr { + padding: 8px 0; + background: #f6f6f6; +} + +.clean-table tr:nth-of-type(odd) { + background: #e9e9e9; +} + +.clean-table tr th { + font-weight: 900; + color: #ffffff; + background: #DA2D2D; + text-align: center; + padding: 0.2em 0.4em; +} + +.clean-table tr th.sub { + background: #E65C5C; +} + +.clean-table td{ + text-align: right; + padding: 6px 12px; + box-shadow: 1px 0px 0px 0px rgba(90, 90, 90, 0.2); +} + +.mini-table{ + height: 400px; + overflow: auto; + display: block; +} + diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 1a7c8fa54..b601076fe 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -122,6 +122,10 @@ </div> <div id="progress"> <div id='progress-content'> + <p class='progress-detail progress-1'>{% trans "Processing..." %}</p> + <p class='progress-detail progress-2'>{% trans "This can be long." %}</p> + <p class='progress-detail progress-3'>{% trans "Time to take a coffee?" %} <i class="fa fa-coffee" aria-hidden="true"></i></p> + <p class='progress-detail progress-4'>{% trans "Time to take another coffee?" %} <i class="fa fa-coffee" aria-hidden="true"></i></p></div> </div> </div> </body> diff --git a/ishtar_common/templates/blocks/JQueryAutocomplete.js b/ishtar_common/templates/blocks/JQueryAutocomplete.js index 16ffef3a0..53a5e18ae 100644 --- a/ishtar_common/templates/blocks/JQueryAutocomplete.js +++ b/ishtar_common/templates/blocks/JQueryAutocomplete.js @@ -37,4 +37,10 @@ $(function() { }); $('#{{item_id}}').change(); {% endfor %}{% endif %} + + $('#id_{{field_id}}').change(function(){ + $("#id_select_{{field_id}}").attr('title', $('#id_select_{{field_id}}').val()); + }); + + $('#id_{{field_id}}').change(); }); diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/documents.html index f1592cc42..6d5c1f704 100644 --- a/ishtar_common/templates/ishtar/blocks/window_tables/documents.html +++ b/ishtar_common/templates/ishtar/blocks/window_tables/documents.html @@ -1,6 +1,8 @@ {% load i18n %} -<table class='simple'> - <caption>{{caption}}</caption> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <tr> <th>{% trans "Title" %}</th> <th>{% trans "Type" %}</th> @@ -18,4 +20,4 @@ </tr> {% endfor %} </table> - +</div></div> diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html index d6686b553..e378bdf49 100644 --- a/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html +++ b/ishtar_common/templates/ishtar/blocks/window_tables/static_documents.html @@ -1,6 +1,8 @@ {% load i18n %} - -<table class='simple'> +<h4>{{caption}}</h4> +<div class='clean-table'> +<div class='clean-table-wrap'> +<table> <caption>{{caption}}</caption> <tr>{% for col in col_names %} <th>{% trans col %}</th>{% endfor %} @@ -9,3 +11,4 @@ <td>{{value}}</td>{%endfor%} </tr>{% endfor %} </table> +</div></div> diff --git a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html index 7247a5cda..fd92578a2 100644 --- a/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html +++ b/ishtar_common/templates/ishtar/dashboards/dashboard_main_detail.html @@ -1,4 +1,4 @@ -{% load i18n date_formating %} +{% load i18n date_formating humanize %} {% load url from future %} <div class='dashboard' id="{{unique_id}}-tab"> <div> @@ -13,7 +13,7 @@ </form> </div> {% endif %} - <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number}}</p> + <p><strong>{% trans "Total:" %}</strong> {{dashboard.total_number|intcomma}}</p> <div class='table'> <div id="chart_{{unique_id}}" style="height:400px; width:700px;"></div> <p class='info-box'><i class="fa fa-info-circle" aria-hidden="true"></i> {% trans 'Draw rectangle on the graph to zoom. Double-click to reinitialize.' %}</p> @@ -25,8 +25,9 @@ </div> </div> </div> - <div class='table'> - <table class='resume'> + <div class='clean-table'> + <div class='clean-table-wrap'> + <table> {% for idx, lbl, values in dashboard.values %} <tr class='idx {% if forloop.counter0|divisibleby:"2" %}even{%else%}odd{%endif%}'> <th>{{lbl}}</th> @@ -35,6 +36,7 @@ {% endfor%} </table> </div> + </div> {% if dashboard.periods %} <h4>{% trans "By years" %}</h4> <ul> @@ -55,25 +57,29 @@ <li><strong>{% trans "Mode:" %}</strong> {{dashboard.operation_mode}}</li> </ul> {% endif %} + <div class='clean-table'> <h4>{% trans "Created last" %}</h4> - <div class='table'> - <table class='resume'> + <table> <tr><th>{{lbl}}</th><th>{% trans "Created" %}</th><th></th></tr> {% for item in dashboard.lasts %}<tr> <td class='ref'>{{item}}</td> <td>{{item.history_date}}</td> - <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>{%trans "Show"%}</a>{%endif%}</td> + <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'> + <i class="fa fa-info-circle" aria-hidden="true"></i> + </a>{%endif%}</td> </tr>{% endfor %} </table> </div> + <div class='clean-table'> <h4>{% trans "Recent changes" %}</h4> - <div class='table'> - <table class='resume'> + <table> <tr><th>{{lbl}}</th><th>{% trans "Modified" %}</th><th></th></tr> {% for item in dashboard.recents %}<tr> <td class='ref'>{{item}}</td> <td>{{item.history_date}}</td> - <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'>{%trans "Show"%}</a>{%endif%}</td> + <td>{% if item.get_show_url %}<a href="#" onclick='load_window("{{item.get_show_url}}")'> + <i class="fa fa-info-circle" aria-hidden="true"></i> + </a>{%endif%}</td> </tr>{% endfor %} </table> </div> diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index f5734cf98..55a4ea883 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -55,7 +55,7 @@ </tr> {% endfor %} </table> - <input type="submit" value="{% trans "Validate" %}"/> + <input type="submit" onclick="long_wait();return true;" value="{% trans "Validate" %}" /> </form> {% endif %} </div> diff --git a/ishtar_common/templatetags/date_formating.py b/ishtar_common/templatetags/date_formating.py index eb81cf52c..9d4cf74cc 100644 --- a/ishtar_common/templatetags/date_formating.py +++ b/ishtar_common/templatetags/date_formating.py @@ -8,12 +8,12 @@ from django.utils.translation import ugettext as _ register = Library() + @register.filter def date_formating(value): try: d = datetime.strptime(unicode(value), '%Y-%m-%d') - return _(d.strftime("%B")).capitalize() + u" %d" % d.year + return _(d.strftime("%b")).capitalize() + u" %d" % d.year except ValueError: # could be passed to non date value: on error return value return value - diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 5add2e2cf..a4d354eb1 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -314,3 +314,13 @@ class IshtarSiteProfileTest(TestCase): profile.save() response = c.get(reverse('start')) self.assertTrue("section-file_management" in response.content) + + def testExternalKey(self): + profile = models.get_current_profile() + p = models.Person.objects.create(name='plouf', surname=u'Tégada') + self.assertEqual(p.raw_name, u"PLOUF Tégada") + profile.person_raw_name = u'{surname|slug} {name}' + profile.save() + p.raw_name = '' + p.save() + self.assertEqual(p.raw_name, u"tegada plouf") diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 25ae6ddf5..28b1affa5 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -24,7 +24,8 @@ from django.template.defaultfilters import slugify def get_cache(cls, extra_args=[]): - cache_key = u"{}-{}".format(settings.PROJECT_SLUG, cls.__name__) + cache_key = u"{}-{}-{}".format( + settings.PROJECT_SLUG, cls._meta.app_label, cls.__name__) for arg in extra_args: if not arg: cache_key += '-0' diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po new file mode 100644 index 000000000..32f5c3109 --- /dev/null +++ b/translations/de/ishtar_common.po @@ -0,0 +1,2386 @@ +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2016-06-21 01:16-0400\n" +"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" +"Language-Team: German (Germany)\n" +"Language: de-DE\n" +"X-Generator: Zanata 3.9.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#: __init__.py:8 +msgid "username" +msgstr "Benutzername" + +#: __init__.py:9 +msgid "email address" +msgstr "" + +#: __init__.py:10 +msgid "Related item" +msgstr "" + +#: context_processors.py:38 +msgid "Archaeological file" +msgstr "" + +#: context_processors.py:39 models.py:1457 +msgid "Operation" +msgstr "" + +#: context_processors.py:41 +msgid "Context record" +msgstr "" + +#: context_processors.py:43 +msgid "Find" +msgstr "" + +#: data_importer.py:182 +#, python-format +msgid "\"%(value)s\" is too long. The max length is %(length)d characters." +msgstr "" + +#: data_importer.py:199 +#, python-format +msgid "\"%(value)s\" not equal to yes or no" +msgstr "" + +#: data_importer.py:211 +#, python-format +msgid "\"%(value)s\" is not a float" +msgstr "" + +#: data_importer.py:224 data_importer.py:238 data_importer.py:482 +#, python-format +msgid "\"%(value)s\" is not a valid date" +msgstr "" + +#: data_importer.py:251 +#, python-format +msgid "\"%(value)s\" is not an integer" +msgstr "" + +#: data_importer.py:302 data_importer.py:545 +#, python-format +msgid "Choice for \"%s\" is not available. Which one is relevant?\n" +msgstr "" + +#: data_importer.py:309 +#, python-format +msgid "%d. None of the above - create new" +msgstr "" + +#: data_importer.py:312 +#, python-format +msgid "%d. None of the above - skip" +msgstr "" + +#: data_importer.py:508 +#, python-format +msgid "\"%(value)s\" is not a valid path for the given archive" +msgstr "" + +#: data_importer.py:620 +msgid "" +"The given file is not correct. Check the file format. If you use a CSV file: " +"check that column separator and encoding are similar to the ones used by the " +"reference file." +msgstr "" + +#: data_importer.py:624 +#, python-format +msgid "Too many cols (%(user_col)d) when maximum is %(ref_col)d" +msgstr "" + +#: data_importer.py:626 +msgid "No data provided" +msgstr "" + +#: data_importer.py:627 +msgid "Value is required" +msgstr "" + +#: data_importer.py:628 +#, python-format +msgid "At least %d columns must be filled" +msgstr "" + +#: data_importer.py:629 +msgid "The regexp doesn't match." +msgstr "" + +#: data_importer.py:1037 +msgid "Not imported" +msgstr "" + +#: data_importer.py:1441 +msgid "line" +msgstr "" + +#: data_importer.py:1441 +msgid "col" +msgstr "" + +#: data_importer.py:1441 +msgid "error" +msgstr "" + +#: data_importer.py:1447 +msgid "field" +msgstr "" + +#: data_importer.py:1447 +msgid "source" +msgstr "" + +#: data_importer.py:1447 +msgid "result" +msgstr "" + +#: data_importer.py:1463 +#, python-format +msgid "\"%(value)s\" not in %(values)s" +msgstr "" + +#: forms.py:55 +msgid "Enter a valid name consisting of letters, spaces and hyphens." +msgstr "" + +#: forms.py:71 forms_common.py:490 +msgid "Confirm" +msgstr "" + +#: forms.py:76 +msgid "Are you sure you want to delete?" +msgstr "" + +#: forms.py:85 +msgid "There are identical items." +msgstr "" + +#: forms.py:123 forms.py:124 +msgid "Closing date" +msgstr "" + +#: forms.py:137 +msgid "You should select an item." +msgstr "" + +#: forms.py:138 +msgid "Add a new item" +msgstr "" + +#: forms.py:204 models.py:1234 +msgid "Template" +msgstr "" + +#: forms_common.py:39 forms_common.py:57 forms_common.py:170 +#: forms_common.py:293 models.py:1300 models.py:2583 +#: templates/blocks/JQueryAdvancedTown.html:19 +#: templates/ishtar/sheet_organization.html:13 +msgid "Town" +msgstr "" + +#: forms_common.py:41 +msgid "" +"<p>Type name, department code and/or postal code of the town you would like " +"to select. The search is insensitive to case.</p>\n" +"<p>Only the first twenty results are displayed but specifying the department " +"code is generally sufficient to get the appropriate result.</p>\n" +"<p class='example'>For instance type \"saint denis 93\" for getting the " +"french town Saint-Denis in the Seine-Saint-Denis department.</p>" +msgstr "" + +#: forms_common.py:66 forms_common.py:718 ishtar_menu.py:47 models.py:1455 +#: models.py:2255 models.py:2407 models.py:2464 +#: templates/ishtar/sheet_person.html:4 +msgid "Person" +msgstr "" + +#: forms_common.py:158 forms_common.py:234 forms_common.py:336 +#: ishtar_menu.py:71 models.py:1456 models.py:2172 +#: templates/ishtar/sheet_organization.html:4 +msgid "Organization" +msgstr "" + +#: forms_common.py:161 forms_common.py:197 forms_common.py:229 +#: forms_common.py:263 forms_common.py:331 models.py:902 models.py:1233 +#: models.py:1501 models.py:1719 models.py:2166 models.py:2242 models.py:2569 +#: templates/ishtar/sheet_organization.html:8 +#: templates/ishtar/sheet_organization.html:21 +msgid "Name" +msgstr "" + +#: forms_common.py:162 models.py:1442 models.py:1850 +msgid "Organization type" +msgstr "" + +#: forms_common.py:164 forms_common.py:287 models.py:1295 +#: templates/ishtar/sheet_organization.html:10 +msgid "Address" +msgstr "" + +#: forms_common.py:166 forms_common.py:290 models.py:1296 +#: templates/ishtar/sheet_organization.html:11 +msgid "Address complement" +msgstr "" + +#: forms_common.py:168 forms_common.py:291 models.py:1298 +#: templates/ishtar/sheet_organization.html:12 +msgid "Postal code" +msgstr "" + +#: forms_common.py:171 forms_common.py:294 models.py:1301 +msgid "Country" +msgstr "" + +#: forms_common.py:173 forms_common.py:231 forms_common.py:267 +#: forms_common.py:333 forms_common.py:446 models.py:1328 +msgid "Email" +msgstr "" + +#: forms_common.py:174 forms_common.py:270 models.py:1313 +#: templates/ishtar/sheet_organization.html:14 +#: templates/ishtar/sheet_person.html:18 +#: templates/ishtar/wizard/wizard_person.html:17 +msgid "Phone" +msgstr "" + +#: forms_common.py:175 forms_common.py:279 models.py:1325 +#: templates/ishtar/sheet_organization.html:15 +#: templates/ishtar/sheet_person.html:36 +#: templates/ishtar/wizard/wizard_person.html:35 +msgid "Mobile phone" +msgstr "" + +#: forms_common.py:198 forms_common.py:232 forms_common.py:334 models.py:1877 +#: models.py:2168 models.py:2505 templates/sheet_ope.html:85 +#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 +#: templates/ishtar/import_list.html:13 +#: templates/ishtar/sheet_organization.html:23 +#: templates/ishtar/blocks/window_tables/documents.html:8 +msgid "Type" +msgstr "" + +#: forms_common.py:207 views.py:130 +msgid "Organization search" +msgstr "" + +#: forms_common.py:230 forms_common.py:261 forms_common.py:332 models.py:2240 +#: templates/ishtar/sheet_organization.html:22 +msgid "Surname" +msgstr "" + +#: forms_common.py:246 forms_common.py:319 views.py:95 +msgid "Person search" +msgstr "" + +#: forms_common.py:258 templates/ishtar/sheet_person.html:7 +#: templates/ishtar/wizard/wizard_person.html:6 +msgid "Identity" +msgstr "" + +#: forms_common.py:260 forms_common.py:644 forms_common.py:685 models.py:2238 +#: models.py:2502 templates/sheet_ope.html:104 +#: templates/ishtar/blocks/window_tables/documents.html:7 +msgid "Title" +msgstr "" + +#: forms_common.py:265 models.py:2244 +msgid "Raw name" +msgstr "" + +#: forms_common.py:268 models.py:1314 +msgid "Phone description" +msgstr "" + +#: forms_common.py:271 models.py:1316 models.py:1318 +msgid "Phone description 2" +msgstr "" + +#: forms_common.py:273 +msgid "Phone 2" +msgstr "" + +#: forms_common.py:275 models.py:1322 +msgid "Phone description 3" +msgstr "" + +#: forms_common.py:277 models.py:1320 +msgid "Phone 3" +msgstr "" + +#: forms_common.py:282 +msgid "Current organization" +msgstr "" + +#: forms_common.py:296 models.py:1303 +msgid "Other address: address" +msgstr "" + +#: forms_common.py:299 models.py:1306 +msgid "Other address: address complement" +msgstr "" + +#: forms_common.py:301 models.py:1307 +msgid "Other address: postal code" +msgstr "" + +#: forms_common.py:303 models.py:1309 +msgid "Other address: town" +msgstr "" + +#: forms_common.py:305 models.py:1311 +msgid "Other address: country" +msgstr "" + +#: forms_common.py:315 +msgid "Already has an account" +msgstr "" + +#: forms_common.py:330 +msgid "Username" +msgstr "" + +#: forms_common.py:348 +msgid "Account search" +msgstr "" + +#: forms_common.py:395 forms_common.py:425 forms_common.py:429 models.py:2220 +msgid "Person type" +msgstr "" + +#: forms_common.py:440 forms_common.py:445 ishtar_menu.py:32 +msgid "Account" +msgstr "" + +#: forms_common.py:449 wizards.py:1170 +msgid "New password" +msgstr "" + +#: forms_common.py:452 +msgid "New password (confirmation)" +msgstr "" + +#: forms_common.py:471 +msgid "Your password and confirmation password do not match." +msgstr "" + +#: forms_common.py:476 +msgid "You must provide a correct password." +msgstr "" + +#: forms_common.py:484 +msgid "This username already exists." +msgstr "" + +#: forms_common.py:491 +msgid "Send the new password by email?" +msgstr "" + +#: forms_common.py:500 forms_common.py:513 models.py:2584 +msgid "Towns" +msgstr "" + +#: forms_common.py:510 +msgid "There are identical towns." +msgstr "" + +#: forms_common.py:594 +msgid "Only one choice can be checked." +msgstr "" + +#: forms_common.py:642 +msgid "Documentation informations" +msgstr "" + +#: forms_common.py:646 forms_common.py:686 models.py:1851 models.py:2485 +msgid "Source type" +msgstr "" + +#: forms_common.py:648 forms_common.py:687 templates/sheet_ope.html:84 +msgid "Reference" +msgstr "" + +#: forms_common.py:651 forms_common.py:688 +msgid "Internal reference" +msgstr "" + +#: forms_common.py:654 models.py:2516 +msgid "Numerical ressource (web address)" +msgstr "" + +#: forms_common.py:655 models.py:2518 +msgid "Receipt date" +msgstr "" + +#: forms_common.py:657 models.py:2004 models.py:2520 +msgid "Creation date" +msgstr "" + +#: forms_common.py:660 models.py:2523 +msgid "Receipt date in documentation" +msgstr "" + +#: forms_common.py:662 forms_common.py:690 models.py:287 models.py:516 +#: models.py:1746 models.py:2248 models.py:2530 +msgid "Comment" +msgstr "" + +#: forms_common.py:664 forms_common.py:689 models.py:904 models.py:1505 +#: models.py:1678 models.py:1720 models.py:2529 templates/sheet_ope.html:128 +msgid "Description" +msgstr "" + +#: forms_common.py:667 models.py:2531 +msgid "Additional information" +msgstr "" + +#: forms_common.py:669 forms_common.py:693 models.py:2533 +msgid "Has a duplicate" +msgstr "" + +#: forms_common.py:682 forms_common.py:711 forms_common.py:744 models.py:2469 +#: templates/ishtar/wizard/wizard_person_deletion.html:124 +msgid "Author" +msgstr "" + +#: forms_common.py:692 +msgid "Additional informations" +msgstr "" + +#: forms_common.py:703 +msgid "Would you like to delete this documentation?" +msgstr "" + +#: forms_common.py:719 models.py:1852 models.py:2459 models.py:2466 +msgid "Author type" +msgstr "" + +#: forms_common.py:737 +msgid "Author selection" +msgstr "" + +#: forms_common.py:751 +msgid "There are identical authors." +msgstr "" + +#: forms_common.py:755 models.py:2470 models.py:2512 +#: templates/sheet_ope.html:106 +#: templates/ishtar/blocks/window_tables/documents.html:9 +msgid "Authors" +msgstr "" + +#: ishtar_menu.py:29 +msgid "Administration" +msgstr "" + +#: ishtar_menu.py:33 +msgid "Add/modify" +msgstr "" + +#: ishtar_menu.py:36 +msgid "Deletion" +msgstr "" + +#: ishtar_menu.py:39 models.py:1029 views.py:1232 +msgid "Global variables" +msgstr "" + +#: ishtar_menu.py:44 +msgid "Directory" +msgstr "" + +#: ishtar_menu.py:50 ishtar_menu.py:74 templates/blocks/JQueryJqGrid.html:3 +msgid "Search" +msgstr "" + +#: ishtar_menu.py:54 ishtar_menu.py:79 templates/ishtar/import_list.html:15 +msgid "Creation" +msgstr "" + +#: ishtar_menu.py:58 ishtar_menu.py:84 +msgid "Modification" +msgstr "" + +#: ishtar_menu.py:62 ishtar_menu.py:89 templates/ishtar/merge.html:5 +msgid "Merge" +msgstr "" + +#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2041 widgets.py:110 +#: templates/ishtar/form_delete.html:11 +msgid "Delete" +msgstr "" + +#: ishtar_menu.py:101 models.py:2015 +msgid "Imports" +msgstr "" + +#: ishtar_menu.py:104 views.py:1240 +msgid "New import" +msgstr "" + +#: ishtar_menu.py:108 views.py:1254 +msgid "Current imports" +msgstr "" + +#: ishtar_menu.py:112 +msgid "Old imports" +msgstr "" + +#: models.py:178 +msgid "Not a valid item." +msgstr "" + +#: models.py:191 +msgid "A selected item is not a valid item." +msgstr "" + +#: models.py:202 +msgid "This item already exists." +msgstr "" + +#: models.py:283 models.py:515 models.py:1268 models.py:1280 +msgid "Label" +msgstr "" + +#: models.py:285 +msgid "Textual ID" +msgstr "" + +#: models.py:288 models.py:518 models.py:1237 +msgid "Available" +msgstr "" + +#: models.py:537 models.py:1792 +msgid "Key" +msgstr "" + +#: models.py:543 +msgid "Specific key to an import" +msgstr "" + +#: models.py:623 +msgid "Last editor" +msgstr "" + +#: models.py:626 +msgid "Creator" +msgstr "" + +#: models.py:766 models.py:2595 +msgid "Order" +msgstr "" + +#: models.py:767 +msgid "Symmetrical" +msgstr "" + +#: models.py:768 +msgid "Tiny label" +msgstr "" + +#: models.py:782 +msgid "Cannot have symmetrical and an inverse_relation" +msgstr "" + +#: models.py:896 +msgid "Euro" +msgstr "" + +#: models.py:897 +msgid "US dollar" +msgstr "" + +#: models.py:903 models.py:1503 +msgid "Slug" +msgstr "" + +#: models.py:905 +msgid "Files module" +msgstr "" + +#: models.py:906 +msgid "Context records module" +msgstr "" + +#: models.py:908 +msgid "Finds module" +msgstr "" + +#: models.py:909 +msgid "Need context records module" +msgstr "" + +#: models.py:911 +msgid "Warehouses module" +msgstr "" + +#: models.py:912 +msgid "Need finds module" +msgstr "" + +#: models.py:914 +msgid "Home page" +msgstr "" + +#: models.py:915 +msgid "" +"Homepage of Ishtar - if not defined a default homepage will appear. Use the " +"markdown syntax." +msgstr "" + +#: models.py:918 +msgid "File external id" +msgstr "" + +#: models.py:920 +msgid "" +"Formula to manage file external ID. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:925 +msgid "Parcel external id" +msgstr "" + +#: models.py:928 +msgid "" +"Formula to manage parcel external ID. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:933 +msgid "Context record external id" +msgstr "" + +#: models.py:935 +msgid "" +"Formula to manage context record external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:940 +msgid "Base find external id" +msgstr "" + +#: models.py:942 +msgid "" +"Formula to manage base find external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:947 +msgid "Find external id" +msgstr "" + +#: models.py:949 +msgid "" +"Formula to manage find external ID. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:954 +msgid "Raw name for person" +msgstr "" + +#: models.py:956 +msgid "" +"Formula to manage person raw_name. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" + +#: models.py:960 +msgid "Current active" +msgstr "" + +#: models.py:961 +msgid "Currency" +msgstr "" + +#: models.py:965 +msgid "Ishtar site profile" +msgstr "" + +#: models.py:966 +msgid "Ishtar site profiles" +msgstr "" + +#: models.py:1022 +msgid "Variable name" +msgstr "" + +#: models.py:1023 +msgid "Description of the variable" +msgstr "" + +#: models.py:1025 models.py:1793 +msgid "Value" +msgstr "" + +#: models.py:1028 +msgid "Global variable" +msgstr "" + +#: models.py:1138 models.py:1168 +msgid "Total" +msgstr "" + +#: models.py:1145 models.py:1269 models.py:1281 +#: templates/ishtar/sheet_person.html:21 +#: templates/ishtar/dashboards/dashboard_main_detail.html:141 +#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 +#: templates/ishtar/wizard/wizard_person.html:20 +msgid "Number" +msgstr "" + +#: models.py:1232 +msgid "Administrative Act" +msgstr "" + +#: models.py:1236 +msgid "Associated object" +msgstr "" + +#: models.py:1240 +msgid "Document template" +msgstr "" + +#: models.py:1241 +msgid "Document templates" +msgstr "" + +#: models.py:1272 models.py:1282 models.py:1999 +msgid "State" +msgstr "" + +#: models.py:1286 templates/blocks/JQueryAdvancedTown.html:12 +msgid "Department" +msgstr "" + +#: models.py:1287 +msgid "Departments" +msgstr "" + +#: models.py:1324 +msgid "Raw phone" +msgstr "" + +#: models.py:1330 +msgid "Alternative address is prefered" +msgstr "" + +#: models.py:1369 +msgid "Tel: " +msgstr "" + +#: models.py:1373 +msgid "Mobile: " +msgstr "" + +#: models.py:1377 +msgid "Email: " +msgstr "" + +#: models.py:1382 +msgid "Merge key" +msgstr "" + +#: models.py:1443 +msgid "Organization types" +msgstr "" + +#: models.py:1459 +msgid "Archaeological site" +msgstr "" + +#: models.py:1460 +msgid "Parcels" +msgstr "" + +#: models.py:1462 +msgid "Operation source" +msgstr "" + +#: models.py:1465 views.py:1057 views.py:1108 +msgid "Archaeological files" +msgstr "" + +#: models.py:1467 views.py:1060 views.py:1116 +msgid "Context records" +msgstr "" + +#: models.py:1469 +msgid "Context record relations" +msgstr "" + +#: models.py:1471 views.py:1062 views.py:1119 +msgid "Finds" +msgstr "" + +#: models.py:1507 templates/ishtar/dashboards/dashboard_main.html:25 +msgid "Users" +msgstr "" + +#: models.py:1509 +msgid "Associated model" +msgstr "" + +#: models.py:1512 +msgid "Is template" +msgstr "" + +#: models.py:1513 +msgid "Unicity keys (separator \";\")" +msgstr "" + +#: models.py:1517 +msgid "Importer - Type" +msgstr "" + +#: models.py:1518 +msgid "Importer - Types" +msgstr "" + +#: models.py:1608 +msgid "Importer - Default" +msgstr "" + +#: models.py:1609 +msgid "Importer - Defaults" +msgstr "" + +#: models.py:1644 +msgid "Importer - Default value" +msgstr "" + +#: models.py:1645 +msgid "Importer - Default values" +msgstr "" + +#: models.py:1677 +msgid "Column number" +msgstr "" + +#: models.py:1680 +msgid "Required" +msgstr "" + +#: models.py:1683 +msgid "Importer - Column" +msgstr "" + +#: models.py:1684 +msgid "Importer - Columns" +msgstr "" + +#: models.py:1704 +msgid "Field name" +msgstr "" + +#: models.py:1706 models.py:1740 +msgid "Force creation of new items" +msgstr "" + +#: models.py:1708 models.py:1742 +msgid "Concatenate with existing" +msgstr "" + +#: models.py:1710 models.py:1744 +msgid "Concatenate character" +msgstr "" + +#: models.py:1714 +msgid "Importer - Duplicate field" +msgstr "" + +#: models.py:1715 +msgid "Importer - Duplicate fields" +msgstr "" + +#: models.py:1722 +msgid "Regular expression" +msgstr "" + +#: models.py:1725 +msgid "Importer - Regular expression" +msgstr "" + +#: models.py:1726 +msgid "Importer - Regular expressions" +msgstr "" + +#: models.py:1749 +msgid "Importer - Target" +msgstr "" + +#: models.py:1750 +msgid "Importer - Targets" +msgstr "" + +#: models.py:1774 views.py:343 +msgid "True" +msgstr "" + +#: models.py:1775 views.py:345 +msgid "False" +msgstr "" + +#: models.py:1794 +msgid "Is set" +msgstr "" + +#: models.py:1801 +msgid "Importer - Target key" +msgstr "" + +#: models.py:1802 +msgid "Importer - Targets keys" +msgstr "" + +#: models.py:1853 models.py:2497 models.py:2508 +msgid "Format" +msgstr "" + +#: models.py:1854 models.py:2599 +msgid "Operation type" +msgstr "" + +#: models.py:1855 +msgid "Period" +msgstr "" + +#: models.py:1856 +msgid "Report state" +msgstr "" + +#: models.py:1857 +msgid "Unit" +msgstr "" + +#: models.py:1858 +msgid "Material" +msgstr "" + +#: models.py:1860 +msgid "Conservatory state" +msgstr "" + +#: models.py:1861 +msgid "Preservation type" +msgstr "" + +#: models.py:1862 +msgid "Object type" +msgstr "" + +#: models.py:1864 +msgid "Identification type" +msgstr "" + +#: models.py:1866 +msgid "Context record relation type" +msgstr "" + +#: models.py:1867 models.py:2491 +msgid "Support type" +msgstr "" + +#: models.py:1873 +msgid "Integer" +msgstr "" + +#: models.py:1874 +msgid "Float" +msgstr "" + +#: models.py:1875 +msgid "String" +msgstr "" + +#: models.py:1876 templates/sheet_ope.html:86 +msgid "Date" +msgstr "" + +#: models.py:1878 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: templates/ishtar/dashboards/dashboard_main_detail.html:126 +msgid "Year" +msgstr "" + +#: models.py:1879 +msgid "String to boolean" +msgstr "" + +#: models.py:1880 +msgctxt "filesystem" +msgid "File" +msgstr "" + +#: models.py:1881 +msgid "Unknow type" +msgstr "" + +#: models.py:1897 +msgid "4 digit year. e.g.: \"2015\"" +msgstr "" + +#: models.py:1898 +msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" +msgstr "" + +#: models.py:1899 +msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" +msgstr "" + +#: models.py:1909 +msgid "Options" +msgstr "" + +#: models.py:1911 +msgid "Split character(s)" +msgstr "" + +#: models.py:1915 +msgid "Importer - Formater type" +msgstr "" + +#: models.py:1916 +msgid "Importer - Formater types" +msgstr "" + +#: models.py:1963 templates/ishtar/dashboards/dashboard_main_detail.html:63 +msgid "Created" +msgstr "" + +#: models.py:1964 +msgid "Analyse in progress" +msgstr "" + +#: models.py:1965 +msgid "Analysed" +msgstr "" + +#: models.py:1966 +msgid "Import pending" +msgstr "" + +#: models.py:1967 +msgid "Import in progress" +msgstr "" + +#: models.py:1968 +msgid "Finished with errors" +msgstr "" + +#: models.py:1969 +msgid "Finished" +msgstr "" + +#: models.py:1970 +msgid "Archived" +msgstr "" + +#: models.py:1982 +msgid "Imported file" +msgstr "" + +#: models.py:1985 +msgid "Associated images (zip file)" +msgstr "" + +#: models.py:1987 +msgid "Encoding" +msgstr "" + +#: models.py:1989 +msgid "Skip lines" +msgstr "" + +#: models.py:1990 templates/ishtar/import_list.html:47 +msgid "Error file" +msgstr "" + +#: models.py:1993 +msgid "Result file" +msgstr "" + +#: models.py:1996 templates/ishtar/import_list.html:53 +msgid "Match file" +msgstr "" + +#: models.py:2002 +msgid "Conservative import" +msgstr "" + +#: models.py:2007 +msgid "End date" +msgstr "" + +#: models.py:2009 +msgid "Remaining seconds" +msgstr "" + +#: models.py:2014 +msgid "Import" +msgstr "" + +#: models.py:2031 +msgid "Analyse" +msgstr "" + +#: models.py:2033 models.py:2036 +msgid "Re-analyse" +msgstr "" + +#: models.py:2034 +msgid "Launch import" +msgstr "" + +#: models.py:2037 +msgid "Re-import" +msgstr "" + +#: models.py:2038 +msgid "Archive" +msgstr "" + +#: models.py:2040 +msgid "Unarchive" +msgstr "" + +#: models.py:2173 +msgid "Organizations" +msgstr "" + +#: models.py:2175 +msgid "Can view all Organizations" +msgstr "" + +#: models.py:2176 +msgid "Can view own Organization" +msgstr "" + +#: models.py:2177 +msgid "Can add own Organization" +msgstr "" + +#: models.py:2179 +msgid "Can change own Organization" +msgstr "" + +#: models.py:2181 +msgid "Can delete own Organization" +msgstr "" + +#: models.py:2216 +msgid "Groups" +msgstr "" + +#: models.py:2221 +msgid "Person types" +msgstr "" + +#: models.py:2228 +msgid "Mr" +msgstr "" + +#: models.py:2229 +msgid "Miss" +msgstr "" + +#: models.py:2230 +msgid "Mr and Mrs" +msgstr "" + +#: models.py:2231 +msgid "Mrs" +msgstr "" + +#: models.py:2232 +msgid "Doctor" +msgstr "" + +#: models.py:2246 +msgid "Contact type" +msgstr "" + +#: models.py:2249 models.py:2296 +msgid "Types" +msgstr "" + +#: models.py:2252 +msgid "Is attached to" +msgstr "" + +#: models.py:2256 +msgid "Persons" +msgstr "" + +#: models.py:2258 +msgid "Can view all Persons" +msgstr "" + +#: models.py:2259 +msgid "Can view own Person" +msgstr "" + +#: models.py:2260 +msgid "Can add own Person" +msgstr "" + +#: models.py:2261 +msgid "Can change own Person" +msgstr "" + +#: models.py:2262 +msgid "Can delete own Person" +msgstr "" + +#: models.py:2411 +msgid "Ishtar user" +msgstr "" + +#: models.py:2412 +msgid "Ishtar users" +msgstr "" + +#: models.py:2454 +msgid "To modify the password use the form in Auth > User" +msgstr "" + +#: models.py:2460 +msgid "Author types" +msgstr "" + +#: models.py:2486 +msgid "Source types" +msgstr "" + +#: models.py:2492 +msgid "Support types" +msgstr "" + +#: models.py:2498 +msgid "Formats" +msgstr "" + +#: models.py:2503 +msgid "External ID" +msgstr "" + +#: models.py:2506 +msgid "Support" +msgstr "" + +#: models.py:2510 +msgid "Scale" +msgstr "" + +#: models.py:2524 +msgid "Item number" +msgstr "" + +#: models.py:2525 +msgid "Ref." +msgstr "" + +#: models.py:2528 +msgid "Internal ref." +msgstr "" + +#: models.py:2570 +msgid "Surface (m2)" +msgstr "" + +#: models.py:2571 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +msgid "Localisation" +msgstr "" + +#: models.py:2596 +msgid "Is preventive" +msgstr "" + +#: models.py:2600 +msgid "Operation types" +msgstr "" + +#: models.py:2626 +msgid "Preventive" +msgstr "" + +#: models.py:2627 +msgid "Research" +msgstr "" + +#: utils.py:52 +msgid " (...)" +msgstr "" + +#: views.py:102 +msgid "New person" +msgstr "" + +#: views.py:110 +msgid "Person modification" +msgstr "" + +#: views.py:125 +msgid "Person deletion" +msgstr "" + +#: views.py:136 +msgid "New organization" +msgstr "" + +#: views.py:143 +msgid "Organization modification" +msgstr "" + +#: views.py:159 +msgid "Organization deletion" +msgstr "" + +#: views.py:166 +msgid "Account management" +msgstr "" + +#: views.py:172 +msgid "Account deletion" +msgstr "" + +#: views.py:970 views.py:1039 +msgid "Operation not permitted." +msgstr "" + +#: views.py:972 +#, python-format +msgid "New %s" +msgstr "" + +#: views.py:1058 views.py:1112 +msgid "Operations" +msgstr "" + +#: views.py:1301 templates/ishtar/import_list.html:43 +msgid "Link unmatched items" +msgstr "" + +#: views.py:1316 +msgid "Delete import" +msgstr "" + +#: views.py:1375 views.py:1391 +msgid "Corporation manager" +msgstr "" + +#: widgets.py:239 widgets.py:347 widgets.py:463 +msgid "Search..." +msgstr "" + +#: widgets.py:608 templatetags/window_tables.py:76 +msgid "No results" +msgstr "" + +#: widgets.py:609 templatetags/window_tables.py:77 +msgid "Loading..." +msgstr "" + +#: widgets.py:610 +msgid "Remove" +msgstr "" + +#: wizards.py:321 templates/ishtar/import_delete.html:20 +msgid "Yes" +msgstr "" + +#: wizards.py:323 +msgid "No" +msgstr "" + +#: wizards.py:1227 +#, python-format +msgid "[%(app_name)s] Account creation/modification" +msgstr "" + +#: templates/404.html:14 +msgid "Page not found" +msgstr "" + +#: templates/404.html:15 +msgid "Back to main page" +msgstr "" + +#: templates/account_activation_email.txt:3 +#, python-format +msgid "Your account on %(app_name)s has been created or modified." +msgstr "" + +#: templates/account_activation_email.txt:5 +msgid "Login:" +msgstr "" + +#: templates/account_activation_email.txt:6 +msgid "Password:" +msgstr "" + +#: templates/account_activation_email.txt:8 +msgid "You can log in here:" +msgstr "" + +#: templates/account_activation_email.txt:10 +msgid "Thank you for you interest in the project." +msgstr "" + +#: templates/account_activation_email.txt:13 +#, python-format +msgid "The %(app_name)s team" +msgstr "" + +#: templates/base.html:36 +msgid "Logged in" +msgstr "" + +#: templates/base.html:37 +msgid "Log out" +msgstr "" + +#: templates/base.html:38 +msgid "Change password" +msgstr "" + +#: templates/base.html:40 templates/registration/activate.html:10 +#: templates/registration/login.html:8 templates/registration/login.html:10 +#: templates/registration/password_reset_complete.html:8 +msgid "Log in" +msgstr "" + +#: templates/base.html:46 +msgid "Lang" +msgstr "" + +#: templates/base.html:46 templates/base.html.py:93 templates/welcome.html:7 +#: templates/welcome.html.py:8 templates/welcome.html:9 +#: templates/welcome.html.py:10 templates/ishtar/manage_basket.html:4 +#: templates/ishtar/blocks/window_field.html:1 +#: templates/ishtar/blocks/window_field_detail.html:1 +#: templates/ishtar/blocks/window_field_multiple.html:1 +#: templates/ishtar/blocks/window_field_url.html:1 +msgid ":" +msgstr "" + +#: templates/base.html:71 +msgid "Default selected items" +msgstr "" + +#: templates/base.html:91 +msgid "Current items" +msgstr "" + +#: templates/base.html:125 +msgid "Processing..." +msgstr "" + +#: templates/base.html:126 +msgid "This can be long." +msgstr "" + +#: templates/base.html:127 +msgid "Time to take a coffee?" +msgstr "" + +#: templates/base.html:128 +msgid "Time to take another coffee?" +msgstr "" + +#: templates/sheet_ope.html:4 +msgid "Export as:" +msgstr "" + +#: templates/sheet_ope.html:4 +msgid "OpenOffice.org file" +msgstr "" + +#: templates/sheet_ope.html:4 +msgid "PDF file" +msgstr "" + +#: templates/sheet_ope.html:5 +msgid "General" +msgstr "" + +#: templates/sheet_ope.html:6 +msgid "Year:" +msgstr "" + +#: templates/sheet_ope.html:7 +msgid "Numerical reference:" +msgstr "" + +#: templates/sheet_ope.html:9 +msgid "Patriarche OA code:" +msgstr "" + +#: templates/sheet_ope.html:10 +msgid "Patriarche OA code not yet recorded !" +msgstr "" + +#: templates/sheet_ope.html:12 +msgid "Operation's name:" +msgstr "" + +#: templates/sheet_ope.html:14 +msgid "Edition date:" +msgstr "" + +#: templates/sheet_ope.html:16 +msgid "Begining date:" +msgstr "" + +#: templates/sheet_ope.html:17 +msgid "Field work end date:" +msgstr "" + +#: templates/sheet_ope.html:19 +msgid "Head scientist:" +msgstr "" + +#: templates/sheet_ope.html:20 +msgid "State:" +msgstr "" + +#: templates/sheet_ope.html:20 +msgid "Active file" +msgstr "" + +#: templates/sheet_ope.html:21 +msgid "Closed operation" +msgstr "" + +#: templates/sheet_ope.html:22 +msgid "Closing date:" +msgstr "" + +#: templates/sheet_ope.html:22 +msgid "by" +msgstr "" + +#: templates/sheet_ope.html:24 +msgid "Type:" +msgstr "" + +#: templates/sheet_ope.html:25 +msgid "Surface:" +msgstr "" + +#: templates/sheet_ope.html:26 +msgid "Cost:" +msgstr "" + +#: templates/sheet_ope.html:27 +msgid "Duration:" +msgstr "" + +#: templates/sheet_ope.html:27 +msgid "Day" +msgstr "" + +#: templates/sheet_ope.html:29 +msgid "Remains:" +msgstr "" + +#: templates/sheet_ope.html:30 +msgid "Periods:" +msgstr "" + +#: templates/sheet_ope.html:33 +msgid "Related file:" +msgstr "" + +#: templates/sheet_ope.html:35 +msgid "Operator's reference code:" +msgstr "" + +#: templates/sheet_ope.html:36 +msgid "Town planning service:" +msgstr "" + +#: templates/sheet_ope.html:37 +msgid "Permit type:" +msgstr "" + +#: templates/sheet_ope.html:38 +msgid "Permit reference:" +msgstr "" + +#: templates/sheet_ope.html:39 +msgid "General contractor organisation:" +msgstr "" + +#: templates/sheet_ope.html:40 +msgid "General contractor:" +msgstr "" + +#: templates/sheet_ope.html:44 +msgid "Comment:" +msgstr "" + +#: templates/sheet_ope.html:47 +msgid "Towns:" +msgstr "" + +#: templates/sheet_ope.html:49 +msgid "Main address:" +msgstr "" + +#: templates/sheet_ope.html:50 +msgid "Complement:" +msgstr "" + +#: templates/sheet_ope.html:51 +msgid "Postal code:" +msgstr "" + +#: templates/sheet_ope.html:53 +msgid "Lambert X:" +msgstr "" + +#: templates/sheet_ope.html:54 +msgid "Lambert Y:" +msgstr "" + +#: templates/sheet_ope.html:55 +msgid "Altitude (m NGF):" +msgstr "" + +#: templates/sheet_ope.html:58 +msgid "Associated parcels" +msgstr "" + +#: templates/sheet_ope.html:60 +msgid "Commune" +msgstr "" + +#: templates/sheet_ope.html:62 +msgid "Section" +msgstr "" + +#: templates/sheet_ope.html:63 templates/sheet_ope.html.py:129 +msgid "Parcel" +msgstr "" + +#: templates/sheet_ope.html:64 +msgid "Owner" +msgstr "" + +#: templates/sheet_ope.html:75 +msgid "No parcel associated to this operation" +msgstr "" + +#: templates/sheet_ope.html:79 templates/sheet_ope.html.py:81 +msgid "Admninistrative acts" +msgstr "" + +#: templates/sheet_ope.html:96 +msgid "No administrative act associated to this operation" +msgstr "" + +#: templates/sheet_ope.html:100 +msgid "Documentation" +msgstr "" + +#: templates/sheet_ope.html:102 +msgid "Documents" +msgstr "" + +#: templates/sheet_ope.html:117 +msgid "No document associated to this operation" +msgstr "" + +#: templates/sheet_ope.html:121 templates/sheet_ope.html.py:123 +msgid "Context Records" +msgstr "" + +#: templates/sheet_ope.html:125 +msgid "ID" +msgstr "" + +#: templates/sheet_ope.html:127 +msgid "Chronology" +msgstr "" + +#: templates/sheet_ope.html:142 +msgid "No context record associated to this operation" +msgstr "" + +#: templates/welcome.html:4 +msgid "" +"Welcome in Ishtar, open source software for management and inventory of " +"archaeological data" +msgstr "" + +#: templates/welcome.html:5 +msgid "Some useful links:" +msgstr "" + +#: templates/welcome.html:7 +msgid "Presentation site and blog" +msgstr "" + +#: templates/welcome.html:7 +msgid "stay tuned with Ishtar news!" +msgstr "" + +#: templates/welcome.html:8 +msgid "Admin interface" +msgstr "" + +#: templates/welcome.html:8 +msgid "for admin only." +msgstr "" + +#: templates/welcome.html:9 +msgid "Forum" +msgstr "" + +#: templates/welcome.html:9 +msgid "" +"need help? find a new bug? a fantastic feature to propose? Here is the place " +"to go." +msgstr "" + +#: templates/welcome.html:10 +msgid "Source code" +msgstr "" + +#: templates/welcome.html:10 +msgid "tickets" +msgstr "" + +#: templates/welcome.html:10 +msgid "where the magic happens." +msgstr "" + +#: templates/window.html:38 templates/blocks/JQueryJqGrid.html:25 +#: templates/ishtar/manage_basket.html:9 +msgid "Add" +msgstr "" + +#: templates/admin/base_site.html:4 templates/admin/base_site.html.py:7 +msgid "Ishtar administration" +msgstr "" + +#: templates/blocks/JQueryAdvancedTown.html:3 +msgctxt "Region" +msgid "State" +msgstr "" + +#: templates/blocks/JQueryAdvancedTown.html:29 +msgid "Choose a state first" +msgstr "" + +#: templates/blocks/JQueryJqGrid.html:9 +msgid "Search and select an item" +msgstr "" + +#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:12 +msgid "Export as CSV" +msgstr "" + +#: templates/blocks/JQueryJqGrid.html:17 templates/blocks/JQueryJqGrid.html:20 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:9 +msgid "CSV" +msgstr "" + +#: templates/blocks/JQueryJqGrid.html:18 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10 +msgid "Export as CSV - full" +msgstr "" + +#: templates/blocks/JQueryJqGrid.html:18 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:10 +msgid "CSV full" +msgstr "" + +#: templates/blocks/JQueryJqGrid.html:96 +#: templates/ishtar/blocks/window_tables/dynamic_documents.html:41 +msgid "An error as occured during search. Check your query fields." +msgstr "" + +#: templates/blocks/comma_list.html:1 +msgid "and" +msgstr "" + +#: templates/blocks/comma_list.html:1 +msgid ", " +msgstr "" + +#: templates/blocks/comma_list.html:1 +msgid "." +msgstr "" + +#: templates/blocks/form_flex_snippet.html:12 +msgid "Show / hide advanced search" +msgstr "" + +#: templates/blocks/form_flex_snippet.html:18 +#: templates/blocks/form_snippet.html:9 +msgid "Help" +msgstr "" + +#: templates/ishtar/basket_list.html:6 +msgid "remove" +msgstr "" + +#: templates/ishtar/form.html:10 templates/ishtar/formset.html:8 +#: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31 +#: templates/ishtar/simple_form.html:7 +#: templates/ishtar/wizard/confirm_wizard.html:42 +#: templates/ishtar/wizard/default_wizard.html:30 +#: templates/ishtar/wizard/search.html:13 +#: templates/ishtar/wizard/validation_bar.html:4 +msgid "Validate" +msgstr "" + +#: templates/ishtar/import_delete.html:8 +msgid "The current items are linked to this import:" +msgstr "" + +#: templates/ishtar/import_delete.html:18 +msgid "All these items will be deleted with this import." +msgstr "" + +#: templates/ishtar/import_delete.html:19 +msgid "Are you sure?" +msgstr "" + +#: templates/ishtar/import_delete.html:22 +msgid "Back" +msgstr "" + +#: templates/ishtar/import_list.html:8 +msgid "No pending imports." +msgstr "" + +#: templates/ishtar/import_list.html:14 +msgctxt "file" +msgid "File" +msgstr "" + +#: templates/ishtar/import_list.html:16 +msgid "Status" +msgstr "" + +#: templates/ishtar/import_list.html:17 +msgid "Action" +msgstr "" + +#: templates/ishtar/import_list.html:25 +msgid "Source file" +msgstr "" + +#: templates/ishtar/import_list.html:50 +msgid "Control file" +msgstr "" + +#: templates/ishtar/manage_basket.html:7 +msgid "Checking \"Select all\" only select the current page." +msgstr "" + +#: templates/ishtar/manage_basket.html:10 +msgid "Basket content" +msgstr "" + +#: templates/ishtar/merge.html:7 +msgid "Every operation on this form is irreversible" +msgstr "" + +#: templates/ishtar/merge.html:9 +msgid "Page " +msgstr "" + +#: templates/ishtar/merge.html:17 +msgid "Item A" +msgstr "" + +#: templates/ishtar/merge.html:18 +msgid "Item B" +msgstr "" + +#: templates/ishtar/merge.html:19 +msgid "B is a duplicate of A" +msgstr "" + +#: templates/ishtar/merge.html:20 +msgid "A is a duplicate of B" +msgstr "" + +#: templates/ishtar/merge.html:21 +msgid "Is not duplicate" +msgstr "" + +#: templates/ishtar/organization_form.html:37 +#: templates/ishtar/organization_person_form.html:32 +#: templates/ishtar/person_form.html:43 +#: templates/ishtar/blocks/modify_toolbar.html:1 +#: templates/ishtar/blocks/window_nav.html:39 +msgid "Modify" +msgstr "" + +#: templates/ishtar/organization_form.html:38 +#: templates/ishtar/organization_person_form.html:33 +#: templates/ishtar/person_form.html:44 +msgid "New" +msgstr "" + +#: templates/ishtar/organization_form.html:39 +#: templates/ishtar/organization_person_form.html:34 +#: templates/ishtar/person_form.html:45 +msgid "Save" +msgstr "" + +#: templates/ishtar/organization_form.html:40 +#: templates/ishtar/organization_person_form.html:35 +#: templates/ishtar/person_form.html:46 +#: templates/ishtar/wizard/validation_bar.html:6 +msgid "Cancel" +msgstr "" + +#: templates/ishtar/organization_person_form.html:9 +#: templates/ishtar/person_form.html:9 +msgid "Identification" +msgstr "" + +#: templates/ishtar/person_form.html:24 +msgid "Contact informations" +msgstr "" + +#: templates/ishtar/sheet.html:28 +msgid "Close" +msgstr "" + +#: templates/ishtar/sheet.html:34 +msgid "Close all windows" +msgstr "" + +#: templates/ishtar/sheet_organization.html:9 +msgid "Created by:" +msgstr "" + +#: templates/ishtar/sheet_organization.html:19 +msgid "Person in the organization" +msgstr "" + +#: templates/ishtar/sheet_organization.html:34 +msgid "No person in this organization" +msgstr "" + +#: templates/ishtar/sheet_person.html:20 +#: templates/ishtar/wizard/wizard_person.html:19 +msgid "Phone type" +msgstr "" + +#: templates/ishtar/sheet_person.html:43 +#: templates/ishtar/wizard/wizard_person.html:42 +msgid "Business address" +msgstr "" + +#: templates/ishtar/sheet_person.html:51 +#: templates/ishtar/wizard/wizard_person.html:51 +msgid "Other address" +msgstr "" + +#: templates/ishtar/sheet_person.html:59 +msgid "Associated organization" +msgstr "" + +#: templates/ishtar/sheet_person.html:70 +msgid "Associated operations as scientist" +msgstr "" + +#: templates/ishtar/sheet_person.html:74 +msgid "Associated operations as responsible" +msgstr "" + +#: templates/ishtar/sheet_person.html:80 +msgid "Associated archaelogical files" +msgstr "" + +#: templates/ishtar/sheet_person.html:86 +msgid "Documents associated to operations" +msgstr "" + +#: templates/ishtar/sheet_person.html:91 +msgid "Documents associated to context records" +msgstr "" + +#: templates/ishtar/sheet_person.html:96 +msgid "Documents associated to finds" +msgstr "" + +#: templates/ishtar/blocks/window_field_url.html:2 +msgid "link" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:6 +msgid "Previous version" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:17 +msgid "Restore this version" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:17 +msgid "" +"Are you sure to restore to this version? All changement made since this " +"version will be lost." +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:22 +msgid "Restore" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:24 +msgid "Next version" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:45 +msgid "Export as OpenOffice.org file" +msgstr "" + +#: templates/ishtar/blocks/window_nav.html:45 +msgid "Export as PDF file" +msgstr "" + +#: templates/ishtar/blocks/window_tables/documents.html:10 +msgid "Related to" +msgstr "" + +#: templates/ishtar/blocks/window_tables/documents.html:11 +#: templates/ishtar/blocks/window_tables/documents.html:19 +msgid "Link" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:5 +msgid "Numbers" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:12 +msgid "Change" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:16 +msgid "Total:" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:19 +msgid "Draw rectangle on the graph to zoom. Double-click to reinitialize." +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:21 +msgid "Display as an image" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:24 +msgid "Right-click on this image to save it." +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:41 +msgid "By years" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:43 +#: templates/ishtar/dashboards/dashboard_main_detail.html:53 +msgid "Average:" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:44 +#: templates/ishtar/dashboards/dashboard_main_detail.html:54 +msgid "Variance:" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:45 +#: templates/ishtar/dashboards/dashboard_main_detail.html:55 +msgid "Standard deviation:" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:46 +#: templates/ishtar/dashboards/dashboard_main_detail.html:56 +msgid "Median:" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:47 +#: templates/ishtar/dashboards/dashboard_main_detail.html:57 +msgid "Mode:" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:51 +msgid "By operations" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:61 +msgid "Created last" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:74 +msgid "Recent changes" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:76 +msgid "Modified" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:114 +msgid "No data for these criteria." +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail.html:132 +msgid "Month" +msgstr "" + +#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 +msgid "User type" +msgstr "" + +#: templates/ishtar/wizard/confirm_wizard.html:17 +#: templates/ishtar/wizard/wizard_done_summary.html:6 +msgid "You have entered the following informations:" +msgstr "" + +#: templates/ishtar/wizard/confirm_wizard.html:41 +msgid "Would you like to save them?" +msgstr "" + +#: templates/ishtar/wizard/default_wizard.html:36 +#: templates/ishtar/wizard/parcels_wizard.html:24 +#: templates/ishtar/wizard/relations_wizard.html:23 +#: templates/ishtar/wizard/search.html:20 +#: templates/ishtar/wizard/towns_wizard.html:19 +msgid "Add/Modify" +msgstr "" + +#: templates/ishtar/wizard/default_wizard.html:58 +msgid "" +"The form has changed if you don't validate it all your changes will be lost." +msgstr "" + +#: templates/ishtar/wizard/parcels_wizard.html:12 +msgid "" +"Existing parcels from the operation will be automatically added to the " +"archaeological file." +msgstr "" + +#: templates/ishtar/wizard/parcels_wizard.html:20 +#: templates/ishtar/wizard/relations_wizard.html:20 +msgid "all" +msgstr "" + +#: templates/ishtar/wizard/parcels_wizard.html:23 +msgid "Add all parcels from the archaeological file" +msgstr "" + +#: templates/ishtar/wizard/towns_wizard.html:27 +msgid "No town set in the associated file." +msgstr "" + +#: templates/ishtar/wizard/validation_bar.html:5 +msgid "Validate and end" +msgstr "" + +#: templates/ishtar/wizard/wizard_closing_done.html:4 +msgid "Item successfully closed" +msgstr "" + +#: templates/ishtar/wizard/wizard_delete_done.html:4 +msgid "Item successfully deleted" +msgstr "" + +#: templates/ishtar/wizard/wizard_done.html:4 +msgid "Item successfully saved" +msgstr "" + +#: templates/ishtar/wizard/wizard_done_summary_2.html:7 +#: templates/ishtar/wizard/wizard_list_search_result.html:9 +msgid "You have saved the following informations:" +msgstr "" + +#: templates/ishtar/wizard/wizard_organization_deletion.html:6 +msgid "Associated persons" +msgstr "" + +#: templates/ishtar/wizard/wizard_organization_deletion.html:14 +msgid "Associated archaeological files" +msgstr "" + +#: templates/ishtar/wizard/wizard_organization_deletion.html:22 +msgid "Operator of archaeological operations" +msgstr "" + +#: templates/ishtar/wizard/wizard_organization_deletion.html:30 +msgid "Adminact: operator of archaeological operations" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:6 +msgid "In charge of archaeological files" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:14 +msgid "General contractor of archaeological files" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:22 +msgid "Responsible town planning service of archaeological files" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:30 +msgid "Scientist in charge of archaeological files" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:38 +msgid "Scientist in charge of archaeological operations" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:46 +msgid "In charge of archaeological operations" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:54 +msgid "Rapporteur CIRA des operations" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:62 +msgid "Administrativ act: in charge of archaeological operations" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:70 +msgid "Administrativ act: scientist in charge" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:78 +msgid "Administrativ act: signatory" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:86 +msgid "In charge of warehouses" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:94 +msgid "Treatments of items" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:98 +msgid "downstream" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:101 +msgid "upstream" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:108 +msgid "Property of items" +msgstr "" + +#: templates/ishtar/wizard/wizard_person_deletion.html:116 +msgid "Owns parcels" +msgstr "" + +#: templates/registration/activate.html:8 +msgid "Account successfully activated" +msgstr "" + +#: templates/registration/activate.html:14 +msgid "Account activation failed" +msgstr "" + +#: templates/registration/activation_complete.html:7 +msgid "You may now login with your username and password." +msgstr "" + +#: templates/registration/activation_complete.html:9 +msgid "Login now" +msgstr "" + +#: templates/registration/activation_complete.html:11 +msgid "Home" +msgstr "" + +#: templates/registration/activation_email.txt:2 +msgid "Activate account at" +msgstr "" + +#: templates/registration/activation_email.txt:6 +#, python-format +msgid "Link is valid for %(expiration_days)s days." +msgstr "" + +#: templates/registration/activation_email_subject.txt:1 +msgid "Account activation on" +msgstr "" + +#: templates/registration/login.html:16 +msgid "Forgot password?" +msgstr "" + +#: templates/registration/login.html:16 +msgid "Reset it" +msgstr "" + +#: templates/registration/login.html:17 +msgid "Not member?" +msgstr "" + +#: templates/registration/login.html:17 +#: templates/registration/registration_form.html:8 +msgid "Register" +msgstr "" + +#: templates/registration/logout.html:6 +msgid "Logged out" +msgstr "" + +#: templates/registration/password_change_done.html:6 +msgid "Password changed" +msgstr "" + +#: templates/registration/password_change_form.html:10 +#: templates/registration/password_reset_confirm.html:11 +#: templates/registration/password_reset_form.html:11 +#: templates/registration/registration_form.html:10 +msgid "Submit" +msgstr "" + +#: templates/registration/password_reset_complete.html:6 +msgid "Password reset successfully" +msgstr "" + +#: templates/registration/password_reset_confirm.html:17 +msgid "Password reset failed" +msgstr "" + +#: templates/registration/password_reset_done.html:6 +msgid "Email with password reset instructions has been sent." +msgstr "" + +#: templates/registration/password_reset_email.html:2 +#, python-format +msgid "Reset password at %(site_name)s" +msgstr "" + +#: templates/registration/password_reset_form.html:7 +msgid "Reset password" +msgstr "" + +#: templates/registration/registration_complete.html:6 +msgid "You are now registered. Activation email sent." +msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 3202d74b8..8091a7cb7 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Zanata 3.9.3\n" #: forms.py:46 forms.py:123 models.py:130 -#: templates/ishtar/sheet_contextrecord.html:57 +#: templates/ishtar/sheet_contextrecord.html:59 msgid "ID" msgstr "Identifiant" @@ -70,12 +70,12 @@ msgid "General" msgstr "Général" #: forms.py:122 models.py:117 models.py:126 -#: templates/ishtar/sheet_contextrecord.html:61 +#: templates/ishtar/sheet_contextrecord.html:63 msgid "Parcel" msgstr "Parcelle" #: forms.py:125 models.py:131 templates/ishtar/sheet_contextrecord.html:26 -#: templates/ishtar/sheet_contextrecord.html:60 +#: templates/ishtar/sheet_contextrecord.html:62 msgid "Description" msgstr "Description" @@ -389,7 +389,7 @@ msgstr "UE" msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:324 templates/ishtar/sheet_contextrecord.html:56 +#: models.py:324 templates/ishtar/sheet_contextrecord.html:58 msgid "Relation type" msgstr "Type de relation" @@ -446,7 +446,7 @@ msgid "Complete ID:" msgstr "ID complet :" #: templates/ishtar/sheet_contextrecord.html:11 -#: templates/ishtar/sheet_contextrecord.html:86 +#: templates/ishtar/sheet_contextrecord.html:89 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" @@ -463,7 +463,7 @@ msgid "Created by:" msgstr "Créé par :" #: templates/ishtar/sheet_contextrecord.html:18 -#: templates/ishtar/sheet_contextrecord.html:98 +#: templates/ishtar/sheet_contextrecord.html:101 msgid "Type:" msgstr "Type :" @@ -539,83 +539,83 @@ msgstr "TPQ estimé :" msgid "In relation with" msgstr "En relation avec" -#: templates/ishtar/sheet_contextrecord.html:58 +#: templates/ishtar/sheet_contextrecord.html:60 msgid "Type" msgstr "Type" -#: templates/ishtar/sheet_contextrecord.html:59 +#: templates/ishtar/sheet_contextrecord.html:61 msgid "Chronology" msgstr "Chronologie" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:83 msgid "Operation summary" msgstr "Résumé de l'opération" -#: templates/ishtar/sheet_contextrecord.html:81 +#: templates/ishtar/sheet_contextrecord.html:84 msgid "Year:" msgstr "Année :" -#: templates/ishtar/sheet_contextrecord.html:84 +#: templates/ishtar/sheet_contextrecord.html:87 msgid "Patriarche OA code:" msgstr "Code d'opération Patriarche" -#: templates/ishtar/sheet_contextrecord.html:89 +#: templates/ishtar/sheet_contextrecord.html:92 msgid "Head scientist:" msgstr "Responsable scientifique :" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:93 msgid "State:" msgstr "État :" -#: templates/ishtar/sheet_contextrecord.html:92 +#: templates/ishtar/sheet_contextrecord.html:95 msgid "Active file" msgstr "Dossier actif" -#: templates/ishtar/sheet_contextrecord.html:94 +#: templates/ishtar/sheet_contextrecord.html:97 msgid "Closed operation" msgstr "Opération fermée" -#: templates/ishtar/sheet_contextrecord.html:95 +#: templates/ishtar/sheet_contextrecord.html:98 msgid "Closing date:" msgstr "Date de clôture :" -#: templates/ishtar/sheet_contextrecord.html:96 +#: templates/ishtar/sheet_contextrecord.html:99 msgid "by" msgstr "par" -#: templates/ishtar/sheet_contextrecord.html:99 +#: templates/ishtar/sheet_contextrecord.html:102 msgid "Remains:" msgstr "Vestiges :" -#: templates/ishtar/sheet_contextrecord.html:100 +#: templates/ishtar/sheet_contextrecord.html:103 msgid "Periods:" msgstr "Périodes :" -#: templates/ishtar/sheet_contextrecord.html:103 +#: templates/ishtar/sheet_contextrecord.html:106 msgid "Localisation" msgstr "Lieu" -#: templates/ishtar/sheet_contextrecord.html:104 +#: templates/ishtar/sheet_contextrecord.html:107 msgid "Towns:" msgstr "Communes :" -#: templates/ishtar/sheet_contextrecord.html:105 +#: templates/ishtar/sheet_contextrecord.html:108 msgid "Related operation:" msgstr "Opération associée :" -#: templates/ishtar/sheet_contextrecord.html:108 +#: templates/ishtar/sheet_contextrecord.html:111 msgid "No operation linked to this context unit!" msgstr "Pas d'opération rattachée à cette UE !" -#: templates/ishtar/sheet_contextrecord.html:111 +#: templates/ishtar/sheet_contextrecord.html:114 msgid "Document from this context record" msgstr "Document associé à cette Unité d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:116 +#: templates/ishtar/sheet_contextrecord.html:119 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_contextrecord.html:121 +#: templates/ishtar/sheet_contextrecord.html:124 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index f5635073f..33f9ee0fa 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -10,7 +10,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-08-25 07:31-0400\n" +"PO-Revision-Date: 2016-08-29 11:35-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Zanata 3.9.3\n" #: forms.py:51 forms.py:210 forms.py:254 forms.py:395 forms.py:422 -#: models.py:76 templates/ishtar/sheet_file.html:133 +#: models.py:76 templates/ishtar/sheet_file.html:139 msgid "Year" msgstr "Année" @@ -67,7 +67,7 @@ msgstr "Référence du permis" msgid "Comment" msgstr "Commentaire" -#: forms.py:69 templates/ishtar/sheet_file.html:110 +#: forms.py:69 templates/ishtar/sheet_file.html:112 msgid "In charge" msgstr "Responsable" @@ -173,7 +173,7 @@ msgid "Total developed surface (m2)" msgstr "Surface totale aménagée (m2)" #: forms.py:333 templates/ishtar/sheet_file.html:84 -#: templates/ishtar/dashboards/dashboard_file.html:42 +#: templates/ishtar/dashboards/dashboard_file.html:45 msgid "Research archaeology" msgstr "Archéologie programmée" @@ -466,7 +466,7 @@ msgstr "Dossier : modification d'acte administratif" msgid "File: administrative act deletion" msgstr "Dossier : suppression d'acte administratif" -#: wizards.py:124 templates/ishtar/sheet_file.html:105 +#: wizards.py:124 templates/ishtar/sheet_file.html:104 msgid "Associated operations" msgstr "Opérations associées" @@ -569,35 +569,35 @@ msgstr "Parcelles associées" msgid "Administrative acts" msgstr "Actes administratifs" -#: templates/ishtar/sheet_file.html:107 templates/ishtar/sheet_file.html:134 +#: templates/ishtar/sheet_file.html:109 templates/ishtar/sheet_file.html:140 msgid "Ref." msgstr "Réf." -#: templates/ishtar/sheet_file.html:109 templates/ishtar/sheet_file.html:135 +#: templates/ishtar/sheet_file.html:111 templates/ishtar/sheet_file.html:141 msgid "Type" msgstr "Type" -#: templates/ishtar/sheet_file.html:111 +#: templates/ishtar/sheet_file.html:113 msgid "Start date" msgstr "Date de début" -#: templates/ishtar/sheet_file.html:112 +#: templates/ishtar/sheet_file.html:114 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: templates/ishtar/sheet_file.html:126 +#: templates/ishtar/sheet_file.html:128 msgid "No operation associated to this archaelogical file" msgstr "Pas d'opération associée à ce dossier archéologique" -#: templates/ishtar/sheet_file.html:131 +#: templates/ishtar/sheet_file.html:134 msgid "Admninistrative acts linked to associated operations" msgstr "Actes administratifs associés à ces opérations" -#: templates/ishtar/sheet_file.html:136 +#: templates/ishtar/sheet_file.html:142 msgid "Date" msgstr "Date" -#: templates/ishtar/sheet_file.html:146 +#: templates/ishtar/sheet_file.html:152 msgid "No administrative act linked to operations" msgstr "Pas d'acte administratif associé à ces opérations" @@ -610,66 +610,70 @@ msgid "Global informations" msgstr "Informations générales" #: templates/ishtar/dashboards/dashboard_file.html:12 -#: templates/ishtar/dashboards/dashboard_file.html:44 -#: templates/ishtar/dashboards/dashboard_file.html:97 +#: templates/ishtar/dashboards/dashboard_file.html:47 +#: templates/ishtar/dashboards/dashboard_file.html:102 msgid "Total:" msgstr "Total :" #: templates/ishtar/dashboards/dashboard_file.html:18 -#: templates/ishtar/dashboards/dashboard_file.html:47 -#: templates/ishtar/dashboards/dashboard_file.html:125 -msgid "By year" -msgstr "Par année" +#: templates/ishtar/dashboards/dashboard_file.html:49 +#: templates/ishtar/dashboards/dashboard_file.html:133 +msgid "by year" +msgstr "par année" -#: templates/ishtar/dashboards/dashboard_file.html:30 -#: templates/ishtar/dashboards/dashboard_file.html:59 -#: templates/ishtar/dashboards/dashboard_file.html:137 -msgid "By month" -msgstr "Par mois" +#: templates/ishtar/dashboards/dashboard_file.html:22 +msgid "no year" +msgstr "pas d'année" -#: templates/ishtar/dashboards/dashboard_file.html:71 -#: templates/ishtar/dashboards/dashboard_file.html:164 -msgid "By department" -msgstr "Par département" +#: templates/ishtar/dashboards/dashboard_file.html:32 +#: templates/ishtar/dashboards/dashboard_file.html:61 +#: templates/ishtar/dashboards/dashboard_file.html:147 +msgid "by month" +msgstr "par mois" -#: templates/ishtar/dashboards/dashboard_file.html:83 -msgid "Main towns" -msgstr "Principales communes" +#: templates/ishtar/dashboards/dashboard_file.html:73 +#: templates/ishtar/dashboards/dashboard_file.html:178 +msgid "by department" +msgstr "par département" -#: templates/ishtar/dashboards/dashboard_file.html:95 +#: templates/ishtar/dashboards/dashboard_file.html:85 +msgid "main towns" +msgstr "communes principales" + +#: templates/ishtar/dashboards/dashboard_file.html:100 msgid "Rescue archaeology" msgstr "Archéologie préventive" -#: templates/ishtar/dashboards/dashboard_file.html:101 -msgid "By saisine type" -msgstr "Par type de saisine" +#: templates/ishtar/dashboards/dashboard_file.html:105 +msgid "by saisine type" +msgstr "par type de saisine" -#: templates/ishtar/dashboards/dashboard_file.html:113 -msgid "By administrative act" -msgstr "Par acte administratif" +#: templates/ishtar/dashboards/dashboard_file.html:119 +msgid "by administrative act" +msgstr "par acte administratif" -#: templates/ishtar/dashboards/dashboard_file.html:147 +#: templates/ishtar/dashboards/dashboard_file.html:160 msgid "Archaeological files linked to at least one operation:" msgstr "Dossiers associés à au moins une opération :" -#: templates/ishtar/dashboards/dashboard_file.html:148 +#: templates/ishtar/dashboards/dashboard_file.html:161 #, python-format msgid "Archaeological files linked to at least one operation (%%):" msgstr "Dossiers associés à au moins une opération (%%) :" -#: templates/ishtar/dashboards/dashboard_file.html:152 +#: templates/ishtar/dashboards/dashboard_file.html:164 #, python-format -msgid "Archaeological files linked to at least one operation (%%)" -msgstr "Dossiers associés à au moins une opération (%%)" +msgid "archaeological files linked to at least one operation (%%)" +msgstr "dossiers associés à au moins une opérations (%%)" -#: templates/ishtar/dashboards/dashboard_file.html:176 -msgid "Surface by department (ha)" -msgstr "Surface par département (ha)" +#: templates/ishtar/dashboards/dashboard_file.html:192 +msgid "surface by department (ha)" +msgstr "surface par département (ha)" -#: templates/ishtar/dashboards/dashboard_file.html:188 -msgid "Main towns by number" -msgstr "Principales communes en nombre" +#: templates/ishtar/dashboards/dashboard_file.html:206 +msgid "main towns by number" +msgstr "communes principales en nombre" -#: templates/ishtar/dashboards/dashboard_file.html:200 -msgid "Main towns by surface (ha)" -msgstr "Principales communes en surface (ha)" +#: templates/ishtar/dashboards/dashboard_file.html:220 +msgid "main towns by surface (ha)" +msgstr "communes principales en surface (ha)" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 59a74c0ca..5ad26c255 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -153,12 +153,12 @@ msgid "Period" msgstr "Période" #: forms.py:180 forms.py:579 models.py:695 models.py:760 models.py:896 -#: templates/ishtar/sheet_find.html:79 templates/ishtar/sheet_find.html:104 +#: templates/ishtar/sheet_find.html:81 templates/ishtar/sheet_find.html:110 msgid "Start date" msgstr "Date de début" #: forms.py:182 forms.py:581 models.py:696 models.py:761 models.py:897 -#: templates/ishtar/sheet_find.html:80 templates/ishtar/sheet_find.html:105 +#: templates/ishtar/sheet_find.html:82 templates/ishtar/sheet_find.html:111 msgid "End date" msgstr "Date de fin" @@ -295,7 +295,7 @@ msgid "Treatment type" msgstr "Type de traitement" #: forms.py:566 models.py:693 models.py:764 -#: templates/ishtar/sheet_find.html:77 templates/ishtar/sheet_find.html:102 +#: templates/ishtar/sheet_find.html:79 templates/ishtar/sheet_find.html:108 msgid "Doer" msgstr "Opérateur" @@ -531,16 +531,16 @@ msgstr "Mesures de conservation à envisager" msgid "Weight unit" msgstr "Unité de poids" -#: models.py:337 templates/ishtar/sheet_find.html:73 +#: models.py:337 templates/ishtar/sheet_find.html:72 msgid "Upstream treatment" msgstr "Traitement amont" -#: models.py:340 templates/ishtar/sheet_find.html:98 +#: models.py:340 templates/ishtar/sheet_find.html:101 msgid "Downstream treatment" msgstr "Traitement aval" #: models.py:344 models.py:679 models.py:763 -#: templates/ishtar/sheet_find.html:78 templates/ishtar/sheet_find.html:103 +#: templates/ishtar/sheet_find.html:80 templates/ishtar/sheet_find.html:109 msgid "Container" msgstr "Contenant" @@ -646,8 +646,8 @@ msgstr "Peut supprimer son propre Traitement" msgid "by" msgstr "par" -#: models.py:765 models.py:766 templates/ishtar/sheet_find.html:76 -#: templates/ishtar/sheet_find.html:101 +#: models.py:765 models.py:766 templates/ishtar/sheet_find.html:78 +#: templates/ishtar/sheet_find.html:107 msgid "Related finds" msgstr "Mobilier associé" @@ -731,36 +731,36 @@ msgstr "Nouveau traitement" msgid "Operation" msgstr "Opération" -#: templates/ishtar/sheet_find.html:75 templates/ishtar/sheet_find.html:100 -#: templates/ishtar/sheet_find.html:166 +#: templates/ishtar/sheet_find.html:77 templates/ishtar/sheet_find.html:106 +#: templates/ishtar/sheet_find.html:175 msgid "Type" msgstr "Type" -#: templates/ishtar/sheet_find.html:93 +#: templates/ishtar/sheet_find.html:97 msgid "Export as CSV" msgstr "Export en CSV" -#: templates/ishtar/sheet_find.html:93 templates/ishtar/sheet_find.html:118 +#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:127 msgid "CSV" msgstr "CSV" -#: templates/ishtar/sheet_find.html:123 +#: templates/ishtar/sheet_find.html:132 msgid "Associated base finds" msgstr "Mobilier de base associé" -#: templates/ishtar/sheet_find.html:161 templates/ishtar/sheet_find.html:163 +#: templates/ishtar/sheet_find.html:170 templates/ishtar/sheet_find.html:172 msgid "Documents" msgstr "Documents" -#: templates/ishtar/sheet_find.html:165 +#: templates/ishtar/sheet_find.html:174 msgid "Title" msgstr "Titre" -#: templates/ishtar/sheet_find.html:167 +#: templates/ishtar/sheet_find.html:176 msgid "Authors" msgstr "Auteurs" -#: templates/ishtar/sheet_find.html:168 +#: templates/ishtar/sheet_find.html:177 msgid "Link" msgstr "Lien" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index bd55fab37..c709c7303 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -10,7 +10,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-08-25 07:48-0400\n" +"PO-Revision-Date: 2016-08-29 11:36-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" @@ -18,27 +18,27 @@ msgstr "" "X-Generator: Zanata 3.9.3\n" #: forms.py:66 forms.py:368 forms.py:952 forms.py:974 forms.py:978 -#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:8 +#: models.py:815 templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "Parcelles" #: forms.py:69 forms.py:202 forms.py:928 models.py:801 -#: templates/ishtar/blocks/window_tables/parcels.html:5 -#: templates/ishtar/dashboards/dashboard_operation.html:302 -#: templates/ishtar/dashboards/dashboard_operation.html:315 -#: templates/ishtar/dashboards/dashboard_operation.html:482 -#: templates/ishtar/dashboards/dashboard_operation.html:495 +#: templates/ishtar/blocks/window_tables/parcels.html:7 +#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:446 +#: templates/ishtar/dashboards/dashboard_operation.html:685 +#: templates/ishtar/dashboards/dashboard_operation.html:699 msgid "Town" msgstr "Commune" #: forms.py:71 forms.py:457 forms.py:731 forms.py:1192 models.py:194 #: models.py:618 models.py:799 -#: templates/ishtar/blocks/window_tables/parcels.html:6 +#: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "Année" #: forms.py:74 models.py:802 -#: templates/ishtar/blocks/window_tables/parcels.html:7 +#: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "Section" @@ -117,15 +117,15 @@ msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/nombre/domaine public)" #: forms.py:467 forms.py:1206 models.py:519 -#: templates/ishtar/dashboards/dashboard_operation.html:273 -#: templates/ishtar/dashboards/dashboard_operation.html:286 -#: templates/ishtar/dashboards/dashboard_operation.html:453 -#: templates/ishtar/dashboards/dashboard_operation.html:466 +#: templates/ishtar/dashboards/dashboard_operation.html:390 +#: templates/ishtar/dashboards/dashboard_operation.html:411 +#: templates/ishtar/dashboards/dashboard_operation.html:643 +#: templates/ishtar/dashboards/dashboard_operation.html:664 msgid "Department" msgstr "Département" #: forms.py:468 forms.py:1038 models.py:78 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Name" msgstr "Nom" @@ -150,12 +150,12 @@ msgid "Operator" msgstr "Opérateur" #: forms.py:497 forms.py:1043 models.py:82 models.py:204 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "Vestiges" #: forms.py:498 forms.py:1022 forms.py:1040 models.py:80 models.py:209 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "Périodes" @@ -358,7 +358,7 @@ msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" #: forms.py:899 models.py:207 -#: templates/ishtar/dashboards/dashboard_operation.html:495 +#: templates/ishtar/dashboards/dashboard_operation.html:699 msgid "Cost (euros)" msgstr "Coût (euros)" @@ -481,7 +481,7 @@ msgid "Indexed?" msgstr "Indexé ?" #: forms.py:1207 forms.py:1272 models.py:619 -#: templates/ishtar/blocks/window_tables/administrativacts.html:8 +#: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" @@ -503,7 +503,7 @@ msgid "" "This index already exist for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -"Cet index existe déjà pour l'année : %(year)s, utilisez une valeur plus " +"Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" #: forms.py:1320 @@ -841,8 +841,8 @@ msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" #: models.py:656 -#: templates/ishtar/blocks/window_tables/administrativacts.html:5 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:5 +#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "Réf." @@ -1173,24 +1173,23 @@ msgstr "Documents du mobilier associé" msgid "Operation source" msgstr "Documentation associée à l'opération" -#: templates/ishtar/blocks/window_tables/administrativacts.html:6 -#: templates/ishtar/dashboards/dashboard_operation.html:82 +#: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "Type" -#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/administrativacts.html:9 msgid "Date" msgstr "Date" -#: templates/ishtar/blocks/window_tables/administrativacts.html:18 +#: templates/ishtar/blocks/window_tables/administrativacts.html:20 msgid "No administrative act associated" msgstr "Aucun acte administratif associé" -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:18 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:20 msgid "No archaeological site associated" msgstr "Pas d'entité archéologique associée" -#: templates/ishtar/blocks/window_tables/parcels.html:20 +#: templates/ishtar/blocks/window_tables/parcels.html:22 msgid "No parcel" msgstr "Pas de parcelle" @@ -1198,232 +1197,231 @@ msgstr "Pas de parcelle" msgid "Global informations" msgstr "Informations générales" -#: templates/ishtar/dashboards/dashboard_operation.html:15 -#: templates/ishtar/dashboards/dashboard_operation.html:111 -#: templates/ishtar/dashboards/dashboard_operation.html:329 -msgid "Total" -msgstr "Total" - -#: templates/ishtar/dashboards/dashboard_operation.html:17 -#: templates/ishtar/dashboards/dashboard_operation.html:30 -#: templates/ishtar/dashboards/dashboard_operation.html:113 -#: templates/ishtar/dashboards/dashboard_operation.html:152 -#: templates/ishtar/dashboards/dashboard_operation.html:184 -#: templates/ishtar/dashboards/dashboard_operation.html:331 -#: templates/ishtar/dashboards/dashboard_operation.html:370 +#: templates/ishtar/dashboards/dashboard_operation.html:14 +#: templates/ishtar/dashboards/dashboard_operation.html:160 +#: templates/ishtar/dashboards/dashboard_operation.html:459 +msgid "total" +msgstr "total" + +#: templates/ishtar/dashboards/dashboard_operation.html:18 +#: templates/ishtar/dashboards/dashboard_operation.html:32 +#: templates/ishtar/dashboards/dashboard_operation.html:164 +#: templates/ishtar/dashboards/dashboard_operation.html:254 +#: templates/ishtar/dashboards/dashboard_operation.html:463 +#: templates/ishtar/dashboards/dashboard_operation.html:517 msgid "Status" msgstr "État" -#: templates/ishtar/dashboards/dashboard_operation.html:17 -#: templates/ishtar/dashboards/dashboard_operation.html:113 -#: templates/ishtar/dashboards/dashboard_operation.html:302 -#: templates/ishtar/dashboards/dashboard_operation.html:331 -#: templates/ishtar/dashboards/dashboard_operation.html:482 +#: templates/ishtar/dashboards/dashboard_operation.html:18 +#: templates/ishtar/dashboards/dashboard_operation.html:164 +#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:463 +#: templates/ishtar/dashboards/dashboard_operation.html:685 msgid "Number" msgstr "Nombre" #: templates/ishtar/dashboards/dashboard_operation.html:28 -msgid "Area by type of operation" -msgstr "Surface par type d'opération" +msgid "area by type of operation" +msgstr "surface par type d'opération" -#: templates/ishtar/dashboards/dashboard_operation.html:30 +#: templates/ishtar/dashboards/dashboard_operation.html:32 msgid "Area (ha)" msgstr "Surface (ha)" -#: templates/ishtar/dashboards/dashboard_operation.html:41 -msgid "By types" -msgstr "Par types" +#: templates/ishtar/dashboards/dashboard_operation.html:42 +msgid "by types" +msgstr "par types" -#: templates/ishtar/dashboards/dashboard_operation.html:43 -#: templates/ishtar/dashboards/dashboard_operation.html:56 -#: templates/ishtar/dashboards/dashboard_operation.html:69 -#: templates/ishtar/dashboards/dashboard_operation.html:95 -#: templates/ishtar/dashboards/dashboard_operation.html:126 +#: templates/ishtar/dashboards/dashboard_operation.html:48 +#: templates/ishtar/dashboards/dashboard_operation.html:70 +#: templates/ishtar/dashboards/dashboard_operation.html:92 #: templates/ishtar/dashboards/dashboard_operation.html:139 -#: templates/ishtar/dashboards/dashboard_operation.html:260 -#: templates/ishtar/dashboards/dashboard_operation.html:344 -#: templates/ishtar/dashboards/dashboard_operation.html:357 -#: templates/ishtar/dashboards/dashboard_operation.html:440 +#: templates/ishtar/dashboards/dashboard_operation.html:180 +#: templates/ishtar/dashboards/dashboard_operation.html:202 +#: templates/ishtar/dashboards/dashboard_operation.html:369 +#: templates/ishtar/dashboards/dashboard_operation.html:479 +#: templates/ishtar/dashboards/dashboard_operation.html:499 +#: templates/ishtar/dashboards/dashboard_operation.html:623 msgid "State" msgstr "État" -#: templates/ishtar/dashboards/dashboard_operation.html:54 -#: templates/ishtar/dashboards/dashboard_operation.html:124 -#: templates/ishtar/dashboards/dashboard_operation.html:342 -msgid "By year" -msgstr "Par année" +#: templates/ishtar/dashboards/dashboard_operation.html:64 +#: templates/ishtar/dashboards/dashboard_operation.html:174 +#: templates/ishtar/dashboards/dashboard_operation.html:473 +msgid "by year" +msgstr "par année" -#: templates/ishtar/dashboards/dashboard_operation.html:67 -#: templates/ishtar/dashboards/dashboard_operation.html:137 -#: templates/ishtar/dashboards/dashboard_operation.html:355 -msgid "By realisation year" -msgstr "Par année de réalisation" +#: templates/ishtar/dashboards/dashboard_operation.html:86 +#: templates/ishtar/dashboards/dashboard_operation.html:196 +#: templates/ishtar/dashboards/dashboard_operation.html:493 +msgid "by realisation year" +msgstr "par année de réalisation" -#: templates/ishtar/dashboards/dashboard_operation.html:80 -msgid "Effective operation by type and year" -msgstr "Opération effective par type et année" +#: templates/ishtar/dashboards/dashboard_operation.html:108 +msgid "effective operation by type and year" +msgstr "opérations effectives par type et année" -#: templates/ishtar/dashboards/dashboard_operation.html:93 -msgid "By realisation month" -msgstr "Par mois de réalisation" +#: templates/ishtar/dashboards/dashboard_operation.html:133 +msgid "by realisation month" +msgstr "par mois de réalisation" -#: templates/ishtar/dashboards/dashboard_operation.html:106 +#: templates/ishtar/dashboards/dashboard_operation.html:156 msgid "Survey informations" msgstr "Informations : diagnostics" -#: templates/ishtar/dashboards/dashboard_operation.html:150 -msgid "Current year" -msgstr "Année en cours" - -#: templates/ishtar/dashboards/dashboard_operation.html:155 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:187 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:289 -#: templates/ishtar/dashboards/dashboard_operation.html:373 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:218 +msgid "current year" +msgstr "année en cours" + +#: templates/ishtar/dashboards/dashboard_operation.html:225 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:257 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:415 +#: templates/ishtar/dashboards/dashboard_operation.html:520 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Area" msgstr "Surface" -#: templates/ishtar/dashboards/dashboard_operation.html:158 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:190 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:376 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:228 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:260 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:523 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Man-day" msgstr "Jour-homme" -#: templates/ishtar/dashboards/dashboard_operation.html:161 -#: templates/ishtar/dashboards/dashboard_operation.html:171 -#: templates/ishtar/dashboards/dashboard_operation.html:193 -#: templates/ishtar/dashboards/dashboard_operation.html:203 -#: templates/ishtar/dashboards/dashboard_operation.html:379 -#: templates/ishtar/dashboards/dashboard_operation.html:389 +#: templates/ishtar/dashboards/dashboard_operation.html:231 +#: templates/ishtar/dashboards/dashboard_operation.html:240 +#: templates/ishtar/dashboards/dashboard_operation.html:263 +#: templates/ishtar/dashboards/dashboard_operation.html:274 +#: templates/ishtar/dashboards/dashboard_operation.html:526 +#: templates/ishtar/dashboards/dashboard_operation.html:537 msgid "Man-day/hectare" msgstr "Jour-homme/hectare" -#: templates/ishtar/dashboards/dashboard_operation.html:165 +#: templates/ishtar/dashboards/dashboard_operation.html:234 msgid "Man-day/hectare for effective operations (current year):" msgstr "Jour-homme/hectare pour les opérations effectives (année en cours) :" -#: templates/ishtar/dashboards/dashboard_operation.html:169 -msgid "Organizations (current year)" -msgstr "Organisations (année en cours)" +#: templates/ishtar/dashboards/dashboard_operation.html:236 +msgid "organizations (current year)" +msgstr "organisations (année en cours)" -#: templates/ishtar/dashboards/dashboard_operation.html:182 -#: templates/ishtar/dashboards/dashboard_operation.html:368 -msgid "Current realisation year" -msgstr "Année de réalisation en cours" +#: templates/ishtar/dashboards/dashboard_operation.html:250 +#: templates/ishtar/dashboards/dashboard_operation.html:513 +msgid "current realisation year" +msgstr "année de réalisation en cours" -#: templates/ishtar/dashboards/dashboard_operation.html:197 -#: templates/ishtar/dashboards/dashboard_operation.html:383 +#: templates/ishtar/dashboards/dashboard_operation.html:267 +#: templates/ishtar/dashboards/dashboard_operation.html:530 msgid "Man-day/hectare for effective operations (current realisation year):" msgstr "" "Jour-homme/hectare pour les opérations effectives (année de réalisation en " "cours) :" -#: templates/ishtar/dashboards/dashboard_operation.html:201 -#: templates/ishtar/dashboards/dashboard_operation.html:387 -msgid "Organizations (current realisation year)" -msgstr "Organisations (année de réalisation en cours)" +#: templates/ishtar/dashboards/dashboard_operation.html:270 +#: templates/ishtar/dashboards/dashboard_operation.html:533 +msgid "organizations (current realisation year)" +msgstr "organisations (année de réalisation en cours)" -#: templates/ishtar/dashboards/dashboard_operation.html:214 -#: templates/ishtar/dashboards/dashboard_operation.html:400 -msgid "Area by organization by year" -msgstr "Surface par organisation et par année" +#: templates/ishtar/dashboards/dashboard_operation.html:283 +#: templates/ishtar/dashboards/dashboard_operation.html:547 +msgid "area by organization by year" +msgstr "surface par organisation et par année" -#: templates/ishtar/dashboards/dashboard_operation.html:216 -#: templates/ishtar/dashboards/dashboard_operation.html:402 -#: templates/ishtar/dashboards/dashboard_operation.html:421 +#: templates/ishtar/dashboards/dashboard_operation.html:292 +#: templates/ishtar/dashboards/dashboard_operation.html:555 +#: templates/ishtar/dashboards/dashboard_operation.html:590 msgid "Organization" msgstr "Organisation" -#: templates/ishtar/dashboards/dashboard_operation.html:224 -#: templates/ishtar/dashboards/dashboard_operation.html:413 -#: templates/ishtar/dashboards/dashboard_operation.html:432 +#: templates/ishtar/dashboards/dashboard_operation.html:309 +#: templates/ishtar/dashboards/dashboard_operation.html:575 +#: templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "Moyenne" -#: templates/ishtar/dashboards/dashboard_operation.html:230 -msgid "Effective operations areas (ha)" -msgstr "Surface des opérations effectives (ha)" - -#: templates/ishtar/dashboards/dashboard_operation.html:235 -#: templates/ishtar/dashboards/dashboard_operation.html:273 -#: templates/ishtar/dashboards/dashboard_operation.html:286 -#: templates/ishtar/dashboards/dashboard_operation.html:410 -#: templates/ishtar/dashboards/dashboard_operation.html:429 -#: templates/ishtar/dashboards/dashboard_operation.html:453 -#: templates/ishtar/dashboards/dashboard_operation.html:466 +#: templates/ishtar/dashboards/dashboard_operation.html:315 +msgid "effective operations areas (ha)" +msgstr "surface des opérations effectives (ha)" + +#: templates/ishtar/dashboards/dashboard_operation.html:327 +#: templates/ishtar/dashboards/dashboard_operation.html:392 +#: templates/ishtar/dashboards/dashboard_operation.html:412 +#: templates/ishtar/dashboards/dashboard_operation.html:569 +#: templates/ishtar/dashboards/dashboard_operation.html:605 +#: templates/ishtar/dashboards/dashboard_operation.html:645 +#: templates/ishtar/dashboards/dashboard_operation.html:665 msgid "Sum" msgstr "Somme" -#: templates/ishtar/dashboards/dashboard_operation.html:238 -#: templates/ishtar/dashboards/dashboard_operation.html:252 +#: templates/ishtar/dashboards/dashboard_operation.html:332 +#: templates/ishtar/dashboards/dashboard_operation.html:356 msgid "Average" msgstr "Moyenne" -#: templates/ishtar/dashboards/dashboard_operation.html:244 -msgid "Man-Days/hectare by Year" -msgstr "Jours-homme/hectare par année" +#: templates/ishtar/dashboards/dashboard_operation.html:338 +msgid "man-days/hectare by year" +msgstr "jours-homme/hectare par année" -#: templates/ishtar/dashboards/dashboard_operation.html:249 +#: templates/ishtar/dashboards/dashboard_operation.html:350 msgid "Man-Days/hectare" msgstr "Jours-homme/hectare" -#: templates/ishtar/dashboards/dashboard_operation.html:258 -#: templates/ishtar/dashboards/dashboard_operation.html:438 -msgid "By month" -msgstr "Par mois" +#: templates/ishtar/dashboards/dashboard_operation.html:363 +#: templates/ishtar/dashboards/dashboard_operation.html:617 +msgid "by month" +msgstr "par mois" -#: templates/ishtar/dashboards/dashboard_operation.html:271 -#: templates/ishtar/dashboards/dashboard_operation.html:451 -msgid "By department" -msgstr "Par département" +#: templates/ishtar/dashboards/dashboard_operation.html:384 +#: templates/ishtar/dashboards/dashboard_operation.html:637 +msgid "by department" +msgstr "par département" -#: templates/ishtar/dashboards/dashboard_operation.html:284 -#: templates/ishtar/dashboards/dashboard_operation.html:464 -msgid "Effective operation by department" -msgstr "Opérations effectives par département" +#: templates/ishtar/dashboards/dashboard_operation.html:405 +#: templates/ishtar/dashboards/dashboard_operation.html:658 +msgid "effective operation by department" +msgstr "opérations effectives par département" -#: templates/ishtar/dashboards/dashboard_operation.html:289 -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:415 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "Nb." msgstr "Nb." -#: templates/ishtar/dashboards/dashboard_operation.html:300 -#: templates/ishtar/dashboards/dashboard_operation.html:480 -msgid "Main towns by number" -msgstr "Principales communes en nombre" +#: templates/ishtar/dashboards/dashboard_operation.html:428 +#: templates/ishtar/dashboards/dashboard_operation.html:681 +msgid "main towns by number" +msgstr "communes principales en nombre" -#: templates/ishtar/dashboards/dashboard_operation.html:313 -msgid "Main towns by surface" -msgstr "Principales communes en surface" +#: templates/ishtar/dashboards/dashboard_operation.html:442 +msgid "main towns by surface" +msgstr "communes principales en surface" -#: templates/ishtar/dashboards/dashboard_operation.html:315 +#: templates/ishtar/dashboards/dashboard_operation.html:446 msgid "Total surface (ha)" msgstr "Surface totale des terrains (ha)" -#: templates/ishtar/dashboards/dashboard_operation.html:325 +#: templates/ishtar/dashboards/dashboard_operation.html:456 msgid "Excavation informations" msgstr "Fouilles : informations" -#: templates/ishtar/dashboards/dashboard_operation.html:419 -msgid "Area by organization by realisation year" -msgstr "Surface par organisation et par année de réalisation" +#: templates/ishtar/dashboards/dashboard_operation.html:581 +msgid "area by organization by realisation year" +msgstr "surface par organisation et par année de réalisation" -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "Cost" msgstr "Coût" -#: templates/ishtar/dashboards/dashboard_operation.html:469 +#: templates/ishtar/dashboards/dashboard_operation.html:668 msgid "FNAP cost" msgstr "Coût FNAP" -#: templates/ishtar/dashboards/dashboard_operation.html:493 -msgid "Main towns by cost" -msgstr "Principales communes par coût" +#: templates/ishtar/dashboards/dashboard_operation.html:695 +msgid "main towns by cost" +msgstr "communes principales par coût" #: templates/ishtar/wizard/wizard_adminact_deletion.html:6 msgid "This act is indexed!" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 73e63840a..cc510c51c 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -10,7 +10,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-08-25 08:01-0400\n" +"PO-Revision-Date: 2016-08-29 11:39-0400\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" @@ -33,7 +33,7 @@ msgstr "Élément associé" msgid "Archaeological file" msgstr "Dossier" -#: context_processors.py:39 models.py:1434 +#: context_processors.py:39 models.py:1457 msgid "Operation" msgstr "Opération" @@ -161,7 +161,7 @@ msgstr "\"%(value)s\" n'est pas dans %(values)s" msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "Entrez un nom correct composé de lettres, espaces et tirets." -#: forms.py:71 forms_common.py:489 +#: forms.py:71 forms_common.py:490 msgid "Confirm" msgstr "Confirmer" @@ -185,12 +185,12 @@ msgstr "Vous devez sélectionner un élément." msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: forms.py:204 models.py:1211 +#: forms.py:204 models.py:1234 msgid "Template" msgstr "Patron" -#: forms_common.py:39 forms_common.py:57 forms_common.py:169 -#: forms_common.py:292 models.py:1277 models.py:2555 +#: forms_common.py:39 forms_common.py:57 forms_common.py:170 +#: forms_common.py:293 models.py:1300 models.py:2583 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -214,283 +214,283 @@ msgstr "" "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>" -#: forms_common.py:66 forms_common.py:717 ishtar_menu.py:47 models.py:1432 -#: models.py:2232 models.py:2379 models.py:2436 +#: forms_common.py:66 forms_common.py:718 ishtar_menu.py:47 models.py:1455 +#: models.py:2255 models.py:2407 models.py:2464 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" -#: forms_common.py:157 forms_common.py:233 forms_common.py:335 -#: ishtar_menu.py:71 models.py:1433 models.py:2149 +#: forms_common.py:158 forms_common.py:234 forms_common.py:336 +#: ishtar_menu.py:71 models.py:1456 models.py:2172 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" -#: forms_common.py:160 forms_common.py:196 forms_common.py:228 -#: forms_common.py:262 forms_common.py:330 models.py:886 models.py:1210 -#: models.py:1478 models.py:1696 models.py:2143 models.py:2219 models.py:2541 +#: forms_common.py:161 forms_common.py:197 forms_common.py:229 +#: forms_common.py:263 forms_common.py:331 models.py:902 models.py:1233 +#: models.py:1501 models.py:1719 models.py:2166 models.py:2242 models.py:2569 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Nom" -#: forms_common.py:161 models.py:1419 models.py:1827 +#: forms_common.py:162 models.py:1442 models.py:1850 msgid "Organization type" msgstr "Type d'organisation" -#: forms_common.py:163 forms_common.py:286 models.py:1272 +#: forms_common.py:164 forms_common.py:287 models.py:1295 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "Adresse" -#: forms_common.py:165 forms_common.py:289 models.py:1273 +#: forms_common.py:166 forms_common.py:290 models.py:1296 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "Complément d'adresse" -#: forms_common.py:167 forms_common.py:290 models.py:1275 +#: forms_common.py:168 forms_common.py:291 models.py:1298 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Code postal" -#: forms_common.py:170 forms_common.py:293 models.py:1278 +#: forms_common.py:171 forms_common.py:294 models.py:1301 msgid "Country" msgstr "Pays" -#: forms_common.py:172 forms_common.py:230 forms_common.py:266 -#: forms_common.py:332 forms_common.py:445 models.py:1305 +#: forms_common.py:173 forms_common.py:231 forms_common.py:267 +#: forms_common.py:333 forms_common.py:446 models.py:1328 msgid "Email" msgstr "Courriel" -#: forms_common.py:173 forms_common.py:269 models.py:1290 +#: forms_common.py:174 forms_common.py:270 models.py:1313 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:18 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "Téléphone" -#: forms_common.py:174 forms_common.py:278 models.py:1302 +#: forms_common.py:175 forms_common.py:279 models.py:1325 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:36 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "Téléphone portable" -#: forms_common.py:197 forms_common.py:231 forms_common.py:333 models.py:1854 -#: models.py:2145 models.py:2477 templates/sheet_ope.html:85 +#: forms_common.py:198 forms_common.py:232 forms_common.py:334 models.py:1877 +#: models.py:2168 models.py:2505 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 -#: templates/ishtar/blocks/window_tables/documents.html:6 +#: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" msgstr "Type" -#: forms_common.py:206 views.py:130 +#: forms_common.py:207 views.py:130 msgid "Organization search" msgstr "Recherche d'organisations" -#: forms_common.py:229 forms_common.py:260 forms_common.py:331 models.py:2217 +#: forms_common.py:230 forms_common.py:261 forms_common.py:332 models.py:2240 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" -#: forms_common.py:245 forms_common.py:318 views.py:95 +#: forms_common.py:246 forms_common.py:319 views.py:95 msgid "Person search" msgstr "Recherche de personnes" -#: forms_common.py:257 templates/ishtar/sheet_person.html:7 +#: forms_common.py:258 templates/ishtar/sheet_person.html:7 #: templates/ishtar/wizard/wizard_person.html:6 msgid "Identity" msgstr "Identité" -#: forms_common.py:259 forms_common.py:643 forms_common.py:684 models.py:2215 -#: models.py:2474 templates/sheet_ope.html:104 -#: templates/ishtar/blocks/window_tables/documents.html:5 +#: forms_common.py:260 forms_common.py:644 forms_common.py:685 models.py:2238 +#: models.py:2502 templates/sheet_ope.html:104 +#: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:264 models.py:2221 +#: forms_common.py:265 models.py:2244 msgid "Raw name" msgstr "Nom brut" -#: forms_common.py:267 models.py:1291 +#: forms_common.py:268 models.py:1314 msgid "Phone description" msgstr "Type de téléphone" -#: forms_common.py:270 models.py:1293 models.py:1295 +#: forms_common.py:271 models.py:1316 models.py:1318 msgid "Phone description 2" msgstr "Type de téléphone 2" -#: forms_common.py:272 +#: forms_common.py:273 msgid "Phone 2" msgstr "Téléphone 2" -#: forms_common.py:274 models.py:1299 +#: forms_common.py:275 models.py:1322 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: forms_common.py:276 models.py:1297 +#: forms_common.py:277 models.py:1320 msgid "Phone 3" msgstr "Téléphone 3" -#: forms_common.py:281 +#: forms_common.py:282 msgid "Current organization" msgstr "Organisation actuelle" -#: forms_common.py:295 models.py:1280 +#: forms_common.py:296 models.py:1303 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: forms_common.py:298 models.py:1283 +#: forms_common.py:299 models.py:1306 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: forms_common.py:300 models.py:1284 +#: forms_common.py:301 models.py:1307 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: forms_common.py:302 models.py:1286 +#: forms_common.py:303 models.py:1309 msgid "Other address: town" msgstr "Autre adresse : ville" -#: forms_common.py:304 models.py:1288 +#: forms_common.py:305 models.py:1311 msgid "Other address: country" msgstr "Autre adresse : pays" -#: forms_common.py:314 +#: forms_common.py:315 msgid "Already has an account" msgstr "As déjà un compte" -#: forms_common.py:329 +#: forms_common.py:330 msgid "Username" msgstr "Nom d'utilisateur" -#: forms_common.py:347 +#: forms_common.py:348 msgid "Account search" msgstr "Recherche de comptes" -#: forms_common.py:394 forms_common.py:424 forms_common.py:428 models.py:2197 +#: forms_common.py:395 forms_common.py:425 forms_common.py:429 models.py:2220 msgid "Person type" msgstr "Type de personne" -#: forms_common.py:439 forms_common.py:444 ishtar_menu.py:32 +#: forms_common.py:440 forms_common.py:445 ishtar_menu.py:32 msgid "Account" msgstr "Compte" -#: forms_common.py:448 wizards.py:1170 +#: forms_common.py:449 wizards.py:1170 msgid "New password" msgstr "Nouveau mot de passe" -#: forms_common.py:451 +#: forms_common.py:452 msgid "New password (confirmation)" msgstr "Nouveau mot de passe (confirmation)" -#: forms_common.py:470 +#: forms_common.py:471 msgid "Your password and confirmation password do not match." msgstr "La vérification du mot de passe a échoué." -#: forms_common.py:475 +#: forms_common.py:476 msgid "You must provide a correct password." msgstr "Vous devez fournir un mot de passe correct." -#: forms_common.py:483 +#: forms_common.py:484 msgid "This username already exists." msgstr "Ce nom d'utilisateur existe déjà." -#: forms_common.py:490 +#: forms_common.py:491 msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:499 forms_common.py:512 models.py:2556 +#: forms_common.py:500 forms_common.py:513 models.py:2584 msgid "Towns" msgstr "Communes" -#: forms_common.py:509 +#: forms_common.py:510 msgid "There are identical towns." msgstr "Il y a des communes identiques." -#: forms_common.py:593 +#: forms_common.py:594 msgid "Only one choice can be checked." msgstr "Seul un choix peut être coché." -#: forms_common.py:641 +#: forms_common.py:642 msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:645 forms_common.py:685 models.py:1828 models.py:2457 +#: forms_common.py:646 forms_common.py:686 models.py:1851 models.py:2485 msgid "Source type" msgstr "Type de document" -#: forms_common.py:647 forms_common.py:686 templates/sheet_ope.html:84 +#: forms_common.py:648 forms_common.py:687 templates/sheet_ope.html:84 msgid "Reference" msgstr "Référence" -#: forms_common.py:650 forms_common.py:687 +#: forms_common.py:651 forms_common.py:688 msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:653 models.py:2488 +#: forms_common.py:654 models.py:2516 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:654 models.py:2490 +#: forms_common.py:655 models.py:2518 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:656 models.py:1981 models.py:2492 +#: forms_common.py:657 models.py:2004 models.py:2520 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:659 models.py:2495 +#: forms_common.py:660 models.py:2523 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" -#: forms_common.py:661 forms_common.py:689 models.py:287 models.py:516 -#: models.py:1723 models.py:2225 models.py:2502 +#: forms_common.py:662 forms_common.py:690 models.py:287 models.py:516 +#: models.py:1746 models.py:2248 models.py:2530 msgid "Comment" msgstr "Commentaire" -#: forms_common.py:663 forms_common.py:688 models.py:888 models.py:1482 -#: models.py:1655 models.py:1697 models.py:2501 templates/sheet_ope.html:128 +#: forms_common.py:664 forms_common.py:689 models.py:904 models.py:1505 +#: models.py:1678 models.py:1720 models.py:2529 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:666 models.py:2503 +#: forms_common.py:667 models.py:2531 msgid "Additional information" msgstr "Informations supplémentaires" -#: forms_common.py:668 forms_common.py:692 models.py:2505 +#: forms_common.py:669 forms_common.py:693 models.py:2533 msgid "Has a duplicate" msgstr "Existe en doublon" -#: forms_common.py:681 forms_common.py:710 forms_common.py:743 models.py:2441 +#: forms_common.py:682 forms_common.py:711 forms_common.py:744 models.py:2469 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" -#: forms_common.py:691 +#: forms_common.py:692 msgid "Additional informations" msgstr "Informations complémentaires" -#: forms_common.py:702 +#: forms_common.py:703 msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:718 models.py:1829 models.py:2431 models.py:2438 +#: forms_common.py:719 models.py:1852 models.py:2459 models.py:2466 msgid "Author type" msgstr "Type d'auteur" -#: forms_common.py:736 +#: forms_common.py:737 msgid "Author selection" msgstr "Sélection d'auteur" -#: forms_common.py:750 +#: forms_common.py:751 msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:754 models.py:2442 models.py:2484 +#: forms_common.py:755 models.py:2470 models.py:2512 #: templates/sheet_ope.html:106 -#: templates/ishtar/blocks/window_tables/documents.html:7 +#: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" msgstr "Auteurs" @@ -506,7 +506,7 @@ msgstr "Ajouter/Modifier" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1006 views.py:1232 +#: ishtar_menu.py:39 models.py:1029 views.py:1232 msgid "Global variables" msgstr "Variables globales" @@ -530,12 +530,12 @@ msgstr "Modification" msgid "Merge" msgstr "Fusion" -#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2018 widgets.py:110 +#: ishtar_menu.py:66 ishtar_menu.py:93 models.py:2041 widgets.py:110 #: templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "Suppression" -#: ishtar_menu.py:101 models.py:1992 +#: ishtar_menu.py:101 models.py:2015 msgid "Imports" msgstr "Imports" @@ -563,7 +563,7 @@ msgstr "Un élément sélectionné n'est pas valide." msgid "This item already exists." msgstr "Cet élément existe déjà." -#: models.py:283 models.py:515 models.py:1245 models.py:1257 +#: models.py:283 models.py:515 models.py:1268 models.py:1280 msgid "Label" msgstr "Libellé" @@ -571,11 +571,11 @@ msgstr "Libellé" msgid "Textual ID" msgstr "Identifiant textuel" -#: models.py:288 models.py:518 models.py:1214 +#: models.py:288 models.py:518 models.py:1237 msgid "Available" msgstr "Disponible" -#: models.py:537 models.py:1769 +#: models.py:537 models.py:1792 msgid "Key" msgstr "Clé" @@ -591,7 +591,7 @@ msgstr "Dernier éditeur" msgid "Creator" msgstr "Créateur" -#: models.py:766 models.py:2567 +#: models.py:766 models.py:2595 msgid "Order" msgstr "Ordre" @@ -607,47 +607,47 @@ msgstr "Petit libellé" msgid "Cannot have symmetrical and an inverse_relation" msgstr "Ne peut pas être symétrique et avoir une relation inverse" -#: models.py:880 +#: models.py:896 msgid "Euro" msgstr "Euro" -#: models.py:881 +#: models.py:897 msgid "US dollar" msgstr "Dollars US" -#: models.py:887 models.py:1480 +#: models.py:903 models.py:1503 msgid "Slug" msgstr "Identifiant texte" -#: models.py:889 +#: models.py:905 msgid "Files module" msgstr "Module Dossiers" -#: models.py:890 +#: models.py:906 msgid "Context records module" msgstr "Module Unités d'Enregistrement" -#: models.py:892 +#: models.py:908 msgid "Finds module" msgstr "Module Mobilier" -#: models.py:893 +#: models.py:909 msgid "Need context records module" msgstr "Nécessite le module Unités d'Enregistrement" -#: models.py:895 +#: models.py:911 msgid "Warehouses module" msgstr "Module Dépôts" -#: models.py:896 +#: models.py:912 msgid "Need finds module" msgstr "Nécessite le module mobilier" -#: models.py:898 +#: models.py:914 msgid "Home page" msgstr "Page d'accueil" -#: models.py:899 +#: models.py:915 msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax." @@ -655,22 +655,22 @@ msgstr "" "Page d'accueil d'Ishtar. Si elle n'est pas définie une page d'accueil par " "défaut va apparaître. Utiliser la syntaxe Markdown." -#: models.py:902 +#: models.py:918 msgid "File external id" msgstr "Identifiant externe de fichier" -#: models.py:904 +#: models.py:920 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "Formule pour gérer les identifiants externes" -#: models.py:909 +#: models.py:925 msgid "Parcel external id" msgstr "Identifiant externe de parcelle" -#: models.py:912 +#: models.py:928 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -680,11 +680,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:917 +#: models.py:933 msgid "Context record external id" msgstr "Identifiant externe d'unité d'enregistrement" -#: models.py:919 +#: models.py:935 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -694,11 +694,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:924 +#: models.py:940 msgid "Base find external id" msgstr "Identifiant externe de mobilier de base" -#: models.py:926 +#: models.py:942 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -708,11 +708,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:931 +#: models.py:947 msgid "Find external id" msgstr "Identifiant externe de mobilier" -#: models.py:933 +#: models.py:949 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -722,631 +722,645 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:937 +#: models.py:954 +msgid "Raw name for person" +msgstr "Nom brut pour une personne" + +#: models.py:956 +msgid "" +"Formula to manage person raw_name. Change this with care. With incorrect " +"formula, the application might be unusable and import of external data can " +"be destructive." +msgstr "" +"Formule pour gérer le nom brut des personnes. À manipuler avec précaution. " +"Une formule incorrecte peut rendre l'application inutilisable et l'import de " +"données externes peut alors être destructif." + +#: models.py:960 msgid "Current active" msgstr "Actuellement utilisé" -#: models.py:938 +#: models.py:961 msgid "Currency" msgstr "Devise" -#: models.py:942 +#: models.py:965 msgid "Ishtar site profile" msgstr "Profil d'instance Ishtar" -#: models.py:943 +#: models.py:966 msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" -#: models.py:999 +#: models.py:1022 msgid "Variable name" msgstr "Nom de la variable" -#: models.py:1000 +#: models.py:1023 msgid "Description of the variable" msgstr "Description de la variable" -#: models.py:1002 models.py:1770 +#: models.py:1025 models.py:1793 msgid "Value" msgstr "Valeur" -#: models.py:1005 +#: models.py:1028 msgid "Global variable" msgstr "Variable globale" -#: models.py:1115 models.py:1145 +#: models.py:1138 models.py:1168 msgid "Total" msgstr "Total" -#: models.py:1122 models.py:1246 models.py:1258 +#: models.py:1145 models.py:1269 models.py:1281 #: templates/ishtar/sheet_person.html:21 -#: templates/ishtar/dashboards/dashboard_main_detail.html:135 +#: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 #: templates/ishtar/wizard/wizard_person.html:20 msgid "Number" msgstr "Nombre" -#: models.py:1209 +#: models.py:1232 msgid "Administrative Act" msgstr "Acte administratif" -#: models.py:1213 +#: models.py:1236 msgid "Associated object" msgstr "Objet associé" -#: models.py:1217 +#: models.py:1240 msgid "Document template" msgstr "Patron de document" -#: models.py:1218 +#: models.py:1241 msgid "Document templates" msgstr "Patrons de documents" -#: models.py:1249 models.py:1259 models.py:1976 +#: models.py:1272 models.py:1282 models.py:1999 msgid "State" msgstr "État" -#: models.py:1263 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1286 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: models.py:1264 +#: models.py:1287 msgid "Departments" msgstr "Départements" -#: models.py:1301 +#: models.py:1324 msgid "Raw phone" msgstr "Téléphone brut" -#: models.py:1307 +#: models.py:1330 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: models.py:1346 +#: models.py:1369 msgid "Tel: " msgstr "Tél :" -#: models.py:1350 +#: models.py:1373 msgid "Mobile: " msgstr "Mobile :" -#: models.py:1354 +#: models.py:1377 msgid "Email: " msgstr "Courriel :" -#: models.py:1359 +#: models.py:1382 msgid "Merge key" msgstr "Clé de fusion" -#: models.py:1420 +#: models.py:1443 msgid "Organization types" msgstr "Types d'organisation" -#: models.py:1436 +#: models.py:1459 msgid "Archaeological site" msgstr "Entité Archéologique" -#: models.py:1437 +#: models.py:1460 msgid "Parcels" msgstr "Parcelles" -#: models.py:1439 +#: models.py:1462 msgid "Operation source" msgstr "Documentation de l'opération" -#: models.py:1442 views.py:1057 views.py:1108 +#: models.py:1465 views.py:1057 views.py:1108 msgid "Archaeological files" msgstr "Dossiers archéologiques" -#: models.py:1444 views.py:1060 views.py:1116 +#: models.py:1467 views.py:1060 views.py:1116 msgid "Context records" msgstr "Unités d'Enregistrement" -#: models.py:1446 +#: models.py:1469 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:1448 views.py:1062 views.py:1119 +#: models.py:1471 views.py:1062 views.py:1119 msgid "Finds" msgstr "Mobilier" -#: models.py:1484 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1507 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "Utilisateurs" -#: models.py:1486 +#: models.py:1509 msgid "Associated model" msgstr "Modèle associé" -#: models.py:1489 +#: models.py:1512 msgid "Is template" msgstr "Est un patron" -#: models.py:1490 +#: models.py:1513 msgid "Unicity keys (separator \";\")" msgstr "Clés d'unicité (séparateur « ; »)" -#: models.py:1494 +#: models.py:1517 msgid "Importer - Type" msgstr "Importeur - Type" -#: models.py:1495 +#: models.py:1518 msgid "Importer - Types" msgstr "Importeur - Types" -#: models.py:1585 +#: models.py:1608 msgid "Importer - Default" msgstr "Importeur - Par défaut" -#: models.py:1586 +#: models.py:1609 msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: models.py:1621 +#: models.py:1644 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: models.py:1622 +#: models.py:1645 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: models.py:1654 +#: models.py:1677 msgid "Column number" msgstr "Numéro de colonne" -#: models.py:1657 +#: models.py:1680 msgid "Required" msgstr "Requis" -#: models.py:1660 +#: models.py:1683 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: models.py:1661 +#: models.py:1684 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: models.py:1681 +#: models.py:1704 msgid "Field name" msgstr "Nom du champ" -#: models.py:1683 models.py:1717 +#: models.py:1706 models.py:1740 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: models.py:1685 models.py:1719 +#: models.py:1708 models.py:1742 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: models.py:1687 models.py:1721 +#: models.py:1710 models.py:1744 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: models.py:1691 +#: models.py:1714 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: models.py:1692 +#: models.py:1715 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: models.py:1699 +#: models.py:1722 msgid "Regular expression" msgstr "Expression régulière" -#: models.py:1702 +#: models.py:1725 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: models.py:1703 +#: models.py:1726 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: models.py:1726 +#: models.py:1749 msgid "Importer - Target" msgstr "Importeur - Cible" -#: models.py:1727 +#: models.py:1750 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: models.py:1751 views.py:343 +#: models.py:1774 views.py:343 msgid "True" msgstr "Oui" -#: models.py:1752 views.py:345 +#: models.py:1775 views.py:345 msgid "False" msgstr "Non" -#: models.py:1771 +#: models.py:1794 msgid "Is set" msgstr "Est défini" -#: models.py:1778 +#: models.py:1801 msgid "Importer - Target key" msgstr "Importeur - Rapprochement" -#: models.py:1779 +#: models.py:1802 msgid "Importer - Targets keys" msgstr "Importeur - Rapprochements" -#: models.py:1830 models.py:2469 models.py:2480 +#: models.py:1853 models.py:2497 models.py:2508 msgid "Format" msgstr "Format" -#: models.py:1831 models.py:2571 +#: models.py:1854 models.py:2599 msgid "Operation type" msgstr "Type d'opération" -#: models.py:1832 +#: models.py:1855 msgid "Period" msgstr "Périodes" -#: models.py:1833 +#: models.py:1856 msgid "Report state" msgstr "État de rapport" -#: models.py:1834 +#: models.py:1857 msgid "Unit" msgstr "Unité" -#: models.py:1835 +#: models.py:1858 msgid "Material" msgstr "Matériau" -#: models.py:1837 +#: models.py:1860 msgid "Conservatory state" msgstr "État de conservation" -#: models.py:1838 +#: models.py:1861 msgid "Preservation type" msgstr "Type de conservation" -#: models.py:1839 +#: models.py:1862 msgid "Object type" msgstr "Type d'objet" -#: models.py:1841 +#: models.py:1864 msgid "Identification type" msgstr "Type d'identification" -#: models.py:1843 +#: models.py:1866 msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:1844 models.py:2463 +#: models.py:1867 models.py:2491 msgid "Support type" msgstr "Type de support" -#: models.py:1850 +#: models.py:1873 msgid "Integer" msgstr "Entier" -#: models.py:1851 +#: models.py:1874 msgid "Float" msgstr "Nombre à virgule" -#: models.py:1852 +#: models.py:1875 msgid "String" msgstr "Chaîne de caractères" -#: models.py:1853 templates/sheet_ope.html:86 +#: models.py:1876 templates/sheet_ope.html:86 msgid "Date" msgstr "Date" -#: models.py:1855 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 -#: templates/ishtar/dashboards/dashboard_main_detail.html:120 +#: models.py:1878 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "Année" -#: models.py:1856 +#: models.py:1879 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: models.py:1857 +#: models.py:1880 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: models.py:1858 +#: models.py:1881 msgid "Unknow type" msgstr "Type inconnu" -#: models.py:1874 +#: models.py:1897 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: models.py:1875 +#: models.py:1898 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: models.py:1876 +#: models.py:1899 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: models.py:1886 +#: models.py:1909 msgid "Options" msgstr "Options" -#: models.py:1888 +#: models.py:1911 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: models.py:1892 +#: models.py:1915 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: models.py:1893 +#: models.py:1916 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: models.py:1940 templates/ishtar/dashboards/dashboard_main_detail.html:61 +#: models.py:1963 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "Créé" -#: models.py:1941 +#: models.py:1964 msgid "Analyse in progress" msgstr "Analyse en cours" -#: models.py:1942 +#: models.py:1965 msgid "Analysed" msgstr "Analysé" -#: models.py:1943 +#: models.py:1966 msgid "Import pending" msgstr "Import en attente" -#: models.py:1944 +#: models.py:1967 msgid "Import in progress" msgstr "Import en cours" -#: models.py:1945 +#: models.py:1968 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: models.py:1946 +#: models.py:1969 msgid "Finished" msgstr "Terminé" -#: models.py:1947 +#: models.py:1970 msgid "Archived" msgstr "Archivé" -#: models.py:1959 +#: models.py:1982 msgid "Imported file" msgstr "Fichier importé" -#: models.py:1962 +#: models.py:1985 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:1964 +#: models.py:1987 msgid "Encoding" msgstr "Codage" -#: models.py:1966 +#: models.py:1989 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:1967 templates/ishtar/import_list.html:47 +#: models.py:1990 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "Fichier erreur" -#: models.py:1970 +#: models.py:1993 msgid "Result file" msgstr "Fichier résultant" -#: models.py:1973 templates/ishtar/import_list.html:53 +#: models.py:1996 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:1979 +#: models.py:2002 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:1984 +#: models.py:2007 msgid "End date" msgstr "Date de fin" -#: models.py:1986 +#: models.py:2009 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:1991 +#: models.py:2014 msgid "Import" msgstr "Import" -#: models.py:2008 +#: models.py:2031 msgid "Analyse" msgstr "Analyser" -#: models.py:2010 models.py:2013 +#: models.py:2033 models.py:2036 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2011 +#: models.py:2034 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2014 +#: models.py:2037 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2015 +#: models.py:2038 msgid "Archive" msgstr "Archiver" -#: models.py:2017 +#: models.py:2040 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2150 +#: models.py:2173 msgid "Organizations" msgstr "Organisations" -#: models.py:2152 +#: models.py:2175 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2153 +#: models.py:2176 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2154 +#: models.py:2177 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2156 +#: models.py:2179 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2158 +#: models.py:2181 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2193 +#: models.py:2216 msgid "Groups" msgstr "Groupes" -#: models.py:2198 +#: models.py:2221 msgid "Person types" msgstr "Types de personne" -#: models.py:2205 +#: models.py:2228 msgid "Mr" msgstr "M." -#: models.py:2206 +#: models.py:2229 msgid "Miss" msgstr "Mlle" -#: models.py:2207 +#: models.py:2230 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2208 +#: models.py:2231 msgid "Mrs" msgstr "Mme" -#: models.py:2209 +#: models.py:2232 msgid "Doctor" msgstr "Dr." -#: models.py:2223 +#: models.py:2246 msgid "Contact type" msgstr "Type de contact" -#: models.py:2226 models.py:2273 +#: models.py:2249 models.py:2296 msgid "Types" msgstr "Types" -#: models.py:2229 +#: models.py:2252 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2233 +#: models.py:2256 msgid "Persons" msgstr "Personnes" -#: models.py:2235 +#: models.py:2258 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2236 +#: models.py:2259 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2237 +#: models.py:2260 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2238 +#: models.py:2261 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2239 +#: models.py:2262 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2383 +#: models.py:2411 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2384 +#: models.py:2412 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2426 +#: models.py:2454 msgid "To modify the password use the form in Auth > User" msgstr "" "Pour modifier le mot de passe, utilisez le formulaire dans Authentification " "> Utilisateurs" -#: models.py:2432 +#: models.py:2460 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2458 +#: models.py:2486 msgid "Source types" msgstr "Types de document" -#: models.py:2464 +#: models.py:2492 msgid "Support types" msgstr "Types de support" -#: models.py:2470 +#: models.py:2498 msgid "Formats" msgstr "Formats" -#: models.py:2475 +#: models.py:2503 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2478 +#: models.py:2506 msgid "Support" msgstr "Support" -#: models.py:2482 +#: models.py:2510 msgid "Scale" msgstr "Échelle" -#: models.py:2496 +#: models.py:2524 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2497 +#: models.py:2525 msgid "Ref." msgstr "Réf." -#: models.py:2500 +#: models.py:2528 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:2542 +#: models.py:2570 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:2543 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2571 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:2568 +#: models.py:2596 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:2572 +#: models.py:2600 msgid "Operation types" msgstr "Types d'opération" -#: models.py:2598 +#: models.py:2626 msgid "Preventive" msgstr "Préventif" -#: models.py:2599 +#: models.py:2627 msgid "Research" msgstr "Programmé" -#: utils.py:51 +#: utils.py:52 msgid " (...)" msgstr " (...)" @@ -1510,6 +1524,22 @@ msgstr "Éléments sélectionnés par défaut" msgid "Current items" msgstr "Éléments courants" +#: templates/base.html:125 +msgid "Processing..." +msgstr "En traitement..." + +#: templates/base.html:126 +msgid "This can be long." +msgstr "Cela peut être long." + +#: templates/base.html:127 +msgid "Time to take a coffee?" +msgstr "Il est temps de prendre un café ?" + +#: templates/base.html:128 +msgid "Time to take another coffee?" +msgstr "Pourquoi pas un autre café ?" + #: templates/sheet_ope.html:4 msgid "Export as:" msgstr "Export en :" @@ -2079,12 +2109,12 @@ msgstr "Exporter en fichier OpenOffice.org" msgid "Export as PDF file" msgstr "Exporter en fichier PDF" -#: templates/ishtar/blocks/window_tables/documents.html:8 +#: templates/ishtar/blocks/window_tables/documents.html:10 msgid "Related to" msgstr "Associé à" -#: templates/ishtar/blocks/window_tables/documents.html:9 -#: templates/ishtar/blocks/window_tables/documents.html:17 +#: templates/ishtar/blocks/window_tables/documents.html:11 +#: templates/ishtar/blocks/window_tables/documents.html:19 msgid "Link" msgstr "Lien" @@ -2114,61 +2144,56 @@ msgstr "Afficher comme une image" msgid "Right-click on this image to save it." msgstr "Clic droit sur l'image pour l'enregistrer." -#: templates/ishtar/dashboards/dashboard_main_detail.html:39 +#: templates/ishtar/dashboards/dashboard_main_detail.html:41 msgid "By years" msgstr "Par années" -#: templates/ishtar/dashboards/dashboard_main_detail.html:41 -#: templates/ishtar/dashboards/dashboard_main_detail.html:51 +#: templates/ishtar/dashboards/dashboard_main_detail.html:43 +#: templates/ishtar/dashboards/dashboard_main_detail.html:53 msgid "Average:" msgstr "Moyenne :" -#: templates/ishtar/dashboards/dashboard_main_detail.html:42 -#: templates/ishtar/dashboards/dashboard_main_detail.html:52 +#: templates/ishtar/dashboards/dashboard_main_detail.html:44 +#: templates/ishtar/dashboards/dashboard_main_detail.html:54 msgid "Variance:" msgstr "Variance :" -#: templates/ishtar/dashboards/dashboard_main_detail.html:43 -#: templates/ishtar/dashboards/dashboard_main_detail.html:53 +#: templates/ishtar/dashboards/dashboard_main_detail.html:45 +#: templates/ishtar/dashboards/dashboard_main_detail.html:55 msgid "Standard deviation:" msgstr "Écart-type :" -#: templates/ishtar/dashboards/dashboard_main_detail.html:44 -#: templates/ishtar/dashboards/dashboard_main_detail.html:54 +#: templates/ishtar/dashboards/dashboard_main_detail.html:46 +#: templates/ishtar/dashboards/dashboard_main_detail.html:56 msgid "Median:" msgstr "Médiane :" -#: templates/ishtar/dashboards/dashboard_main_detail.html:45 -#: templates/ishtar/dashboards/dashboard_main_detail.html:55 +#: templates/ishtar/dashboards/dashboard_main_detail.html:47 +#: templates/ishtar/dashboards/dashboard_main_detail.html:57 msgid "Mode:" msgstr "Mode :" -#: templates/ishtar/dashboards/dashboard_main_detail.html:49 +#: templates/ishtar/dashboards/dashboard_main_detail.html:51 msgid "By operations" msgstr "Par opérations" -#: templates/ishtar/dashboards/dashboard_main_detail.html:58 +#: templates/ishtar/dashboards/dashboard_main_detail.html:61 msgid "Created last" msgstr "Dernières créations" -#: templates/ishtar/dashboards/dashboard_main_detail.html:65 -#: templates/ishtar/dashboards/dashboard_main_detail.html:76 -msgid "Show" -msgstr "Voir" - -#: templates/ishtar/dashboards/dashboard_main_detail.html:69 +#: templates/ishtar/dashboards/dashboard_main_detail.html:74 msgid "Recent changes" msgstr "Dernières modifications" -#: templates/ishtar/dashboards/dashboard_main_detail.html:72 +#: templates/ishtar/dashboards/dashboard_main_detail.html:76 msgid "Modified" msgstr "Modifié" -#: templates/ishtar/dashboards/dashboard_main_detail.html:108 +#: templates/ishtar/dashboards/dashboard_main_detail.html:114 msgid "No data for these criteria." msgstr "Pas de données pour ces critères." -#: templates/ishtar/dashboards/dashboard_main_detail.html:126 +#: templates/ishtar/dashboards/dashboard_main_detail.html:132 msgid "Month" msgstr "Mois" diff --git a/version.py b/version.py index cf2359d30..9f846e91f 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 97, 2) +VERSION = (0, 97, 3) def get_version(): |