summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-02-02 17:16:54 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-02-02 17:16:54 +0100
commit6433f39eb437c068f3de33a8e7a19ae3ed9e941c (patch)
tree3e03ef36120c8d2bc635952600c0d3cef34163d6
parent6e76724c700da8a77cc64c96262c6a685ad5382b (diff)
downloadIshtar-6433f39eb437c068f3de33a8e7a19ae3ed9e941c.tar.bz2
Ishtar-6433f39eb437c068f3de33a8e7a19ae3ed9e941c.zip
Better management of the application name (using django Site application) - Change account activation email - Update french translation
-rw-r--r--ishtar/furnitures/context_processors.py4
-rw-r--r--ishtar/furnitures/forms.py21
-rw-r--r--ishtar/locale/fr/LC_MESSAGES/django.po505
-rw-r--r--ishtar/settings.py.example1
-rw-r--r--ishtar/templates/account_activation_email.txt13
5 files changed, 294 insertions, 250 deletions
diff --git a/ishtar/furnitures/context_processors.py b/ishtar/furnitures/context_processors.py
index f81b6f7c3..31ff816c5 100644
--- a/ishtar/furnitures/context_processors.py
+++ b/ishtar/furnitures/context_processors.py
@@ -18,6 +18,7 @@
# See the file COPYING for details.
from django.utils.translation import ugettext, ugettext_lazy as _
+from django.contrib.sites.models import Site
from ishtar import settings
from menus import Menu
@@ -25,8 +26,7 @@ import models
def get_base_context(request):
dct = {'URL_PATH':settings.URL_PATH}
- if settings.APP_NAME:
- dct["APP_NAME"] = settings.APP_NAME
+ dct["APP_NAME"] = Site.objects.get_current().name
dct["COUNTRY"] = settings.COUNTRY
if 'MENU' not in request.session or \
request.session['MENU'].user != request.user:
diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py
index d73f3e849..41fd58edd 100644
--- a/ishtar/furnitures/forms.py
+++ b/ishtar/furnitures/forms.py
@@ -30,13 +30,14 @@ from django.utils import formats
from django.utils.functional import lazy
from django.utils.translation import ugettext_lazy as _
from django.shortcuts import render_to_response
-from django.template import Context, RequestContext
+from django.template import Context, RequestContext, loader
from django.db.models import Max
from django import forms
from django.core.mail import send_mail
from django.forms.formsets import formset_factory, BaseFormSet, \
DELETION_FIELD_NAME
from django.contrib.auth.models import User
+from django.contrib.sites.models import Site
from formwizard.forms import NamedUrlSessionFormWizard
@@ -512,13 +513,19 @@ class AccountWizard(Wizard):
if 'send_password' in dct and dct['send_password'] and \
settings.ADMINS:
- app_name = settings.APP_NAME and (" - " + settings.APP_NAME) or ""
- subject = u"[Ishtar%(app_name)s] Account creation/modification" % {
+ site = Site.objects.get_current()
+
+ app_name = site and ("Ishtar - " + site.name) \
+ or "Ishtar"
+ context = Context({'login':dct['username'],
+ 'password':dct['password'],
+ 'app_name':app_name,
+ 'site': site and site.domain or ""
+ })
+ t = loader.get_template('account_activation_email.txt')
+ msg = t.render(context)
+ subject = u"[%(app_name)s] Account creation/modification" % {
"app_name":app_name}
- msg = _(u"You can now log into Ishtar.\n\n"
- u" * Login: %(login)s\n"
- u" * Password: %(password)s" % {'login':dct['username'],
- 'password':dct['password']})
send_mail(subject, msg, settings.ADMINS[0][1],
[dct['email']], fail_silently=True)
res = render_to_response('wizard_done.html', {},
diff --git a/ishtar/locale/fr/LC_MESSAGES/django.po b/ishtar/locale/fr/LC_MESSAGES/django.po
index fda4a2d20..1a1de8905 100644
--- a/ishtar/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-01 00:20+0100\n"
+"POT-Creation-Date: 2011-02-02 17:12+0100\n"
"PO-Revision-Date: 2010-12-09\n"
"Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
"Language-Team: \n"
@@ -28,269 +28,256 @@ msgstr "identifiant"
msgid "email address"
msgstr "courriel"
-#: furnitures/context_processors.py:42 furnitures/forms.py:680
-#: furnitures/forms.py:1201 furnitures/models.py:595 furnitures/models.py:617
+#: furnitures/context_processors.py:42 furnitures/forms.py:689
+#: furnitures/forms.py:1212 furnitures/models.py:600 furnitures/models.py:622
msgid "Archaelogical file"
msgstr "Dossier archéologique"
-#: furnitures/context_processors.py:43 furnitures/forms.py:1167
-#: furnitures/models.py:371 furnitures/models.py:400 furnitures/models.py:596
-#: furnitures/models.py:615
+#: furnitures/context_processors.py:43 furnitures/forms.py:1178
+#: furnitures/models.py:376 furnitures/models.py:405 furnitures/models.py:601
+#: furnitures/models.py:620
msgid "Operation"
msgstr "Opération"
-#: furnitures/forms.py:51 furnitures/forms.py:583
+#: furnitures/forms.py:52 furnitures/forms.py:590
msgid "Confirm"
msgstr "Confirmation"
-#: furnitures/forms.py:416
+#: furnitures/forms.py:417
msgid "Enter a valid name consisting of letters, spaces and hyphens."
msgstr "Entrez un nom correct composé de lettres, espaces et tirets."
-#: furnitures/forms.py:422 furnitures/forms.py:425 furnitures/models.py:222
-#: furnitures/models.py:241 furnitures/models.py:711 furnitures/models.py:735
-#: furnitures/models.py:750
+#: furnitures/forms.py:423 furnitures/forms.py:426 furnitures/models.py:222
+#: furnitures/models.py:241 furnitures/models.py:716 furnitures/models.py:740
+#: furnitures/models.py:755
msgid "Person"
msgstr "Individu"
-#: furnitures/forms.py:431
+#: furnitures/forms.py:432
msgid "Identity"
msgstr "Identité"
-#: furnitures/forms.py:434 furnitures/models.py:209 furnitures/models.py:484
+#: furnitures/forms.py:435 furnitures/models.py:209 furnitures/models.py:489
msgid "Title"
msgstr "Titre"
-#: furnitures/forms.py:435 furnitures/models.py:210
+#: furnitures/forms.py:436 furnitures/models.py:210
msgid "Surname"
msgstr "Prénom"
-#: furnitures/forms.py:437 furnitures/models.py:181 furnitures/models.py:211
-#: furnitures/models.py:574 furnitures/models.py:676 furnitures/widgets.py:220
+#: furnitures/forms.py:438 furnitures/models.py:181 furnitures/models.py:211
+#: furnitures/models.py:579 furnitures/models.py:681
msgid "Name"
msgstr "Nom"
-#: furnitures/forms.py:439 furnitures/forms.py:548 furnitures/models.py:212
+#: furnitures/forms.py:440 furnitures/forms.py:555 furnitures/models.py:212
msgid "Email"
msgstr "Courriel"
-#: furnitures/forms.py:441 furnitures/models.py:200
+#: furnitures/forms.py:442 furnitures/models.py:200
msgid "Person type"
msgstr "Type d'individu"
-#: furnitures/forms.py:443
+#: furnitures/forms.py:444
msgid "Current organization"
msgstr "Organisation actuelle"
-#: furnitures/forms.py:447 furnitures/models.py:216
+#: furnitures/forms.py:448 furnitures/models.py:216
msgid "Is an author?"
msgstr "Est un auteur ?"
-#: furnitures/forms.py:450 furnitures/models.py:218
+#: furnitures/forms.py:451 furnitures/models.py:218
msgid "In charge of a storage?"
msgstr "Est responsable d'un dépôt ?"
-#: furnitures/forms.py:472 furnitures/forms.py:550
+#: furnitures/forms.py:473 furnitures/forms.py:557
msgid "New password"
msgstr "Nouveau mot de passe"
-#: furnitures/forms.py:518
-#, python-format
-msgid ""
-"You can now log into Ishtar.\n"
-"\n"
-" * Login: %(login)s\n"
-" * Password: %(password)s"
-msgstr ""
-"Vous pouvez maintenant vous identifier sur Ishtar.\n"
-"\n"
-" * Identifiant : %(login)s\n"
-" * Mot de passe : %(password)s"
-
-#: furnitures/forms.py:543 furnitures/forms.py:547
+#: furnitures/forms.py:550 furnitures/forms.py:554
msgid "Account"
msgstr "Compte"
-#: furnitures/forms.py:554
+#: furnitures/forms.py:561
msgid "New password (confirmation)"
msgstr "Nouveau mot de passe (confirmation)"
-#: furnitures/forms.py:572
+#: furnitures/forms.py:579
msgid "Your password and confirmation password do not match."
msgstr "La vérification du mot de passe a échoué."
-#: furnitures/forms.py:577
+#: furnitures/forms.py:584
msgid "You must provide a correct password."
msgstr "Vous devez fournir un mot de passe correct."
-#: furnitures/forms.py:584
+#: furnitures/forms.py:591
msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
-#: furnitures/forms.py:671 furnitures/forms.py:758 furnitures/forms.py:786
-#: furnitures/forms.py:1158 furnitures/forms.py:1246 furnitures/models.py:164
-#: furnitures/models.py:403 furnitures/models.py:690
+#: furnitures/forms.py:678 furnitures/forms.py:767 furnitures/forms.py:795
+#: furnitures/forms.py:1167 furnitures/forms.py:1257 furnitures/models.py:164
+#: furnitures/models.py:408 furnitures/models.py:695
msgid "Town"
msgstr "Commune"
-#: furnitures/forms.py:675 furnitures/forms.py:725 furnitures/models.py:279
+#: furnitures/forms.py:682 furnitures/forms.py:734 furnitures/models.py:281
msgid "File type"
msgstr "Type de dossier"
-#: furnitures/forms.py:677 furnitures/forms.py:715 furnitures/forms.py:735
-#: furnitures/forms.py:792 furnitures/forms.py:1164 furnitures/forms.py:1209
-#: furnitures/models.py:274 furnitures/models.py:354 furnitures/models.py:401
+#: furnitures/forms.py:684 furnitures/forms.py:885
+msgid "Saisine type"
+msgstr "Type de saisine"
+
+#: furnitures/forms.py:686 furnitures/forms.py:724 furnitures/forms.py:744
+#: furnitures/forms.py:801 furnitures/forms.py:1175 furnitures/forms.py:1220
+#: furnitures/models.py:276 furnitures/models.py:358 furnitures/models.py:406
msgid "Year"
msgstr "Année"
-#: furnitures/forms.py:691
+#: furnitures/forms.py:700
msgid "You should select a file."
msgstr "Vous devez sélectionner un dossier archéologique."
-#: furnitures/forms.py:706 furnitures/forms.py:1189
+#: furnitures/forms.py:715 furnitures/forms.py:1200
msgid "General"
msgstr "Général"
-#: furnitures/forms.py:710 furnitures/models.py:281 furnitures/models.py:578
+#: furnitures/forms.py:719 furnitures/models.py:283 furnitures/models.py:583
msgid "Person in charge"
msgstr "Responsable"
-#: furnitures/forms.py:719 furnitures/forms.py:737 furnitures/models.py:276
+#: furnitures/forms.py:728 furnitures/forms.py:746 furnitures/models.py:278
msgid "Numeric reference"
msgstr "Référence numérique"
-#: furnitures/forms.py:721 furnitures/forms.py:739 furnitures/models.py:277
+#: furnitures/forms.py:730 furnitures/forms.py:748 furnitures/models.py:279
msgid "Internal reference"
msgstr "Référence interne"
-#: furnitures/forms.py:723 furnitures/models.py:292
+#: furnitures/forms.py:732 furnitures/models.py:294
msgid "Creation date"
msgstr "Date de création"
-#: furnitures/forms.py:727 furnitures/models.py:296
+#: furnitures/forms.py:736 furnitures/models.py:298
msgid "Related file"
msgstr "Dossier en relation avec"
-#: furnitures/forms.py:731 furnitures/forms.py:1213 furnitures/models.py:111
-#: furnitures/models.py:311 furnitures/models.py:367 furnitures/models.py:579
-#: furnitures/models.py:654
+#: furnitures/forms.py:740 furnitures/forms.py:1224 furnitures/models.py:111
+#: furnitures/models.py:313 furnitures/models.py:372 furnitures/models.py:584
+#: furnitures/models.py:659
msgid "Comment"
msgstr "Commentaire"
-#: furnitures/forms.py:743 furnitures/models.py:159
+#: furnitures/forms.py:752 furnitures/models.py:159
msgid "Address"
msgstr "Adresse"
-#: furnitures/forms.py:745 furnitures/models.py:303
+#: furnitures/forms.py:754 furnitures/models.py:305
msgid "Total surface"
msgstr "Surface totale"
-#: furnitures/forms.py:748 furnitures/models.py:306
+#: furnitures/forms.py:757 furnitures/models.py:308
msgid "Main address"
msgstr "Adresse principale"
-#: furnitures/forms.py:749 furnitures/models.py:307
+#: furnitures/forms.py:758 furnitures/models.py:309
msgid "Main address - complement"
msgstr "Adresse principale - complément"
-#: furnitures/forms.py:751 furnitures/models.py:309
+#: furnitures/forms.py:760 furnitures/models.py:311
msgid "Main address - postal code"
msgstr "Adresse principale - code postal"
-#: furnitures/forms.py:755 furnitures/forms.py:781 furnitures/forms.py:1244
-#: furnitures/forms.py:1265 furnitures/forms.py:1269 furnitures/models.py:361
-#: furnitures/models.py:691
+#: furnitures/forms.py:764 furnitures/forms.py:790 furnitures/forms.py:1255
+#: furnitures/forms.py:1276 furnitures/forms.py:1280 furnitures/models.py:293
+#: furnitures/models.py:365 furnitures/models.py:696
msgid "Towns"
msgstr "Communes"
-#: furnitures/forms.py:777
+#: furnitures/forms.py:786
msgid "There are identical towns."
msgstr "Il y a des communes identiques."
-#: furnitures/forms.py:784 furnitures/forms.py:846 furnitures/forms.py:1272
-#: furnitures/forms.py:1293 furnitures/forms.py:1297 furnitures/models.py:409
+#: furnitures/forms.py:793 furnitures/forms.py:855 furnitures/forms.py:1283
+#: furnitures/forms.py:1304 furnitures/forms.py:1308 furnitures/models.py:414
msgid "Parcels"
msgstr "Parcelles"
-#: furnitures/forms.py:788 furnitures/models.py:404
+#: furnitures/forms.py:797 furnitures/models.py:409
msgid "Section"
msgstr "Section"
-#: furnitures/forms.py:790 furnitures/models.py:405
+#: furnitures/forms.py:799 furnitures/models.py:410
msgid "Parcel number"
msgstr "Numéro de parcelle"
-#: furnitures/forms.py:820
+#: furnitures/forms.py:829
msgid "All fields are required"
msgstr "Tous les champs sont nécessaires"
-#: furnitures/forms.py:841
+#: furnitures/forms.py:850
msgid "There are identical parcels."
msgstr "Il y a des parcelles identiques."
-#: furnitures/forms.py:849
+#: furnitures/forms.py:858
msgid "Preventive informations"
msgstr "Information archéologie préventive"
-#: furnitures/forms.py:854 furnitures/models.py:283
+#: furnitures/forms.py:863 furnitures/models.py:285
msgid "General contractor"
msgstr "Aménageur"
-#: furnitures/forms.py:861 furnitures/models.py:285
+#: furnitures/forms.py:870 furnitures/models.py:287
msgid "Town planning service"
msgstr "Service instructeur"
-#: furnitures/forms.py:867 furnitures/models.py:263 furnitures/models.py:286
+#: furnitures/forms.py:876 furnitures/models.py:263 furnitures/models.py:288
msgid "Permit type"
msgstr "Type de permis"
-#: furnitures/forms.py:869 furnitures/models.py:288
+#: furnitures/forms.py:878 furnitures/models.py:290
msgid "Permit reference"
msgstr "Référence du permis"
-#: furnitures/forms.py:872 furnitures/models.py:304
+#: furnitures/forms.py:881 furnitures/models.py:306
msgid "Total developed surface"
msgstr "Surface totale aménagée"
-#: furnitures/forms.py:876
-msgid "Saisine type"
-msgstr "Type de saisine"
-
-#: furnitures/forms.py:878 furnitures/models.py:294
+#: furnitures/forms.py:887 furnitures/models.py:296
msgid "Reception date"
msgstr "Date de réception"
-#: furnitures/forms.py:966
+#: furnitures/forms.py:975
msgid "Associated operations"
msgstr "Opérations associées"
-#: furnitures/forms.py:985
+#: furnitures/forms.py:994
msgid "Would you like to delete this archaelogical file ?"
msgstr "Voulez vous supprimer ce dossier archéologique ?"
-#: furnitures/forms.py:1034 furnitures/forms.py:1387 furnitures/models.py:625
-#: furnitures/models.py:749
+#: furnitures/forms.py:1043 furnitures/forms.py:1398 furnitures/models.py:630
+#: furnitures/models.py:754
msgid "Administrative act"
msgstr "Acte administratif"
-#: furnitures/forms.py:1035 furnitures/forms.py:1388 furnitures/models.py:601
-#: furnitures/models.py:605
+#: furnitures/forms.py:1044 furnitures/forms.py:1399 furnitures/models.py:606
+#: furnitures/models.py:610
msgid "Act type"
msgstr "Type d'acte"
-#: furnitures/forms.py:1037 furnitures/models.py:613
+#: furnitures/forms.py:1046 furnitures/models.py:618
msgid "Signatory"
msgstr "Signataire"
-#: furnitures/forms.py:1041 furnitures/models.py:619
+#: furnitures/forms.py:1050 furnitures/models.py:624
msgid "Object"
msgstr "Objet"
-#: furnitures/forms.py:1043 furnitures/models.py:618
+#: furnitures/forms.py:1052 furnitures/models.py:623
msgid "Signature date"
msgstr "Date de signature"
-#: furnitures/forms.py:1152
+#: furnitures/forms.py:1161
msgid ""
"Warning: No Archaelogical File is provided. If you have forget it return to "
"the first step."
@@ -298,34 +285,38 @@ msgstr ""
"Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un "
"oubli, définissez le à la première étape."
-#: furnitures/forms.py:1162 furnitures/forms.py:1205 furnitures/models.py:341
-#: furnitures/models.py:359
+#: furnitures/forms.py:1171 furnitures/forms.py:1216 furnitures/models.py:343
+#: furnitures/models.py:363
msgid "Operation type"
msgstr "Type d'opération"
-#: furnitures/forms.py:1178
+#: furnitures/forms.py:1173 furnitures/models.py:364
+msgid "Remains"
+msgstr "Vestiges"
+
+#: furnitures/forms.py:1189
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
-#: furnitures/forms.py:1194 furnitures/models.py:607
+#: furnitures/forms.py:1205 furnitures/models.py:612
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: furnitures/forms.py:1207 furnitures/models.py:350 furnitures/models.py:418
-#: furnitures/models.py:442 furnitures/models.py:558 furnitures/models.py:712
-#: furnitures/models.py:751
+#: furnitures/forms.py:1218 furnitures/models.py:354 furnitures/models.py:423
+#: furnitures/models.py:447 furnitures/models.py:563 furnitures/models.py:717
+#: furnitures/models.py:756
msgid "Start date"
msgstr "Date de début"
-#: furnitures/forms.py:1217
+#: furnitures/forms.py:1228
msgid "References"
msgstr "Référence"
-#: furnitures/forms.py:1227
+#: furnitures/forms.py:1238
msgid "Code DRACAR"
msgstr "Code DRACAR"
-#: furnitures/forms.py:1238
+#: furnitures/forms.py:1249
#, python-format
msgid ""
"Operation code already exist for year: %(year)d - use a value bigger than "
@@ -334,32 +325,32 @@ msgstr ""
"Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "
"plus grande que %(last_val)d"
-#: furnitures/forms.py:1274 furnitures/models.py:408 furnitures/models.py:452
-#: furnitures/models.py:557
+#: furnitures/forms.py:1285 furnitures/models.py:413 furnitures/models.py:457
+#: furnitures/models.py:562
msgid "Parcel"
msgstr "Parcelle"
-#: furnitures/forms.py:1300 furnitures/forms.py:1325 furnitures/models.py:347
+#: furnitures/forms.py:1311 furnitures/forms.py:1336 furnitures/models.py:349
msgid "Remain types"
msgstr "Types de vestige"
-#: furnitures/forms.py:1302 furnitures/models.py:346
+#: furnitures/forms.py:1313 furnitures/models.py:348
msgid "Remain type"
msgstr "Type de vestige"
-#: furnitures/forms.py:1320
+#: furnitures/forms.py:1331
msgid "There are identical remain types."
msgstr "Il y a des types de vestige identiques."
-#: furnitures/forms.py:1347 furnitures/forms.py:1348 furnitures/models.py:351
+#: furnitures/forms.py:1358 furnitures/forms.py:1359 furnitures/models.py:355
msgid "Closing date"
msgstr "Date de clotûre"
-#: furnitures/forms.py:1358
+#: furnitures/forms.py:1369
msgid "Would you like to close this operation?"
msgstr "Voulez vous clôturer cette opération ?"
-#: furnitures/forms.py:1376
+#: furnitures/forms.py:1387
msgid "Would you like to delete this operation?"
msgstr "Voulez vous supprimer cette opération ?"
@@ -427,8 +418,8 @@ msgstr "Élément invalide."
msgid "This item already exist."
msgstr "Cet élément existe déjà."
-#: furnitures/models.py:108 furnitures/models.py:147 furnitures/models.py:453
-#: furnitures/models.py:504 furnitures/models.py:528
+#: furnitures/models.py:108 furnitures/models.py:147 furnitures/models.py:458
+#: furnitures/models.py:509 furnitures/models.py:533
msgid "Label"
msgstr "Libellé"
@@ -484,7 +475,7 @@ msgstr "Type d'organisation"
msgid "Organization types"
msgstr "Types d'organisation"
-#: furnitures/models.py:183 furnitures/models.py:213 furnitures/models.py:485
+#: furnitures/models.py:183 furnitures/models.py:213 furnitures/models.py:490
msgid "Type"
msgstr "Type"
@@ -584,468 +575,464 @@ msgstr "Types de permis"
msgid "Delay (in days)"
msgstr "Delai (en jours)"
-#: furnitures/models.py:290
+#: furnitures/models.py:292
msgid "Is active?"
msgstr "Est actif ?"
-#: furnitures/models.py:301
+#: furnitures/models.py:303
msgid "Reference number"
msgstr "Référence"
-#: furnitures/models.py:315
+#: furnitures/models.py:317
msgid "Archaeological file"
msgstr "Dossier archéologique"
-#: furnitures/models.py:316
+#: furnitures/models.py:318
msgid "Archaeological files"
msgstr "Dossiers archéologiques"
-#: furnitures/models.py:318
+#: furnitures/models.py:320
msgid "Can view own Archaelogical file"
msgstr "Peut voir son propre Dossier archéologique"
-#: furnitures/models.py:319
+#: furnitures/models.py:321
msgid "Can add own Archaelogical file"
msgstr "Peut ajouter son propre Dossier archéologique"
-#: furnitures/models.py:320
+#: furnitures/models.py:322
msgid "Can change own Archaelogical file"
msgstr "Peut changer son propre Dossier archéologique"
-#: furnitures/models.py:321
+#: furnitures/models.py:323
msgid "Can delete own Archaelogical file"
msgstr "Peut supprimer son propre Dossier archéologique"
-#: furnitures/models.py:326 furnitures/models.py:381
+#: furnitures/models.py:328 furnitures/models.py:386
msgid "Intercommunal"
msgstr "Intercommunal"
-#: furnitures/models.py:342
+#: furnitures/models.py:344
msgid "Operation types"
msgstr "Types d'opération"
-#: furnitures/models.py:353
+#: furnitures/models.py:357
msgid "In charge"
msgstr "Responsable"
-#: furnitures/models.py:355
+#: furnitures/models.py:359
msgid "Operation code"
msgstr "Code de l'opération"
-#: furnitures/models.py:357 furnitures/models.py:398
+#: furnitures/models.py:361 furnitures/models.py:403
msgid "File"
msgstr "Dossier"
-#: furnitures/models.py:360
-msgid "Remains"
-msgstr "Vestiges"
-
-#: furnitures/models.py:372
+#: furnitures/models.py:377
msgid "Operations"
msgstr "Opérations"
-#: furnitures/models.py:374
+#: furnitures/models.py:379
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: furnitures/models.py:375
+#: furnitures/models.py:380
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: furnitures/models.py:376
+#: furnitures/models.py:381
msgid "Can change own Operation"
msgstr "Peut changer sa propre Opération"
-#: furnitures/models.py:377
+#: furnitures/models.py:382
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: furnitures/models.py:417 furnitures/models.py:527
+#: furnitures/models.py:422 furnitures/models.py:532
msgid "Order"
msgstr "Ordre"
-#: furnitures/models.py:419 furnitures/models.py:443 furnitures/models.py:559
-#: furnitures/models.py:713 furnitures/models.py:752
+#: furnitures/models.py:424 furnitures/models.py:448 furnitures/models.py:564
+#: furnitures/models.py:718 furnitures/models.py:757
msgid "End date"
msgstr "Date de fin"
-#: furnitures/models.py:420
+#: furnitures/models.py:425
msgid "Parent period"
msgstr "Période parente"
-#: furnitures/models.py:424
+#: furnitures/models.py:429
msgid "Type Period"
msgstr "Type de période"
-#: furnitures/models.py:425
+#: furnitures/models.py:430
msgid "Types Period"
msgstr "Types de période"
-#: furnitures/models.py:432 furnitures/models.py:444
+#: furnitures/models.py:437 furnitures/models.py:449
msgid "Dating type"
msgstr "Type de datation"
-#: furnitures/models.py:433
+#: furnitures/models.py:438
msgid "Dating types"
msgstr "Types de datation"
-#: furnitures/models.py:437
+#: furnitures/models.py:442
msgid "Dating quality"
msgstr "Qualité de datation"
-#: furnitures/models.py:438
+#: furnitures/models.py:443
msgid "Dating qualities"
msgstr "Qualités de datation"
-#: furnitures/models.py:441
+#: furnitures/models.py:446
msgid "Period"
msgstr "Période"
-#: furnitures/models.py:445
+#: furnitures/models.py:450
msgid "Quality"
msgstr "Qualité"
-#: furnitures/models.py:448 furnitures/models.py:539
+#: furnitures/models.py:453 furnitures/models.py:544
msgid "Dating"
msgstr "Datation"
-#: furnitures/models.py:449
+#: furnitures/models.py:454
msgid "Datings"
msgstr "Datations"
-#: furnitures/models.py:454 furnitures/models.py:505 furnitures/models.py:529
+#: furnitures/models.py:459 furnitures/models.py:510 furnitures/models.py:534
msgid "Description"
msgstr "Description"
-#: furnitures/models.py:455 furnitures/models.py:638
+#: furnitures/models.py:460 furnitures/models.py:643
msgid "Lenght"
msgstr "Longueur"
-#: furnitures/models.py:456 furnitures/models.py:639
+#: furnitures/models.py:461 furnitures/models.py:644
msgid "Width"
msgstr "Largeur"
-#: furnitures/models.py:457
+#: furnitures/models.py:462
msgid "Thickness"
msgstr "Épaisseur"
-#: furnitures/models.py:458
+#: furnitures/models.py:463
msgid "Depth"
msgstr "Profondeur"
-#: furnitures/models.py:460
+#: furnitures/models.py:465
msgid "Interpretation"
msgstr "Interpretation"
-#: furnitures/models.py:461
+#: furnitures/models.py:466
msgid "Filling"
msgstr "Remplissage"
-#: furnitures/models.py:466 furnitures/models.py:507
+#: furnitures/models.py:471 furnitures/models.py:512
msgid "Registration Unit"
msgstr "Unité d'Enregistrement"
-#: furnitures/models.py:467
+#: furnitures/models.py:472
msgid "Registration Units"
msgstr "Unités d'Enregistrement"
-#: furnitures/models.py:469
+#: furnitures/models.py:474
msgid "Can view own Registration Unit"
msgstr "Peut voir sa propre Unité d'Enregistrement"
-#: furnitures/models.py:470
+#: furnitures/models.py:475
msgid "Can add own Registration Unit"
msgstr "Peut ajouter sa propre Unité d'Enregistrement"
-#: furnitures/models.py:471
+#: furnitures/models.py:476
msgid "Can change own Registration Unit"
msgstr "Peut changer sa propre Unité d'Enregistrement"
-#: furnitures/models.py:472
+#: furnitures/models.py:477
msgid "Can delete own Registration Unit"
msgstr "Peut supprimer sa propre Unité d'Enregistrement"
-#: furnitures/models.py:480
+#: furnitures/models.py:485
msgid "Source type"
msgstr "Type de source"
-#: furnitures/models.py:481
+#: furnitures/models.py:486
msgid "Source types"
msgstr "Types de source"
-#: furnitures/models.py:488 furnitures/models.py:736
+#: furnitures/models.py:493 furnitures/models.py:741
msgid "Source"
msgstr "Source"
-#: furnitures/models.py:489
+#: furnitures/models.py:494
msgid "Sources"
msgstr "Sources"
-#: furnitures/models.py:495
+#: furnitures/models.py:500
msgid "Recommendation"
msgstr "Recommendation"
-#: furnitures/models.py:497
+#: furnitures/models.py:502
msgid "Parent material"
msgstr "Matériau parent"
-#: furnitures/models.py:500 furnitures/models.py:531
+#: furnitures/models.py:505 furnitures/models.py:536
msgid "Material type"
msgstr "Type de matériaux"
-#: furnitures/models.py:501
+#: furnitures/models.py:506
msgid "Material types"
msgstr "Types de matériaux"
-#: furnitures/models.py:508
+#: furnitures/models.py:513
msgid "Is isolated?"
msgstr "Est isolé ?"
-#: furnitures/models.py:513 furnitures/models.py:526
+#: furnitures/models.py:518 furnitures/models.py:531
msgid "Base item"
msgstr "Élément de base"
-#: furnitures/models.py:514
+#: furnitures/models.py:519
msgid "Base items"
msgstr "Éléments de base"
-#: furnitures/models.py:516
+#: furnitures/models.py:521
msgid "Can view own Base item"
msgstr "Peut voir son propre Élément de base"
-#: furnitures/models.py:517
+#: furnitures/models.py:522
msgid "Can add own Base item"
msgstr "Peut ajouter son propre Élément de base"
-#: furnitures/models.py:518
+#: furnitures/models.py:523
msgid "Can change own Base item"
msgstr "Peut changer son propre Élément de base"
-#: furnitures/models.py:519
+#: furnitures/models.py:524
msgid "Can delete own Base item"
msgstr "Peut supprimer son propre Élément de base"
-#: furnitures/models.py:532 furnitures/models.py:641
+#: furnitures/models.py:537 furnitures/models.py:646
msgid "Volume"
msgstr "Volume"
-#: furnitures/models.py:533
+#: furnitures/models.py:538
msgid "Weight"
msgstr "Poids"
-#: furnitures/models.py:534
+#: furnitures/models.py:539
msgid "Item number"
msgstr "Nombre d'éléments"
-#: furnitures/models.py:536
+#: furnitures/models.py:541
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: furnitures/models.py:538
+#: furnitures/models.py:543
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: furnitures/models.py:543 furnitures/models.py:747
+#: furnitures/models.py:548 furnitures/models.py:752
msgid "Item"
msgstr "Élément"
-#: furnitures/models.py:544
+#: furnitures/models.py:549
msgid "Items"
msgstr "Éléments"
-#: furnitures/models.py:546
+#: furnitures/models.py:551
msgid "Can view own Item"
msgstr "Peut voir son propre Élément"
-#: furnitures/models.py:547
+#: furnitures/models.py:552
msgid "Can add own Item"
msgstr "Peut ajouter son propre Élément"
-#: furnitures/models.py:548
+#: furnitures/models.py:553
msgid "Can change own Item"
msgstr "Peut changer son propre Élément"
-#: furnitures/models.py:549
+#: furnitures/models.py:554
msgid "Can delete own Item"
msgstr "Peut supprimer son propre Élément"
-#: furnitures/models.py:556
+#: furnitures/models.py:561
msgid "Owner"
msgstr "Propriétaire"
-#: furnitures/models.py:562
+#: furnitures/models.py:567
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: furnitures/models.py:563
+#: furnitures/models.py:568
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: furnitures/models.py:570 furnitures/models.py:576
+#: furnitures/models.py:575 furnitures/models.py:581
msgid "Warehouse type"
msgstr "Type de dépôt"
-#: furnitures/models.py:571
+#: furnitures/models.py:576
msgid "Warehouse types"
msgstr "Types de dépôts"
-#: furnitures/models.py:582
+#: furnitures/models.py:587
msgid "Warehouse"
msgstr "Dépôt"
-#: furnitures/models.py:583
+#: furnitures/models.py:588
msgid "Warehouses"
msgstr "Dépôts"
-#: furnitures/models.py:585
+#: furnitures/models.py:590
msgid "Can view own Warehouse"
msgstr "Peut voir son propre Dépôt"
-#: furnitures/models.py:586
+#: furnitures/models.py:591
msgid "Can add own Warehouse"
msgstr "Peut ajouter son propre Dépôt"
-#: furnitures/models.py:587
+#: furnitures/models.py:592
msgid "Can change own Warehouse"
msgstr "Peut changer son propre Dépôt"
-#: furnitures/models.py:588
+#: furnitures/models.py:593
msgid "Can delete own Warehouse"
msgstr "Peut supprimer son propre Dépôt"
-#: furnitures/models.py:598
+#: furnitures/models.py:603
msgid "Intended to"
msgstr "Destiné à"
-#: furnitures/models.py:602
+#: furnitures/models.py:607
msgid "Act types"
msgstr "Types d'acte"
-#: furnitures/models.py:609
+#: furnitures/models.py:614
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: furnitures/models.py:611
+#: furnitures/models.py:616
msgid "Person in charge of the scientific part"
msgstr "Responsable scientifique"
-#: furnitures/models.py:626
+#: furnitures/models.py:631
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: furnitures/models.py:628
+#: furnitures/models.py:633
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: furnitures/models.py:629
+#: furnitures/models.py:634
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: furnitures/models.py:630
+#: furnitures/models.py:635
msgid "Can change own Administrative act"
msgstr "Peut changer son propre Acte administratif"
-#: furnitures/models.py:631
+#: furnitures/models.py:636
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: furnitures/models.py:640
+#: furnitures/models.py:645
msgid "Height"
msgstr "Hauteur"
-#: furnitures/models.py:642 furnitures/models.py:649 furnitures/models.py:653
+#: furnitures/models.py:647 furnitures/models.py:654 furnitures/models.py:658
msgid "Reference"
msgstr "Référence"
-#: furnitures/models.py:645 furnitures/models.py:652
+#: furnitures/models.py:650 furnitures/models.py:657
msgid "Container type"
msgstr "Type de contenant"
-#: furnitures/models.py:646
+#: furnitures/models.py:651
msgid "Container types"
msgstr "Types de contenant"
-#: furnitures/models.py:650 furnitures/models.py:710
+#: furnitures/models.py:655 furnitures/models.py:715
msgid "Location"
msgstr "Lieu"
-#: furnitures/models.py:657 furnitures/models.py:707
+#: furnitures/models.py:662 furnitures/models.py:712
msgid "Container"
msgstr "Contenant"
-#: furnitures/models.py:658
+#: furnitures/models.py:663
msgid "Containers"
msgstr "Contenants"
-#: furnitures/models.py:677
+#: furnitures/models.py:682
msgid "Surface"
msgstr "Surface"
-#: furnitures/models.py:678
+#: furnitures/models.py:683
msgid "Localisation"
msgstr "Localisation"
-#: furnitures/models.py:701
+#: furnitures/models.py:706
msgid "Virtual"
msgstr "Virtuel"
-#: furnitures/models.py:703 furnitures/models.py:709
+#: furnitures/models.py:708 furnitures/models.py:714
msgid "Treatment type"
msgstr "Type de traitement"
-#: furnitures/models.py:704
+#: furnitures/models.py:709
msgid "Treatment types"
msgstr "Types de traitements"
-#: furnitures/models.py:717
+#: furnitures/models.py:722
msgid "Treatment"
msgstr "Traitement"
-#: furnitures/models.py:718
+#: furnitures/models.py:723
msgid "Treatments"
msgstr "Traitements"
-#: furnitures/models.py:720
+#: furnitures/models.py:725
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: furnitures/models.py:721
+#: furnitures/models.py:726
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: furnitures/models.py:722
+#: furnitures/models.py:727
msgid "Can change own Treatment"
msgstr "Peut changer son propre Traitement"
-#: furnitures/models.py:723
+#: furnitures/models.py:728
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre traitement"
-#: furnitures/models.py:731 furnitures/models.py:737
+#: furnitures/models.py:736 furnitures/models.py:742
msgid "Author type"
msgstr "Type d'auteur"
-#: furnitures/models.py:732
+#: furnitures/models.py:737
msgid "Author types"
msgstr "Types d'auteur"
-#: furnitures/models.py:740
+#: furnitures/models.py:745
msgid "Author"
msgstr "Auteur"
-#: furnitures/models.py:741
+#: furnitures/models.py:746
msgid "Authors"
msgstr "Auteurs"
-#: furnitures/models.py:755
+#: furnitures/models.py:760
msgid "Property"
msgstr "Propriété"
-#: furnitures/models.py:756
+#: furnitures/models.py:761
msgid "Properties"
msgstr "Propriétés"
-#: furnitures/views.py:295
+#: furnitures/views.py:258
msgid "Operation not permitted."
msgstr "Opération non permise"
@@ -1053,26 +1040,52 @@ msgstr "Opération non permise"
msgid "Delete"
msgstr "Supprimer"
-#: furnitures/widgets.py:152
+#: furnitures/widgets.py:144
msgid "Search"
msgstr "Recherche"
-#: furnitures/widgets.py:152
+#: furnitures/widgets.py:144
msgid "Search and select an item"
msgstr "Rechercher puis sélectionner un élément"
-#: furnitures/widgets.py:170
+#: furnitures/widgets.py:166
msgid "Export as CSV"
msgstr "Export en CSV"
-#: furnitures/widgets.py:221
+#: furnitures/widgets.py:217
msgid "No results"
msgstr "Pas de résultats"
-#: furnitures/widgets.py:222
+#: furnitures/widgets.py:217
msgid "Loading..."
msgstr "Chargement..."
+#: templates/account_activation_email.txt:3
+#, python-format
+msgid "Your account on %(app_name)s has been created or modified."
+msgstr "Votre compte sur %(app_name)s a été créé ou modifié"
+
+#: templates/account_activation_email.txt:5
+msgid "Login:"
+msgstr "Identifiant : "
+
+#: templates/account_activation_email.txt:6
+msgid "Password:"
+msgstr "Mot de passe : "
+
+#: templates/account_activation_email.txt:8
+msgid "You can log in here:"
+msgstr "Vous pouvez vous identifier ici : "
+
+#: templates/account_activation_email.txt:10
+msgid "Thank you for you interest in the project."
+msgstr "Merci l'intérêt que vous portez au projet."
+
+#: templates/account_activation_email.txt:13
+#, python-format
+msgid "The %(app_name)s team"
+msgstr "L'équipe %(app_name)s"
+
#: templates/base.html:26
msgid "Logged in"
msgstr "Connecté"
@@ -1132,6 +1145,19 @@ msgstr "Compte crée avec succès"
msgid "Account activation failed"
msgstr "La création du compte a échouée"
+#: templates/registration/activation_email.txt:2
+msgid "Activate account at"
+msgstr "Activer le compte à"
+
+#: templates/registration/activation_email.txt:6
+#, python-format
+msgid "Link is valid for %(expiration_days)s days."
+msgstr "Le lien est valide pendant %(expiration_days)s jours."
+
+#: templates/registration/activation_email_subject.txt:1
+msgid "Account activation on"
+msgstr "Activation du compte sur"
+
#: templates/registration/login.html:16
msgid "Forgot password?"
msgstr "Oubli de mot de passe ?"
@@ -1192,4 +1218,3 @@ msgid "You are now registered. Activation email sent."
msgstr ""
"Vous être maintenant enregistré. Un courriel d'activation de votre compte "
"vous a été envoyé."
-
diff --git a/ishtar/settings.py.example b/ishtar/settings.py.example
index 92ce2baa1..4d16fd5b2 100644
--- a/ishtar/settings.py.example
+++ b/ishtar/settings.py.example
@@ -5,7 +5,6 @@
# Ishtar custom
SRID = 27572
-APP_NAME = ""
ROOT_PATH = "/var/local/webapp/ishtar/ishtar/"
URL_PATH = ""
diff --git a/ishtar/templates/account_activation_email.txt b/ishtar/templates/account_activation_email.txt
new file mode 100644
index 000000000..2dcc77d3e
--- /dev/null
+++ b/ishtar/templates/account_activation_email.txt
@@ -0,0 +1,13 @@
+{% load i18n %}
+
+{% blocktrans %}Your account on {{app_name}} has been created or modified.{% endblocktrans %}
+
+ * {% trans "Login:" %} {{login}}
+ * {% trans "Password:" %} {{password}}
+
+{% trans "You can log in here:" %} http://{{site}}{%url auth_login%}
+
+{% trans "Thank you for you interest in the project." %}
+
+--
+{% blocktrans %}The {{app_name}} team{% endblocktrans %}