Skip to content

Commit

Permalink
Merge pull request #411 from luzpaz/typos
Browse files Browse the repository at this point in the history
Fix various typos
  • Loading branch information
SamR1 authored Aug 9, 2023
2 parents b04e32a + 42a6c87 commit abe1ad4
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions docsrc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ Emails sent by FitTrackee are:

- account confirmation instructions
- password reset request
- email change (to old and new email adresses)
- email change (to old and new email addresses)
- password change
- notification when a data export archive is ready to download (*new in 0.7.13*)

Expand Down Expand Up @@ -338,7 +338,7 @@ API rate limits
$ flask limiter
Usage: flask limiter [OPTIONS] COMMAND [ARGS]...
Flask-Limiter maintenance & utility commmands
Flask-Limiter maintenance & utility commands
Options:
--help Show this message and exit.
Expand Down
2 changes: 1 addition & 1 deletion fittrackee/tests/users/test_users_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,7 @@ def test_it_returns_error_when_new_email_is_same_as_current_email(
)

self.assert_400(
response, 'new email must be different than curent email'
response, 'new email must be different than current email'
)

def test_it_does_not_send_email_when_error_on_updating_email(
Expand Down
2 changes: 1 addition & 1 deletion fittrackee/tests/users/test_users_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def test_it_raises_exception_if_provided_email_is_current_user_email(
user_manager_service = UserManagerService(username=user_1.username)
with pytest.raises(
InvalidEmailException,
match='new email must be different than curent email',
match='new email must be different than current email',
):
user_manager_service.update(new_email=user_1.email)

Expand Down
2 changes: 1 addition & 1 deletion fittrackee/users/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ def update_user(auth_user: User, user_name: str) -> Union[Dict, HttpResponse]:
:statuscode 400:
- ``invalid payload``
- ``valid email must be provided``
- ``new email must be different than curent email``
- ``new email must be different than current email``
:statuscode 401:
- ``provide a valid auth token``
- ``signature expired, please log in again``
Expand Down
2 changes: 1 addition & 1 deletion fittrackee/users/utils/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def _update_user_email(
raise InvalidEmailException('valid email must be provided')
if user.email == new_email:
raise InvalidEmailException(
'new email must be different than curent email'
'new email must be different than current email'
)
if with_confirmation:
user.email_to_confirm = new_email
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/de/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"invalid payload": "Die bereitgestellten Daten sind ungültig.",
"invalid token, please log in again": "Ungültiges Token, bitte erneut anmelden.",
"invalid token, please request a new token": "Ungültiges Token, bitte erneut anmelden.",
"new email must be different than curent email": "Die neue E-Mail muss sich von der aktuellen E-Mail unterscheiden",
"new email must be different than current email": "Die neue E-Mail muss sich von der aktuellen E-Mail unterscheiden",
"no file part": "Keine Datei angegeben.",
"no selected file": "Keine Datei ausgewählt.",
"no tracks in gpx file": "Kein Track (<trk>) in der .gpx-Datei.",
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/en/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"invalid payload": "Provided data are invalid.",
"invalid token, please log in again": "Invalid token, please log in again.",
"invalid token, please request a new token": "Invalid token, please log in again.",
"new email must be different than curent email": "The new email must be different than curent email",
"new email must be different than current email": "The new email must be different than current email",
"no file part": "No file provided.",
"no selected file": "No selected file.",
"no tracks in gpx file": "No track (<trk>) in .gpx file.",
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/es/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"invalid payload": "Los datos proporcionados no son válidos.",
"invalid token, please log in again": "Token no válido, por favor vuelve a iniciar sesión.",
"invalid token, please request a new token": "Token no válido, inicia sesión de nuevo.",
"new email must be different than curent email": "El nuevo email tiene que ser diferente al email actual",
"new email must be different than current email": "El nuevo email tiene que ser diferente al email actual",
"no file part": "Sin fichero.",
"no selected file": "Sin fichero seleccionado.",
"no tracks in gpx file": "No hay pista (<trk>) en el archivo .gpx.",
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/fr/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"invalid payload": "Données fournies incorrectes.",
"invalid token, please log in again": "Jeton de connexion invalide, merci de vous reconnecter.",
"invalid token, please request a new token": "Jeton de connexion, merci de vous reconnecter.",
"new email must be different than curent email": "La nouvelle addresse électronique doit être differente de l'adresse actuelle",
"new email must be different than current email": "La nouvelle addresse électronique doit être differente de l'adresse actuelle",
"no file part": "Pas de fichier fourni.",
"no selected file": "Pas de fichier sélectionné.",
"no tracks in gpx file": "Pas de trace (<trk>) dans le fichier .gpx.",
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/gl/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"invalid payload": "Os datos proporcionados non son válidos.",
"invalid token, please log in again": "Token non válido, accede outra vez.",
"invalid token, please request a new token": "Token non válido, accede outra vez.",
"new email must be different than curent email": "O novo email ten que ser diferente ao actual",
"new email must be different than current email": "O novo email ten que ser diferente ao actual",
"no file part": "Sen ficheiro proporcionado.",
"no selected file": "Sen ficheiro seleccionado.",
"no tracks in gpx file": "Non hai ruta (<trk>) no ficheiro .gpx.",
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/it/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"invalid payload": "I dati inseriti non sono validi.",
"invalid token, please log in again": "Token scaduto, per favore ripeti il log in.",
"invalid token, please request a new token": "Token scaduto, per favore ripeti il log in.",
"new email must be different than curent email": "La nuova email dev'essere diversa dalla vecchia mail",
"new email must be different than current email": "La nuova email dev'essere diversa dalla vecchia mail",
"no file part": "Nessun file scelto.",
"no selected file": "Nessun file scelto.",
"password: password and password confirmation do not match": "Password: la password inserita e la conferma non combaciano.",
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/nl/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"invalid payload": "Ingegeven data is ongeldig.",
"invalid token, please log in again": "Ongeldige token, log opnieuw in.",
"invalid token, please request a new token": "Ongeldige token, log opnieuw in.",
"new email must be different than curent email": "Het nieuwe email adres dient te verschillen van het oude",
"new email must be different than current email": "Het nieuwe email adres dient te verschillen van het oude",
"no file part": "Geen bestand opgegeven.",
"no selected file": "Geen bestand geselecteerd.",
"no tracks in gpx file": "Geen route (<trk>) aanwezig in het .gpx bestand.",
Expand Down
2 changes: 1 addition & 1 deletion fittrackee_client/src/locales/pl/api.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"gpx file is invalid": "Plik .gpx jest niepoprawny.",
"invalid credentials": "Niepoprawne dane logowania.",
"invalid payload": "Przekazane dane są niepoprawne.",
"new email must be different than curent email": "Nowy adres e-mail musi być inny niż aktualny",
"new email must be different than current email": "Nowy adres e-mail musi być inny niż aktualny",
"no file part": "Nie dostarczono pliku.",
"no selected file": "Nie wybrano pliku.",
"no tracks in gpx file": "Brak trasy (<trk>) w pliku .gpx.",
Expand Down

0 comments on commit abe1ad4

Please sign in to comment.