From 4ebb6f8563640026176a7e0721d6dd2e3d71d160 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 16 Dec 2020 11:06:43 +0100
Subject: Fix english typo

---
 archaeological_context_records/tests.py              |  6 +++---
 .../templates/ishtar/wizard/wizard_simplefind.html   |  2 +-
 archaeological_warehouse/models.py                   |  6 +++---
 .../ishtar/wizard/wizard_container_deletion.html     |  6 +++---
 .../ishtar/wizard/wizard_warehouse_divisions.html    |  2 +-
 example_project/settings.py                          |  2 +-
 install/README.md                                    |  2 +-
 ishtar_common/forms_common.py                        |  4 ++--
 .../management/commands/import_insee_comm_csv.py     |  4 ++--
 ishtar_common/migrations/0204_auto_20201201_1533.py  |  4 ++--
 ishtar_common/models.py                              | 20 ++++++++++----------
 .../templates/ishtar/import_step_by_step.html        |  2 +-
 .../templates/ishtar/wizard/delete_wizard.html       |  2 +-
 ishtar_common/tests.py                               |  2 +-
 locale/fr/LC_MESSAGES/django.po                      |  2 +-
 15 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 6c2c256a0..2cdae48bc 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -384,9 +384,9 @@ class ContextRecordTest(ContextRecordInit, TestCase):
         cr = self.create_context_record()[0]
         cr_pk = cr.pk
         self.assertIsNotNone(cr.cached_label)
-        # OP2010 - 1 | A | 1 | CR 1
+        # OA1 | A | 1 | CR 1
         ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ')
-        self.assertEqual(ope_id, 'OP2010-1')
+        self.assertEqual(ope_id, 'OA1')
         self.assertEqual(parcel_sec, cr.parcel.section)
         self.assertEqual(parcel_nb, cr.parcel.parcel_number)
         self.assertEqual(cr_label, cr.label)
@@ -415,7 +415,7 @@ class ContextRecordTest(ContextRecordInit, TestCase):
         cr = models.ContextRecord.objects.get(pk=cr_pk)
         self.assertIsNotNone(cr.cached_label)
         ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ')
-        self.assertEqual(ope_id, 'OP2017-1')
+        self.assertEqual(ope_id, 'OA1')
 
     def test_downstream_cache_update(self):
         cr = self.create_context_record()[0]
diff --git a/archaeological_finds/templates/ishtar/wizard/wizard_simplefind.html b/archaeological_finds/templates/ishtar/wizard/wizard_simplefind.html
index 2ebde34ff..57a92aeb6 100644
--- a/archaeological_finds/templates/ishtar/wizard/wizard_simplefind.html
+++ b/archaeological_finds/templates/ishtar/wizard/wizard_simplefind.html
@@ -3,7 +3,7 @@
 {% block form_head %}
 <div class="alert alert-warning">
     <i class="fa fa-exclamation-triangle"></i>
-    {% trans 'This find is related to many base finds. To edit field related to base finds edit the corresponding find between theses:' %}
+    {% trans 'This find is related to many base finds. To edit field related to base finds edit the corresponding find between these:' %}
     <ul>{% for base_find in wizard.form.base_finds %}
     {% with find=base_find.get_main_find %}<li>
             {% if not find %}
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 8f4d0662e..05b3a6043 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -336,7 +336,7 @@ class Warehouse(Address, DocumentItem, GeoItem, CompleteIdentifierItem,
     auto_external_id = models.BooleanField(
         _("External ID is set automatically"), default=False)
     max_division_number = models.IntegerField(
-        _("Number maximum of division"), default=0,
+        _("Maximum number of divisions"), default=0,
         help_text=_("Automatically generated"))
     SUB_ADDRESSES = ["organization", "person_in_charge"]
 
@@ -503,8 +503,8 @@ class WarehouseDivisionLinkManager(models.Manager):
 class ContainerType(GeneralType):
     stationary = models.BooleanField(
         _("Stationary"), default=False,
-        help_text=_("Container that usually will not be moved. Ex: building, "
-                    "room."))
+        help_text=_("Container that will not usually be moved. Ex: building, "
+                    "room, span, shelf."))
     length = models.IntegerField(_("Length (mm)"), blank=True, null=True)
     width = models.IntegerField(_("Width (mm)"), blank=True, null=True)
     height = models.IntegerField(_("Height (mm)"), blank=True, null=True)
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html
index ea11652af..429b3048e 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_container_deletion.html
@@ -10,7 +10,7 @@
   <div class="card-body">
     <div class="alert alert-danger">
       <div><i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-        {% trans "Theses containers are inside this item. If you delete this item, they won't have any parent container. You probably want to fix that." %}
+        {% trans "These containers are inside this item. If you delete this item, they won't have any parent container. You probably want to fix that." %}
       </div>
     </div>
     <ul class='list'>
@@ -30,7 +30,7 @@
     {% if current_object.finds.count %}
     <div class="alert alert-danger">
       <div><i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-        {% trans "Theses finds are inside this item. If you delete this item, they won't be inside any container. You probably want to fix that." %}
+        {% trans "These finds are inside this item. If you delete this item, they won't be inside any container. You probably want to fix that." %}
       </div>
     </div>
     <ul class='list'>
@@ -42,7 +42,7 @@
     {% if current_object.finds_ref.count %}
     <div class="alert alert-danger">
       <div><i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-        {% trans "This item is the reference container for theses finds. If you delete this item, they won't have any reference container. You probably want to fix that." %}
+        {% trans "This item is the reference container for these finds. If you delete this item, they won't have any reference container. You probably want to fix that." %}
       </div>
     </div>
     <ul class='list'>
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
index 9f1e29708..edd8efadf 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
@@ -3,6 +3,6 @@
 {% block form_head %}
 <div class="alert alert-info">
   <i class="fa fa-exclamation-triangle"></i>
-  &nbsp;{% trans "Default division for this warehouse. Theses divisions are only used to facilitate imports." %}<br/>
+  &nbsp;{% trans "Default division for this warehouse. These divisions are only used to facilitate imports." %}<br/>
 </div>
 {% endblock %}
diff --git a/example_project/settings.py b/example_project/settings.py
index 344fd8eab..53c436501 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -272,7 +272,7 @@ SURFACE_UNIT = 'square-metre'
 SURFACE_UNIT_LABEL = 'm²'
 JOINT = " | "
 # dir for ishtar maintenance script - as it can be a serious security issue if
-# not managed cautiously the dir contening theses scripts is not set by default
+# not managed cautiously the dir contening these scripts is not set by default
 ISHTAR_SCRIPT_DIR = ""
 
 ISHTAR_FILE_PREFIX = ""
diff --git a/install/README.md b/install/README.md
index 0235c2d6e..a7d3c3f6c 100644
--- a/install/README.md
+++ b/install/README.md
@@ -1,4 +1,4 @@
-Follow theses instruction to install Ishtar from sources on a Debian Jessie installation.
+Follow these instruction to install Ishtar from sources on a Debian Buster installation.
 
 ### Get installations scripts
 
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 697abd1cc..039c03e76 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -880,7 +880,7 @@ class AccountForm(IshtarForm):
     HEADERS = {
         'hidden_password': FormHeader(
             _("New password"),
-            help_message=_("Keep theses fields empty if you do not want to " 
+            help_message=_("Keep these fields empty if you do not want to " 
                            "change password. On creation, if you leave these "
                            "fields empty, the user will not be able to "
                            "connect.")),
@@ -1320,7 +1320,7 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType):
             associated_model=models.Organization),
         validators=[models.valid_id(models.Organization)], required=False)
     licenses = widgets.Select2MultipleField(
-        label=_("Licences"), required=False, model=models.LicenseType)
+        label=_("Licenses"), required=False, model=models.LicenseType)
     tags = widgets.Select2MultipleField(
         label=_("Tags"), required=False, model=models.DocumentTag,
         remote="autocomplete-documenttag")
diff --git a/ishtar_common/management/commands/import_insee_comm_csv.py b/ishtar_common/management/commands/import_insee_comm_csv.py
index d1a8f2084..7962efd37 100644
--- a/ishtar_common/management/commands/import_insee_comm_csv.py
+++ b/ishtar_common/management/commands/import_insee_comm_csv.py
@@ -104,11 +104,11 @@ class Command(BaseCommand):
         sys.stdout.write('* {} link created\n'.format(nb_link))
         sys.stdout.write('* {} limit generated\n'.format(nb_limit))
         if missing:
-            sys.stdout.write('* theses towns are missing:\n')
+            sys.stdout.write('* these towns are missing:\n')
             for insee, name in missing:
                 sys.stdout.write('* {} ({})\n'.format(name, insee))
         if strange:
-            sys.stdout.write('* theses towns have newer version:\n')
+            sys.stdout.write('* these towns have newer version:\n')
             for insee, name in strange:
                 sys.stdout.write('* {} ({})\n'.format(name, insee))
         sys.stdout.flush()
diff --git a/ishtar_common/migrations/0204_auto_20201201_1533.py b/ishtar_common/migrations/0204_auto_20201201_1533.py
index f8565d0e1..b1d29e44e 100644
--- a/ishtar_common/migrations/0204_auto_20201201_1533.py
+++ b/ishtar_common/migrations/0204_auto_20201201_1533.py
@@ -105,7 +105,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='format',
             name='document_types',
-            field=models.ManyToManyField(blank=True, help_text='Only available for theses document types', related_name='formats', to='ishtar_common.SourceType'),
+            field=models.ManyToManyField(blank=True, help_text='Only available for these document types', related_name='formats', to='ishtar_common.SourceType'),
         ),
         migrations.AddField(
             model_name='format',
@@ -225,7 +225,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='supporttype',
             name='document_types',
-            field=models.ManyToManyField(blank=True, help_text='Only available for theses document types', related_name='supports', to='ishtar_common.SourceType'),
+            field=models.ManyToManyField(blank=True, help_text='Only available for these document types', related_name='supports', to='ishtar_common.SourceType'),
         ),
         migrations.AlterField(
             model_name='document',
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 67e93fe13..c178b187f 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -818,7 +818,7 @@ class IshtarSiteProfile(models.Model, Cached):
     site_custom_index = models.TextField(
         _("Archaeological site custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used to manage archaeological site custom "
+        help_text=_("Keys to be used to manage archaeological site custom "
                     "index. Separate keys with a semicolon."))
     file_external_id = models.TextField(
         _("File external id"),
@@ -835,7 +835,7 @@ class IshtarSiteProfile(models.Model, Cached):
     file_custom_index = models.TextField(
         _("Archaeological file custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used to manage archaeological file custom "
+        help_text=_("Keys to be used to manage archaeological file custom "
                     "index. Separate keys with a semicolon."))
     parcel_external_id = models.TextField(
         _("Parcel external id"),
@@ -859,7 +859,7 @@ class IshtarSiteProfile(models.Model, Cached):
     contextrecord_custom_index = models.TextField(
         _("Context record custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used to manage context record custom index. "
+        help_text=_("Keys to be used to manage context record custom index. "
                     "Separate keys with a semicolon."))
     base_find_external_id = models.TextField(
         _("Base find external id"),
@@ -875,7 +875,7 @@ class IshtarSiteProfile(models.Model, Cached):
     basefind_custom_index = models.TextField(
         _("Base find custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used to manage base find custom index. "
+        help_text=_("Keys to be used to manage base find custom index. "
                     "Separate keys with a semicolon."))
     find_external_id = models.TextField(
         _("Find external id"),
@@ -891,7 +891,7 @@ class IshtarSiteProfile(models.Model, Cached):
     find_custom_index = models.TextField(
         _("Find custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used to manage find custom index. "
+        help_text=_("Keys to be used to manage find custom index. "
                     "Separate keys with a semicolon."))
     container_external_id = models.TextField(
         _("Container external id"),
@@ -908,7 +908,7 @@ class IshtarSiteProfile(models.Model, Cached):
     container_custom_index = models.TextField(
         _("Container custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used  to manage container custom index. "
+        help_text=_("Keys to be used to manage container custom index. "
                     "Separate keys with a semicolon."))
     warehouse_external_id = models.TextField(
         _("Warehouse external id"),
@@ -924,7 +924,7 @@ class IshtarSiteProfile(models.Model, Cached):
     warehouse_custom_index = models.TextField(
         _("Warehouse custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used to manage warehouse custom index. "
+        help_text=_("Keys to be used to manage warehouse custom index. "
                     "Separate keys with a semicolon."))
     document_external_id = models.TextField(
         _("Document external id"),
@@ -940,7 +940,7 @@ class IshtarSiteProfile(models.Model, Cached):
     document_custom_index = models.TextField(
         _("Document custom index key"),
         default="", blank=True,
-        help_text=_("Key to be used to manage document custom index. "
+        help_text=_("Keys to be used to manage document custom index. "
                     "Separate keys with a semicolon."))
     person_raw_name = models.TextField(
         _("Raw name for person"),
@@ -2701,7 +2701,7 @@ post_delete.connect(post_save_cache, sender=SourceType)
 class SupportType(GeneralType):
     document_types = models.ManyToManyField(
         "SourceType", blank=True, related_name='supports',
-        help_text=_("Only available for theses document types")
+        help_text=_("Only available for these document types")
     )
 
     class Meta:
@@ -2721,7 +2721,7 @@ class Format(GeneralType):
                     "current document."))
     document_types = models.ManyToManyField(
         "SourceType", blank=True, related_name='formats',
-        help_text=_("Only available for theses document types")
+        help_text=_("Only available for these document types")
     )
 
     class Meta:
diff --git a/ishtar_common/templates/ishtar/import_step_by_step.html b/ishtar_common/templates/ishtar/import_step_by_step.html
index 4b791b98f..8f5dfc723 100644
--- a/ishtar_common/templates/ishtar/import_step_by_step.html
+++ b/ishtar_common/templates/ishtar/import_step_by_step.html
@@ -322,7 +322,7 @@
 <script type="text/javascript">
     var modified = false;
     var no_modif_msg = "{% trans "No modification made to the source file" %}";
-    var modif_msg = "{% trans "Modification to the source file have been made. Save or cancel theses modification before import." %}";
+    var modif_msg = "{% trans "Modification to the source file have been made. Save or cancel these modification before import." %}";
 
     var no_modif_made = function(){
         $("#btn-cancel").prop("title", no_modif_msg);
diff --git a/ishtar_common/templates/ishtar/wizard/delete_wizard.html b/ishtar_common/templates/ishtar/wizard/delete_wizard.html
index 3a3d5ab1d..9b925f143 100644
--- a/ishtar_common/templates/ishtar/wizard/delete_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/delete_wizard.html
@@ -5,7 +5,7 @@
 <div class="alert alert-danger">
     <div><i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
         {% if current_objs and current_objs.1 %}
-        {% trans "Are you sure to want to delete theses items?" %}
+        {% trans "Are you sure to want to delete these items?" %}
         <ul>{% for obj in current_objs %}
             <li>{{obj}}</li>
         {% endfor %}</ul>
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 60e087794..145b3b144 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -401,7 +401,7 @@ class WizardTestFormData(object):
 
     def tests(self, test_object, final_step_response):
         """
-        Specific tests for theses datas. Raise Exception if not OK.
+        Specific tests for these data. Raise Exception if not OK.
         """
         for test in self.extra_tests:
             test(test_object, final_step_response)
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index b1f45f680..64eab0643 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -2577,7 +2577,7 @@ msgstr "Dossier suivi par"
 
 #: archaeological_files_pdl/wizards.py:95
 msgid ": delay of {} days"
-msgstr ": délai de {} jours"
+msgstr " : délai de {} jours"
 
 #: archaeological_finds/admin.py:40 ishtar_common/models_common.py:2539
 msgid "Point (2D)"
-- 
cgit v1.2.3