diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | archaeological_context_records/ishtar_menu.py | 2 | ||||
| -rw-r--r-- | archaeological_files/ishtar_menu.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/ishtar_menu.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/wizards.py | 2 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 2 | ||||
| -rw-r--r-- | ishtar_common/ishtar_menu.py | 4 |
7 files changed, 9 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 484d2af20..13a4d0d11 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ oook_replace dist ishtar.egg-info .idea +*.log diff --git a/archaeological_context_records/ishtar_menu.py b/archaeological_context_records/ishtar_menu.py index f8e33d44b..de8a02438 100644 --- a/archaeological_context_records/ishtar_menu.py +++ b/archaeological_context_records/ishtar_menu.py @@ -52,7 +52,7 @@ MENU_SECTIONS = [ access_controls=['view_contextrecord', 'view_own_contextrecord']), MenuItem('record_source_creation', - _(u"Add"), + _(u"Creation"), model=models.ContextRecordSource, access_controls=[ 'change_contextrecord', diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py index dfff7d0ab..7ed921b2c 100644 --- a/archaeological_files/ishtar_menu.py +++ b/archaeological_files/ishtar_menu.py @@ -61,7 +61,7 @@ MENU_SECTIONS = [ model=AdministrativeAct, access_controls=['change_administrativeact']), MenuItem('file_administrativeactfil', - _(u"Add"), + _(u"Creation"), model=AdministrativeAct, access_controls=['change_administrativeact']), MenuItem('file_administrativeactfil_modification', diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py index a0852147a..5f937f01c 100644 --- a/archaeological_operations/ishtar_menu.py +++ b/archaeological_operations/ishtar_menu.py @@ -66,7 +66,7 @@ MENU_SECTIONS = [ 'change_administrativeact']), MenuItem( 'operation_administrativeactop', - _(u"Add"), + _(u"Creation"), model=models.AdministrativeAct, access_controls=['change_administrativeact']), MenuItem( @@ -94,7 +94,7 @@ MENU_SECTIONS = [ access_controls=['view_operation', 'view_own_operation']), MenuItem('operation_source_creation', - _(u"Add"), + _(u"Creation"), model=models.OperationSource, access_controls=['change_operation', 'change_own_operation']), diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index 572a25ca0..eeabef857 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -86,7 +86,7 @@ class OperationWizard(Wizard): if step.startswith('towns'): context['TOWNS'] = self.get_towns() elif step.startswith('parcels-') and self.get_current_file(): - # if a file is acciated to the operation add the button "Add all" + # if a file is associated to the operation add the button "Add all" context['add_all'] = True if step.startswith('parcels') and \ hasattr(self, 'automatic_parcel_association'): diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index c15999721..82849d21c 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -241,7 +241,7 @@ class ManualMerge(object): except ValueError: pass if len(values) < 2: - raise forms.ValidationError(_(u"At leat two items have to be " + raise forms.ValidationError(_(u"At least two items have to be " u"selected.")) self.cleaned_data['to_merge'] = values return values diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py index 1f30bec0f..a733ea612 100644 --- a/ishtar_common/ishtar_menu.py +++ b/ishtar_common/ishtar_menu.py @@ -67,7 +67,7 @@ MENU_SECTIONS = [ model=models.Person, access_controls=['merge_person']), MenuItem( - 'person_deletion', _(u"Delete"), + 'person_deletion', _(u"Deletion"), model=models.Person, access_controls=['change_person', 'change_own_person']), ]), @@ -98,7 +98,7 @@ MENU_SECTIONS = [ model=models.Organization, access_controls=['merge_organization']), MenuItem( - 'organization_deletion', _(u"Delete"), + 'organization_deletion', _(u"Deletion"), model=models.Organization, access_controls=['change_organization', 'change_own_organization']), |