summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/forms.py2
-rw-r--r--archaeological_files/models.py10
-rw-r--r--archaeological_files/wizards.py4
-rw-r--r--archaeological_finds/forms.py4
-rw-r--r--archaeological_operations/forms.py8
-rw-r--r--archaeological_operations/models.py2
-rw-r--r--archaeological_operations/wizards.py4
-rw-r--r--ishtar_common/forms_common.py2
-rw-r--r--ishtar_common/ishtar_menu.py2
-rw-r--r--ishtar_common/templates/base.html4
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_nav.html2
-rw-r--r--ishtar_common/templates/ishtar/wizard/default_wizard.html2
12 files changed, 23 insertions, 23 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 3b99042ec..f47f41614 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -66,7 +66,7 @@ class RecordSelect(TableSelect):
operation__operation_code = forms.IntegerField(
label=_(u"Operation's number (index by year)"))
archaeological_sites = forms.IntegerField(
- label=_("Archaelogical site"),
+ label=_("Archaeological site"),
widget=widgets.JQueryAutoComplete(
reverse_lazy('autocomplete-archaeologicalsite'),
associated_model=ArchaeologicalSite),
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 7f5655c0c..330fe019a 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -220,13 +220,13 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
verbose_name = _(u"Archaeological file")
verbose_name_plural = _(u"Archaeological files")
permissions = (
- ("view_file", ugettext(u"Can view all Archaelogical files")),
- ("view_own_file", ugettext(u"Can view own Archaelogical file")),
- ("add_own_file", ugettext(u"Can add own Archaelogical file")),
+ ("view_file", ugettext(u"Can view all Archaeological files")),
+ ("view_own_file", ugettext(u"Can view own Archaeological file")),
+ ("add_own_file", ugettext(u"Can add own Archaeological file")),
("change_own_file",
- ugettext(u"Can change own Archaelogical file")),
+ ugettext(u"Can change own Archaeological file")),
("delete_own_file",
- ugettext(u"Can delete own Archaelogical file")),
+ ugettext(u"Can delete own Archaeological file")),
("close_file", ugettext(u"Can close File")),
)
ordering = ('cached_label',)
diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py
index ea06a48f7..4c3a13ee2 100644
--- a/archaeological_files/wizards.py
+++ b/archaeological_files/wizards.py
@@ -151,7 +151,7 @@ class FileAdministrativeActWizard(OperationAdministrativeActWizard):
file_id = self.session_get_value(form_key, "pk")
try:
return (
- (_(u"Archaelogical file"),
+ (_(u"Archaeological file"),
unicode(models.File.objects.get(pk=file_id))),)
except models.File.DoesNotExist:
return
@@ -161,7 +161,7 @@ class FileAdministrativeActWizard(OperationAdministrativeActWizard):
admin = AdministrativeAct.objects.get(pk=admin_id)
if not admin.associated_file:
return
- return ((_(u"Archaelogical file"),
+ return ((_(u"Archaeological file"),
unicode(admin.associated_file)),)
except AdministrativeAct.DoesNotExist:
return
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 724576ec6..2a297ea12 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -227,7 +227,7 @@ class FindSelect(TableSelect):
widget=OAWidget
)
archaeological_sites = forms.IntegerField(
- label=_("Archaelogical site"),
+ label=_("Archaeological site"),
widget=widgets.JQueryAutoComplete(
reverse_lazy('autocomplete-archaeologicalsite'),
associated_model=ArchaeologicalSite),
@@ -510,7 +510,7 @@ class NewFindBasketForm(forms.ModelForm):
q = models.FindBasket.objects.filter(user=self.user,
label=self.cleaned_data['label'])
if q.count():
- raise forms.ValidationError(_(u"Another basket already exist with "
+ raise forms.ValidationError(_(u"Another basket already exists with "
u"this name."))
return self.cleaned_data
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index c8bb5e8a1..8d900036d 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -515,7 +515,7 @@ class OperationSelect(TableSelect):
choices=[])
virtual_operation = forms.NullBooleanField(label=_(u"Virtual operation"))
archaeological_sites = forms.IntegerField(
- label=_("Archaelogical site"),
+ label=_("Archaeological site"),
widget=widgets.JQueryAutoComplete(
reverse_lazy('autocomplete-archaeologicalsite'),
associated_model=models.ArchaeologicalSite),
@@ -637,7 +637,7 @@ class OperationFormFileChoice(forms.Form):
associated_models = {'associated_file': File, }
currents = {'associated_file': File}
associated_file = forms.IntegerField(
- label=_(u"Archaelogical file"),
+ label=_(u"Archaeological file"),
widget=widgets.JQueryAutoComplete(
reverse_lazy('autocomplete-file'), associated_model=File),
validators=[valid_id(File)], required=False)
@@ -930,7 +930,7 @@ class OperationFormModifGeneral(OperationFormGeneral):
required=False)
currents = {'associated_file': File}
associated_file = forms.IntegerField(
- label=_(u"Archaelogical file"),
+ label=_(u"Archaeological file"),
widget=widgets.JQueryAutoComplete(
reverse_lazy('autocomplete-file'),
associated_model=File),
@@ -1143,7 +1143,7 @@ class ArchaeologicalSiteBasicForm(forms.Form):
base_model = 'archaeological_site'
associated_models = {'archaeological_site': models.ArchaeologicalSite}
archaeological_site = forms.IntegerField(
- label=_("Archaelogical site"),
+ label=_("Archaeological site"),
widget=widgets.JQueryAutoComplete(
reverse_lazy('autocomplete-archaeologicalsite'),
associated_model=models.ArchaeologicalSite,
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 1e108e98c..c54a060cb 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -987,7 +987,7 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
'archaeological_files.File',
blank=True, null=True,
related_name='administrative_act',
- verbose_name=_(u"Archaelogical file"))
+ verbose_name=_(u"Archaeological file"))
signature_date = models.DateField(_(u"Signature date"), blank=True,
null=True)
year = models.IntegerField(_(u"Year"), blank=True, null=True)
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index c5ddc64e5..ece14d1d2 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -73,7 +73,7 @@ class OperationWizard(Wizard):
def get_reminder(self):
archaeological_file = self.get_current_file()
if archaeological_file:
- return ((_("Archaelogical file"),
+ return ((_("Archaeological file"),
unicode(archaeological_file)),)
def get_context_data(self, form, **kwargs):
@@ -196,7 +196,7 @@ class OperationWizard(Wizard):
has_no_af = [form.prefix for form in forms
if form.prefix == 'townsgeneral-operation'] and True
if has_no_af:
- datas = [[_(u"Warning: No Archaelogical File is provided. "
+ datas = [[_(u"Warning: No Archaeological File is provided. "
u"If you have forget it return to the first step."), []]]\
+ datas
return datas
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 82849d21c..7ab09f9f7 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -40,7 +40,7 @@ from forms import FinalForm, FormSet, reverse_lazy, name_validator, \
def get_town_field(label=_(u"Town"), required=True):
help_text = _(
- u"<p>Type name, department code and/or postal code of the "
+ u"<p>Type name, department code of the "
u"town you would like to select. The search is insensitive to case."
u"</p>\n<p>Only the first twenty results are displayed but specifying "
u"the department code is generally sufficient to get the appropriate "
diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py
index a733ea612..5ed8cad37 100644
--- a/ishtar_common/ishtar_menu.py
+++ b/ishtar_common/ishtar_menu.py
@@ -30,7 +30,7 @@ MENU_SECTIONS = [
childs=[
SectionItem(
'account', _(u"Account"),
- childs=[MenuItem('account_management', _(u"Add/modify"),
+ childs=[MenuItem('account_management', _(u"Addition/modification"),
model=models.IshtarUser,
access_controls=['add_ishtaruser', ]),
MenuItem('account_deletion', _(u"Deletion"),
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 7101ed7de..dcd3043ca 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -38,8 +38,8 @@
var get_find_url = '{% url "get-find-shortcut" %}';
var activate_all_search_url = '{% url "activate-all-search" %}';
var activate_own_search_url = '{% url "activate-own-search" %}';
- var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deals with all items.' %}";
- var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deals with only your items.' %}";
+ var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deal with all items.' %}";
+ var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deal with only your items.' %}";
</script>
</head>
<body{% if current_theme%} id='{{current_theme}}'{%endif%}>
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index 4ce316217..3c52063f4 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -14,7 +14,7 @@
<span class='history-nav'> </span>
{% endif %}
{% if next %}
- <a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changement made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
+ <a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changes made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
<span class="fa-stack fa-lg">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-history fa-stack-1x fa-inverse"></i>
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 6491b7a0f..c52d71536 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -55,7 +55,7 @@ $(document).ready(function(){
$('form :input').change(function(){form_changed=true;});
$('.change_step').click(function(){
if(!form_changed ||
- confirm("{% trans "The form has changed if you don't validate it all your changes will be lost." %}")){
+ confirm("{% trans "The form has changed. If you don't validate it, all your changes will be lost." %}")){
return true;
}
return false;
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 02:43:14 +0000