Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some typos (found by codespell and typos) #1002

Merged
merged 2 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions rdmo/accounts/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion rdmo/conditions/migrations/0013_meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)'),
),
]
2 changes: 1 addition & 1 deletion rdmo/core/templates/core/about_text_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion rdmo/core/templates/rest_framework_swagger/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions rdmo/locale/de/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down
2 changes: 1 addition & 1 deletion rdmo/locale/es/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rdmo/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rdmo/locale/it/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions rdmo/projects/progress.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
2 changes: 1 addition & 1 deletion rdmo/tasks/migrations/0004_refactoring.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Loading