summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-12-16 11:06:43 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-02-28 12:15:22 +0100
commit4ebb6f8563640026176a7e0721d6dd2e3d71d160 (patch)
tree23e06af316435efe5f33f3f9e5d304b5a54d8d2d /ishtar_common
parent96b65026a2876fb31d48a8dca4e25fee85699ac8 (diff)
downloadIshtar-4ebb6f8563640026176a7e0721d6dd2e3d71d160.tar.bz2
Ishtar-4ebb6f8563640026176a7e0721d6dd2e3d71d160.zip
Fix english typo
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/forms_common.py4
-rw-r--r--ishtar_common/management/commands/import_insee_comm_csv.py4
-rw-r--r--ishtar_common/migrations/0204_auto_20201201_1533.py4
-rw-r--r--ishtar_common/models.py20
-rw-r--r--ishtar_common/templates/ishtar/import_step_by_step.html2
-rw-r--r--ishtar_common/templates/ishtar/wizard/delete_wizard.html2
-rw-r--r--ishtar_common/tests.py2
7 files changed, 19 insertions, 19 deletions
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)