globuzma/canaille-globuzma
1
0
Fork 0
forked from Github-Mirrors/canaille
Code Pull requests Activity

Merge branch 'typos' into 'main'

Browse source 
Fix typos and grammar errors.

See merge request yaal/canaille!84
This commit is contained in:
Éloi Rivard 2023-01-15 08:15:44 +00:00
commit 34abb5bea9
10 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
canaille/conf/config.sample.toml
View file

@ -39,11 +39,11 @@ SECRET_KEY = "change me before you go in production"
# If you have a sentry instance, you can set its dsn here:
# SENTRY_DSN = "https://examplePublicKey@o0.ingest.sentry.io/0"
# If HIDE_INVALID_LOGINS is set to true (the default), when an user
# If HIDE_INVALID_LOGINS is set to true (the default), when a user
# tries to sign in with an invalid login, a message is shown indicating
# that the password is wrong, but does not give a clue wether the login
# exists or not.
# If HIDE_INVALID_LOGINS is set to false, when an user tries to sign in with
# If HIDE_INVALID_LOGINS is set to false, when a user tries to sign in with
# an invalid login, a message is shown indicating that the login does not
# exist.
# HIDE_INVALID_LOGINS = true

2
canaille/templates/group.html
View file

@ -47,7 +47,7 @@
{% if not edited_group %}
{% trans %}Create a new group{% endtrans %}
{% else %}
{% trans %}Edit informations about a group{% endtrans %}
{% trans %}Edit information about a group{% endtrans %}
{% endif %}
</div>
</h2>

2
canaille/templates/invite.html
View file

@ -78,7 +78,7 @@
<div class="ui attached segment">
<h2 class="ui center aligned header">
<div class="content">
{{ _("Invitate an user") }}
{{ _("Invite a user") }}
</div>
</h2>
</div>

2
canaille/templates/mail/firstlogin.txt
View file

@ -1,6 +1,6 @@
# {% trans %}Password reinitialisation{% endtrans %}
{% trans %}Someone, probably you, asked for a password reinitialization link at {{ site_name }}. If you did not asked for this email, please ignore it. I you need to reset your password, please click on the link below and follow the instructions.{% endtrans %}
{% trans %}Someone, probably you, asked for a password reinitialization link at {{ site_name }}. If you did not asked for this email, please ignore it. If you need to reset your password, please click on the link below and follow the instructions.{% endtrans %}
{% trans %}Reset password{% endtrans %}: {{ reset_url }}
{{ site_name }}: {{ site_url }}

2
canaille/templates/oidc/admin/authorization_view.html
View file

@ -4,7 +4,7 @@
{% block content %}
<div class="loginform">
<h3 class="ui top attached header">
{% trans %}View a authorization{% endtrans %}
{% trans %}View an authorization{% endtrans %}
</h3>
<div class="ui attached clearing segment">

2
canaille/templates/oidc/user/logout.html
View file

@ -13,7 +13,7 @@
<p>
{{ _("You are currently logged in as %(username)s.", username=user.name) }}
{% if client %}
{{ _("The application %(client_name)s want to disconnect your account.", client_name=client.client_name) }}
{{ _("The application %(client_name)s wants to disconnect your account.", client_name=client.client_name) }}
{% endif %}
</p>
</div>

4
canaille/templates/profile.html
View file

@ -60,9 +60,9 @@
{% if not edited_user %}
{% trans %}Create a new user account{% endtrans %}
{% elif user.uid == edited_user.uid %}
{% trans %}Edit your personal informations{% endtrans %}
{% trans %}Edit your personal information{% endtrans %}
{% else %}
{% trans %}Edit informations about an user{% endtrans %}
{% trans %}Edit information about a user{% endtrans %}
{% endif %}
</div>
</h2>

4
demo/conf-docker/canaille.toml
View file

@ -39,11 +39,11 @@ OIDC_DYNAMIC_CLIENT_REGISTRATION_TOKENS = [
# If you have a sentry instance, you can set its dsn here:
# SENTRY_DSN = "https://examplePublicKey@o0.ingest.sentry.io/0"
# If HIDE_INVALID_LOGINS is set to true (the default), when an user
# If HIDE_INVALID_LOGINS is set to true (the default), when a user
# tries to sign in with an invalid login, a message is shown indicating
# that the password is wrong, but does not give a clue wether the login
# exists or not.
# If HIDE_INVALID_LOGINS is set to false, when an user tries to sign in with
# If HIDE_INVALID_LOGINS is set to false, when a user tries to sign in with
# an invalid login, a message is shown indicating that the login does not
# exist.
# HIDE_INVALID_LOGINS = true

4
demo/conf/canaille.toml
View file

@ -39,11 +39,11 @@ OIDC_DYNAMIC_CLIENT_REGISTRATION_TOKENS = [
# If you have a sentry instance, you can set its dsn here:
# SENTRY_DSN = "https://examplePublicKey@o0.ingest.sentry.io/0"
# If HIDE_INVALID_LOGINS is set to true (the default), when an user
# If HIDE_INVALID_LOGINS is set to true (the default), when a user
# tries to sign in with an invalid login, a message is shown indicating
# that the password is wrong, but does not give a clue wether the login
# exists or not.
# If HIDE_INVALID_LOGINS is set to false, when an user tries to sign in with
# If HIDE_INVALID_LOGINS is set to false, when a user tries to sign in with
# an invalid login, a message is shown indicating that the login does not
# exist.
# HIDE_INVALID_LOGINS = true

2
doc/install.rst
View file

@ -229,7 +229,7 @@ expired tokens and authorization codes with:
Webfinger
=========
You may want to configure a `WebFinger`_ endpoint on your main website to allow the automatic discovery of your Canaille installation based on the account name of one of your users. For instance, suppose your domain is ``mydomain.tld`` and your Canaille domain is ``auth.mydomain.tld`` and there is an user ``john.doe``. A third-party application could require to authenticate the user and ask them for an user account. The user would give their account ``john.doe@mydomain.tld``, then the application would perform a WebFinger request at ``https://mydomain.tld/.well-known/webfinger`` and the response would contain the address of the authentication server ``https://auth.mydomain.tld``. With this information the third party application can redirect the user to the Canaille authentication page.
You may want to configure a `WebFinger`_ endpoint on your main website to allow the automatic discovery of your Canaille installation based on the account name of one of your users. For instance, suppose your domain is ``mydomain.tld`` and your Canaille domain is ``auth.mydomain.tld`` and there is a user ``john.doe``. A third-party application could require to authenticate the user and ask them for a user account. The user would give their account ``john.doe@mydomain.tld``, then the application would perform a WebFinger request at ``https://mydomain.tld/.well-known/webfinger`` and the response would contain the address of the authentication server ``https://auth.mydomain.tld``. With this information the third party application can redirect the user to the Canaille authentication page.
The difficulty here is that the WebFinger endpoint must be hosted at the top-level domain (i.e. ``mydomain.tld``) while the authentication server might be hosted on a sublevel (i.e. ``auth.mydomain.tld``). Canaille provides a WebFinger endpoint, but if it is not hosted at the top-level domain, a web redirection is required on the ``/.well-known/webfinger`` path.