Update and fix labels

3 files changed, 12 insertions, 12 deletions

diff --git a/chimere/forms.py b/chimere/forms.py
index 1e1397e..df96bc5 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -127,7 +127,7 @@ def notifySubmission(absolute_uri, geo_object):
     category = " - ".join([str(cat)
                            for cat in geo_object.categories.all()])
     subject = '%s %s' % (_("New submission for"), category)
-    message = _('The new item "%s" has been submited in the category: ') % \
+    message = _('The new item "%s" has been submitted in the category: ') % \
         geo_object.name + category
     message += "\n\n" + _("To valid, precise or unvalid this item: ")
     named_url = 'admin:chimere_%s_change' % \
@@ -478,7 +478,7 @@ class RouteAdminForm(forms.ModelForm):
     is_admin = True
     name = forms.CharField(label=_("Name"), required=True)
     read_from_file = forms.BooleanField(
-        label=_("Lire la géométrie depuis le fichier"), required=False)
+        label=_("Read geometry from the file"), required=False)
     categories = forms.ChoiceField(choices=[], widget=forms.Select)
     description = forms.CharField(widget=TextareaWidget, required=False)
 
diff --git a/chimere/models.py b/chimere/models.py
index 80bf0f3..a2a88e4 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -60,7 +60,7 @@ class Page(models.Model):
     title = models.CharField(_("Name"), max_length=150)
     image = models.ImageField(
         _("Image"), blank=True, null=True, upload_to='maps',
-        help_text=_("If an image is provided, this image replace the title on"
+        help_text=_("If an image is provided, this image replace the title on "
                     "the menu"))
     mnemonic = models.CharField(_("Mnemonic"), max_length=150, blank=True,
                                 null=True)
@@ -69,12 +69,12 @@ class Page(models.Model):
                                      blank=True, null=True)
     url = models.URLField(_("Url"), blank=True, null=True,
                           help_text=_("Target to an external link (do not fill "
-                                      "content if you want to point to an "
+                                      "content if you want to point to this "
                                       "external link)"))
     content = models.TextField(
         _("Content"), blank=True, null=True,
         help_text=_("Content of the page (do not fill external link if you "
-                    "want to display this content."))
+                    "want to display this content)"))
 
     class Meta:
         verbose_name = _("Page")
@@ -316,7 +316,7 @@ class SubCategory(models.Model):
         _("Simplify tolerance for lower zoom"), blank=True, null=True,
         help_text=_("Only relevant when Minimum zoom is set. Use the "
                     "Douglas-Peucker algorythm to simplify the geometry when "
-                    "details is not alvailable. Adjust to your data volume "
+                    "details is not available. Adjust to your data volume "
                     "and your performance need. 0.0003 is a good starting "
                     "point. Note: topology is not preserved."))
 
diff --git a/chimere/views.py b/chimere/views.py
index a9f27e6..d7e552e 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -309,7 +309,7 @@ def get_edit_page(redirect_url, item_cls, item_form,
                 setattr(init_item, k, '')
         response_dct['is_superuser'] = request.user.is_superuser
         formset_multi, formset_picture = None, None
-        # If the form has been submited
+        # If the form has been submitted
         if request.method == 'POST':
             inst = None
             # allow to directly modify only if owner or superuser
@@ -343,7 +343,7 @@ def get_edit_page(redirect_url, item_cls, item_form,
                     # initialisation
                     item.ref_item = item
 
-                # just submited
+                # just submitted
                 if not item.status:
                     item.status = 'S'
                 item.save()
@@ -366,7 +366,7 @@ def get_edit_page(redirect_url, item_cls, item_form,
             else:
                 response_dct['error_message'] = _(
                     "There are missing field(s)"
-                    " and/or errors in the submited form.")
+                    " and/or errors in the submitted form.")
         else:
             form = item_form(instance=init_item, subcategories=listed_subcats,
                              area_name=area_name)
@@ -408,7 +408,7 @@ def uploadFile(request, category_id='', area_name=''):
             response_dct['category'] = str(category)
         except models.SubCategory.DoesNotExist:
             pass
-    # If the form has been submited
+    # If the form has been submitted
     if request.method == 'POST':
         form = Form(request.POST, request.FILES)
         # All validation rules pass
@@ -575,7 +575,7 @@ def contactus(request, area_name=""):
     """
     form = None
     msg = ''
-    # If the form has been submited
+    # If the form has been submitted
     if request.method == 'POST':
         form = forms.ContactForm(request.POST)
         # All validation rules pass
@@ -1205,7 +1205,7 @@ def rss(request, area_name=''):
     response_dct.update({'actions': actions(response_dct['area_name']),
                          'action_selected': ('rss',),
                          'category_rss_feed': ''})
-    # If the form has been submited
+    # If the form has been submitted
     if request.method == "POST":
         # User has defined the kind of POI he is interested in : POI in a area
         # (GET method is used for the link with RSS icon in the browser)