Merge pull request #1002 from stweil/typos

Fix some typos (found by codespell and typos)

README.md

@@ -28,4 +28,4 @@ RDMO is a tool to support the systematic planning, organisation and implementati
   <dd>https://rdmo.aip.de</dd>
 </dl>
 
-If you encounter any problems or bugs with the RDMO Software, or if you want to request a feature, please file an issue here: <https://github.com/rdmorganiser/rdmo/issues>. For problems or suggestions with questionaires, the RDMO domain model or other content, please use the issues in the [rdmo-catalog](https://github.com/rdmorganiser/rdmo-catalog) repository: <https://github.com/rdmorganiser/rdmo-catalog/issues>. In order to file issues, you will need a GitHub account.
+If you encounter any problems or bugs with the RDMO Software, or if you want to request a feature, please file an issue here: <https://github.com/rdmorganiser/rdmo/issues>. For problems or suggestions with questionnaires, the RDMO domain model or other content, please use the issues in the [rdmo-catalog](https://github.com/rdmorganiser/rdmo-catalog) repository: <https://github.com/rdmorganiser/rdmo-catalog/issues>. In order to file issues, you will need a GitHub account.

rdmo/accounts/utils.py

@@ -69,7 +69,7 @@ def delete_user(user=None, email=None, password=None):
             log.info('Deletion of user with usable password "%s" succeeded.', username)
             return True
         except Exception as e:
-            log.error('Deletion of user with usable password "%s" failed, an exception (%s) occured',
+            log.error('Deletion of user with usable password "%s" failed, an exception (%s) occurred',
                       str(e), username)
             return False
     elif not user.has_usable_password() and password is None:
@@ -78,7 +78,7 @@ def delete_user(user=None, email=None, password=None):
             log.info('Deletion of user without usable password "%s" succeeded.', username)
             return True
         except Exception as e:
-            log.error('Deletion of user without usable password "%s" failed, an exception (%s) occured',
+            log.error('Deletion of user without usable password "%s" failed, an exception (%s) occurred',
                       str(e), username)
             return False
     else:

rdmo/conditions/migrations/0013_meta.py

@@ -41,6 +41,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='condition',
             name='target_text',
-            field=models.CharField(blank=True, help_text='If using a regular attibute, the text value this condition is checking against.', max_length=256, null=True, verbose_name='Target (Text)'),
+            field=models.CharField(blank=True, help_text='If using a regular attribute, the text value this condition is checking against.', max_length=256, null=True, verbose_name='Target (Text)'),
         ),
     ]

rdmo/core/templates/core/about_text_en.html

@@ -16,7 +16,7 @@ <h4>Version {% version %}</h4>
     </p>
 
     <p>
-        RDMO is ready for application in smaller or bigger projects. In the next projectphase, which started November 2017, the RDMO tool will be extended and the project partners AIP, FHP, and KIT Library will collaborate with the RDMO users to improve its usage. The tool will be extended by enhancing its implementation of roles and interfaces to institutional infrastructure, e.g. repositories, ticketing systems, and the infrastructure for authentication and autorization. Tutorials, documentation and other material are planned for dissemination, and workshops for users and developers.
+        RDMO is ready for application in smaller or bigger projects. In the next projectphase, which started November 2017, the RDMO tool will be extended and the project partners AIP, FHP, and KIT Library will collaborate with the RDMO users to improve its usage. The tool will be extended by enhancing its implementation of roles and interfaces to institutional infrastructure, e.g. repositories, ticketing systems, and the infrastructure for authentication and authorization. Tutorials, documentation and other material are planned for dissemination, and workshops for users and developers.
     </p>
 
     <p>

rdmo/core/templates/rest_framework_swagger/index.html

@@ -40,7 +40,7 @@
         {% if request.user.is_authenticated %}
           {% trans "You are logged in as: " %}<strong>{{ request.user }}</strong>
         {% else %}
-           {% trans "Viewing as an anoymous user" %}
+           {% trans "Viewing as an anonymous user" %}
        {% endif %}
       {% endblock %}
     </div>

rdmo/locale/de/LC_MESSAGES/django.po

@@ -1173,8 +1173,8 @@ msgid "You are logged in as: "
 msgstr "Sie sind eingeloggt als: "
 
 #: core/templates/rest_framework_swagger/index.html:43
-msgid "Viewing as an anoymous user"
-msgstr "Ansicht als anoymer Benutzer"
+msgid "Viewing as an anonymous user"
+msgstr "Ansicht als anonymer Benutzer"
 
 #: core/templates/rest_framework_swagger/index.html:55
 msgid "Powered by "

rdmo/locale/es/LC_MESSAGES/django.po

@@ -1186,7 +1186,7 @@ msgid "You are logged in as: "
 msgstr "Usted ha iniciado sesión como: "
 
 #: core/templates/rest_framework_swagger/index.html:43
-msgid "Viewing as an anoymous user"
+msgid "Viewing as an anonymous user"
 msgstr "Visualizando como usuario anónimo"
 
 #: core/templates/rest_framework_swagger/index.html:55

rdmo/locale/fr/LC_MESSAGES/django.po

@@ -1118,7 +1118,7 @@ msgid "You are logged in as: "
 msgstr "Vous êtes connecté en tant que: "
 
 #: core/templates/rest_framework_swagger/index.html:43
-msgid "Viewing as an anoymous user"
+msgid "Viewing as an anonymous user"
 msgstr "Visualisation en tant qu'utilisateur anonyme"
 
 #: core/templates/rest_framework_swagger/index.html:55

rdmo/locale/it/LC_MESSAGES/django.po

@@ -1165,7 +1165,7 @@ msgid "You are logged in as: "
 msgstr "Sei loggato come: "
 
 #: core/templates/rest_framework_swagger/index.html:43
-msgid "Viewing as an anoymous user"
+msgid "Viewing as an anonymous user"
 msgstr "Visualizzazione come utente anonimo"
 
 #: core/templates/rest_framework_swagger/index.html:55

rdmo/projects/progress.py

@@ -119,15 +119,15 @@ def count_questions(element, sets, conditions):
 
         # count the sets for the id attribute of the page or question
         if element.attribute is not None:
-            # nested loop over the seperate set_index lists in sets[element.attribute.id]
+            # nested loop over the separate set_index lists in sets[element.attribute.id]
             for set_index in chain.from_iterable(sets[element.attribute.id].values()):
                 counted_sets.add(set_index)
 
         # count the sets for the questions in the page or question
         for child in element.elements:
             if isinstance(child, Question):
                 if child.attribute is not None:
-                    # nested loop over the seperate set_index lists in sets[element.attribute.id]
+                    # nested loop over the separate set_index lists in sets[element.attribute.id]
                     for set_index in chain.from_iterable(sets[child.attribute.id].values()):
                         counted_sets.add(set_index)
 
@@ -149,15 +149,15 @@ def count_questions(element, sets, conditions):
                 # question should be answered in every set
                 # for optional questions add just the number of present answers, so that
                 # only answered questions count for the progress/navigation
-                # use the max function, since the same attribute could apear twice in the tree
+                # use the max function, since the same attribute could appear twice in the tree
                 if child.attribute is not None:
                     if child.is_optional:
                         child_count = sum(len(set_indexes) for set_indexes in sets[child.attribute.id].values())
                         counts[child.attribute.id] = max(counts[child.attribute.id], child_count)
                     else:
                         counts[child.attribute.id] = max(counts[child.attribute.id], set_count)
             else:
-                # for everthing else, call this function recursively
+                # for everything else, call this function recursively
                 counts.update(count_questions(child, sets, conditions))
 
     return counts

rdmo/tasks/migrations/0004_refactoring.py

@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='task',
             name='attribute',
-            field=models.ForeignKey(blank=True, help_text='The attribute this task is refering to.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='domain.Attribute', verbose_name='Attribute'),
+            field=models.ForeignKey(blank=True, help_text='The attribute this task is referring to.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='domain.Attribute', verbose_name='Attribute'),
         ),
         migrations.AlterField(
             model_name='task',