diff --git a/Makefile b/Makefile index 0e5c93f..052d03a 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ COMPOSE_RUN = $(COMPOSE) run --rm COMPOSE_RUN_APP = $(COMPOSE_RUN) app-dev COMPOSE_RUN_CROWDIN = $(COMPOSE_RUN) crowdin crowdin WAIT_DB = @$(COMPOSE_RUN) dockerize -wait tcp://$(DB_HOST):$(DB_PORT) -timeout 60s -WAIT_KC_DB = $(COMPOSE_RUN) dockerize -wait tcp://kc_postgresql:5432 -timeout 60s +WAIT_KC_DB = $(COMPOSE_RUN) dockerize -wait tcp://kc_postgresql:5432 -timeout 60s # -- Backend MANAGE = $(COMPOSE_RUN_APP) python manage.py @@ -224,15 +224,15 @@ env.d/development/kc_postgresql: env.d/development/crowdin: cp -n env.d/development/crowdin.dist env.d/development/crowdin -crowdin-download: ## Download translated message from crowdin +crowdin-download: ## Download translated message from Crowdin @$(COMPOSE_RUN_CROWDIN) download -c crowdin/config.yml .PHONY: crowdin-download -crowdin-download-sources: ## Download sources from crowdin +crowdin-download-sources: ## Download sources from Crowdin @$(COMPOSE_RUN_CROWDIN) download sources -c crowdin/config.yml .PHONY: crowdin-download-sources -crowdin-upload: ## Upload source translations to crowdin +crowdin-upload: ## Upload source translations to Crowdin @$(COMPOSE_RUN_CROWDIN) upload sources -c crowdin/config.yml .PHONY: crowdin-upload @@ -254,7 +254,7 @@ i18n-download-and-compile: \ i18n-compile .PHONY: i18n-download-and-compile -i18n-generate-and-upload: ## generate source translations for all applications and upload them to crowdin +i18n-generate-and-upload: ## generate source translations for all applications and upload them to Crowdin i18n-generate-and-upload: \ i18n-generate \ crowdin-upload @@ -285,7 +285,7 @@ tsclient-install: ## Install the Typescript API client generator @$(TSCLIENT_YARN) install .PHONY: tsclient-install -tsclient: tsclient-install ## Generate a Typescipt API client +tsclient: tsclient-install ## Generate a Typescript API client @$(TSCLIENT_YARN) generate:api:client:local ../frontend/tsclient .PHONY: tsclient-install diff --git a/README.md b/README.md index 03cc1f1..4ab7c56 100644 --- a/README.md +++ b/README.md @@ -34,11 +34,11 @@ $ make bootstrap This command builds the `app` container, installs dependencies, performs database migrations and compile translations. It's a good idea to use this command each time you are pulling code from the project repository to avoid -dependency-releated or migration-releated issues. +dependency-related or migration-related issues. Your Docker services should now be up and running 🎉 -Note that if you need to run them afterwards, you can use the eponym Make rule: +Note that if you need to run them afterward, you can use the eponym Make rule: ```bash $ make run diff --git a/gitlint/gitlint_emoji.py b/gitlint/gitlint_emoji.py index 59c86ea..c9e2c0e 100644 --- a/gitlint/gitlint_emoji.py +++ b/gitlint/gitlint_emoji.py @@ -24,7 +24,7 @@ class GitmojiTitle(LineRule): def validate(self, title, _commit): """ - Download the list possible gitmojis from the project's github repository and check that + Download the list possible gitmojis from the project's GitHub repository and check that title contains one of them. """ gitmojis = requests.get( diff --git a/src/backend/core/models.py b/src/backend/core/models.py index dbcae3d..12c9f36 100644 --- a/src/backend/core/models.py +++ b/src/backend/core/models.py @@ -140,7 +140,7 @@ class Contact(BaseModel): try: jsonschema.validate(self.data, contact_schema) except jsonschema.ValidationError as e: - # Specify the property in the data in which the error occured + # Specify the property in the data in which the error occurred field_path = ".".join(map(str, e.path)) error_message = f"Validation error in '{field_path:s}': {e.message}" raise exceptions.ValidationError({"data": [error_message]}) from e diff --git a/src/backend/core/tests/test_models_oidc_user_getter.py b/src/backend/core/tests/test_models_oidc_user_getter.py index da3558e..8135473 100644 --- a/src/backend/core/tests/test_models_oidc_user_getter.py +++ b/src/backend/core/tests/test_models_oidc_user_getter.py @@ -8,7 +8,7 @@ from core import factories, models pytestmark = pytest.mark.django_db -def test_models_oidc_user_getter_exsting_user_no_email(django_assert_num_queries): +def test_models_oidc_user_getter_existing_user_no_email(django_assert_num_queries): """ When a valid token is passed, an existing user matching the token's sub should be returned. """ diff --git a/src/backend/demo/management/commands/createsuperuser.py b/src/backend/demo/management/commands/createsuperuser.py index 72ae10f..30652f9 100644 --- a/src/backend/demo/management/commands/createsuperuser.py +++ b/src/backend/demo/management/commands/createsuperuser.py @@ -1,5 +1,5 @@ """ -Management command overrring the "createsuperuser" command to allow creating users +Management command overriding the "createsuperuser" command to allow creating users with their email and no username. """ from django.contrib.auth import get_user_model @@ -9,7 +9,7 @@ User = get_user_model() class Command(BaseCommand): - """Management command to create super users from an email and a password""" + """Management command to create superusers from an email and a password""" help = "Create a superuser with an email and a password" diff --git a/src/backend/people/settings.py b/src/backend/people/settings.py index d7db127..e1017e3 100755 --- a/src/backend/people/settings.py +++ b/src/backend/people/settings.py @@ -44,7 +44,7 @@ def get_release(): class Base(Configuration): """ - This is the base configuration every configuration (aka environnement) should inherit from. It + This is the base configuration every configuration (aka environment) should inherit from. It is recommended to configure third-party applications by creating a configuration mixins in ./configurations and compose the Base configuration with those mixins.