From cca8da57725bb9f17daa1e9c94f9e41cbb3ea4c7 Mon Sep 17 00:00:00 2001 From: Evarin Date: Fri, 22 Jun 2018 22:05:42 +0200 Subject: [PATCH 1/3] Show prominently the Clipper third-party --- README.rst | 7 +++ allauth_ens/scss/_highlight_clipper.scss | 35 +++++++++++++ allauth_ens/scss/screen.scss | 2 + allauth_ens/static/allauth_ens/screen.css | 50 +++++++++++++++---- allauth_ens/templates/account/login.html | 14 +++++- allauth_ens/templates/allauth_ens/base.html | 2 +- .../socialaccount/snippets/provider_list.html | 6 +-- allauth_ens/templatetags/allauth_ens.py | 6 +++ 8 files changed, 108 insertions(+), 14 deletions(-) create mode 100644 allauth_ens/scss/_highlight_clipper.scss diff --git a/README.rst b/README.rst index 754fdf4..f7d266d 100644 --- a/README.rst +++ b/README.rst @@ -77,6 +77,13 @@ See also the `allauth configuration`_ and `advanced usage`_ docs pages. **Examples:** ``'my-account'``, ``'/my-account/'`` +``ALLAUTH_ENS_HIGHLIGHT_CLIPPER`` + *Optional* — Boolean (default: `True`). + + When set to `True`, displays prominently the Clipper option in the login view + (if you use the `allauth_ens` templates). + + ***** Views ***** diff --git a/allauth_ens/scss/_highlight_clipper.scss b/allauth_ens/scss/_highlight_clipper.scss new file mode 100644 index 0000000..eeac915 --- /dev/null +++ b/allauth_ens/scss/_highlight_clipper.scss @@ -0,0 +1,35 @@ +.content-wrapper.highlight-clipper { + .main-login-choices { + li:not(:first-child) { + margin-top: 5px; + } + + a { + display: block; + text-align: center; + background: $gray-lighter; + padding: 35px 20px; + color: $black; + font-size: 1.1em; + + @include hover-focus { + background: lighten($brand-primary, 50%); + text-decoration: none; + } + } + } + &:not(.not-clipper) { + width: 100vw; + max-width: 500px; + + & > :not(.main-login-choices) { + display: none; + } + } + + &.not-clipper { + .main-login-choices { + display: none; + } + } +} diff --git a/allauth_ens/scss/screen.scss b/allauth_ens/scss/screen.scss index 59610da..800e15c 100644 --- a/allauth_ens/scss/screen.scss +++ b/allauth_ens/scss/screen.scss @@ -5,3 +5,5 @@ @import "mixins"; @import "base"; + +@import "highlight_clipper"; diff --git a/allauth_ens/static/allauth_ens/screen.css b/allauth_ens/static/allauth_ens/screen.css index 648dd92..b6c06b1 100644 --- a/allauth_ens/static/allauth_ens/screen.css +++ b/allauth_ens/static/allauth_ens/screen.css @@ -1,4 +1,4 @@ -/* line 5, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -20,45 +20,45 @@ time, mark, audio, video { vertical-align: baseline; } -/* line 22, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } -/* line 103, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 103, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../vendor/bundle/ruby/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../var/lib/gems/2.3.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -775,3 +775,35 @@ section > * + * { background: #2d672d; color: #fff; } + +/* line 3, ../../scss/_highlight_clipper.scss */ +.content-wrapper.highlight-clipper .main-login-choices li:not(:first-child) { + margin-top: 5px; +} +/* line 7, ../../scss/_highlight_clipper.scss */ +.content-wrapper.highlight-clipper .main-login-choices a { + display: block; + text-align: center; + background: #eceeef; + padding: 35px 20px; + color: #000; + font-size: 1.1em; +} +/* line 10, ../../scss/_mixins.scss */ +.content-wrapper.highlight-clipper .main-login-choices a:focus, .content-wrapper.highlight-clipper .main-login-choices a:hover { + background: #a8d6fe; + text-decoration: none; +} +/* line 21, ../../scss/_highlight_clipper.scss */ +.content-wrapper.highlight-clipper:not(.not-clipper) { + width: 100vw; + max-width: 500px; +} +/* line 25, ../../scss/_highlight_clipper.scss */ +.content-wrapper.highlight-clipper:not(.not-clipper) > :not(.main-login-choices) { + display: none; +} +/* line 31, ../../scss/_highlight_clipper.scss */ +.content-wrapper.highlight-clipper.not-clipper .main-login-choices { + display: none; +} diff --git a/allauth_ens/templates/account/login.html b/allauth_ens/templates/account/login.html index 99c4ab8..87196a5 100644 --- a/allauth_ens/templates/account/login.html +++ b/allauth_ens/templates/account/login.html @@ -30,10 +30,23 @@ {% endif %} {% endblock %} +{% block content-extra-classes %}{% is_clipper_highlighted as highlight_clipper %}{% if highlight_clipper %}highlight-clipper{% endif %}{% endblock %} + {% block content %} {% get_providers as socialaccount_providers %} +{% is_clipper_highlighted as highlight_clipper %} + +{% if highlight_clipper %} +
+ +
+{% endif %} + {% if socialaccount_providers %}
- {% endblock %} {% block extra_js %} diff --git a/allauth_ens/templates/allauth_ens/base.html b/allauth_ens/templates/allauth_ens/base.html index 7606848..01e6a65 100644 --- a/allauth_ens/templates/allauth_ens/base.html +++ b/allauth_ens/templates/allauth_ens/base.html @@ -79,7 +79,7 @@ {% block messages-extra %}{% endblock %} -
+
{% block content %}{% endblock %}
diff --git a/allauth_ens/templates/socialaccount/snippets/provider_list.html b/allauth_ens/templates/socialaccount/snippets/provider_list.html index 649b7fc..ab0fe71 100644 --- a/allauth_ens/templates/socialaccount/snippets/provider_list.html +++ b/allauth_ens/templates/socialaccount/snippets/provider_list.html @@ -7,7 +7,7 @@ {% for provider in socialaccount_providers %} {% if provider.id == "openid" %} {% for brand in provider.get_brands %} -
  • +
  • @@ -16,9 +16,9 @@
    • {% endfor %} {% endif %} -
  • +
  • {{ provider.name }} diff --git a/allauth_ens/templatetags/allauth_ens.py b/allauth_ens/templatetags/allauth_ens.py index c369fe1..e00c6b6 100644 --- a/allauth_ens/templatetags/allauth_ens.py +++ b/allauth_ens/templatetags/allauth_ens.py @@ -33,3 +33,9 @@ def get_profile_url(): def is_open_for_signup(context): request = context['request'] return get_adapter(request).is_open_for_signup(request) + + +@simple_tag +def is_clipper_highlighted(): + return ('allauth_ens.providers.clipper' in getattr(settings, 'INSTALLED_APPS', [])) \ + and getattr(settings, 'ALLAUTH_ENS_HIGHLIGHT_CLIPPER', True) -- 2.47.0 From 7a0ec189e21ac5e9c1143ca71023b79483be9712 Mon Sep 17 00:00:00 2001 From: Evarin Date: Fri, 22 Jun 2018 22:37:16 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Traductions=20en=20Fran=C3=A7ais?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- allauth_ens/locale/fr/LC_MESSAGES/django.mo | Bin 0 -> 6572 bytes allauth_ens/locale/fr/LC_MESSAGES/django.po | 413 ++++++++++++++++++++ 2 files changed, 413 insertions(+) create mode 100644 allauth_ens/locale/fr/LC_MESSAGES/django.mo create mode 100644 allauth_ens/locale/fr/LC_MESSAGES/django.po diff --git a/allauth_ens/locale/fr/LC_MESSAGES/django.mo b/allauth_ens/locale/fr/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..3a2bb04b636abd72949f637e7a204528ebc7cfe1 GIT binary patch literal 6572 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, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-06-22 22:11+0200\n" +"PO-Revision-Date: 2018-06-22 22:35+0200\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Last-Translator: \n" +"Language-Team: \n" +"X-Generator: Poedit 1.8.7.1\n" + +#: apps.py:7 +msgid "ENS Authentication" +msgstr "Connexion pour l'ENS" + +#: templates/account/account_inactive.html:5 +#: templates/account/account_inactive.html:6 +msgid "Account Inactive" +msgstr "Compte inactif" + +#: templates/account/account_inactive.html:12 +msgid "" +"\n" +" This account is inactive.\n" +" " +msgstr "" +"\n" +" Ce compte est inactif.\n" +" " + +#: templates/account/email.html:4 templates/account/email.html:5 +msgid "E-mail Addresses" +msgstr "Adresses e-mail" + +#: templates/account/email.html:16 +msgid "" +"\n" +" The following e-mail addresses are associated with your account:\n" +" " +msgstr "" +"\n" +" Les adresses mails suivantes sont associées à votre compte :\n" +" " + +#: templates/account/email.html:30 +msgid "This email address is verified." +msgstr "Cette adresse e-mail est vérifiée." + +#: templates/account/email.html:34 +msgid "This email address is not verified." +msgstr "Cette adresse e-mail n'est pas vérifiée." + +#: templates/account/email.html:40 +msgid "This is your primary email address." +msgstr "Ceci est votre adresse e-mail primaire." + +#: templates/account/email.html:54 +msgid "Remove" +msgstr "Supprimer" + +#: templates/account/email.html:65 +msgid "Re-send verification" +msgstr "Ré-envoyer le message de vérification" + +#: templates/account/email.html:77 +msgid "Make primary" +msgstr "Rendre principale" + +#: templates/account/email.html:90 +msgid "" +"\n" +" You currently do not have any e-mail address set up. You should really\n" +" add an e-mail address so you can receive notifications, reset your\n" +" password, etc.\n" +" " +msgstr "" +"\n" +" Vous n'avez actuellement aucune adresse e-mail associée à votre compte.\n" +" Vous devriez vraiment ajouter une adresse e-mail afin que vous puissiez " +"recevoir\n" +" des notifications, réinitialiser votre mot de passe, etc.\n" +" " + +#: templates/account/email.html:101 +msgid "Add E-mail" +msgstr "Ajouter un e-mail" + +#: templates/account/email_confirm.html:5 +#: templates/account/email_confirm.html:6 +msgid "Confirm E-mail Address" +msgstr "Confirmer l'adresse e-mail" + +#: templates/account/email_confirm.html:18 +#, python-format +msgid "" +"\n" +" Please confirm that %(email)s is an e-mail address for user\n" +" %(user_display)s.\n" +" " +msgstr "" +"\n" +" Merci de confirmer que %(email)s est une adresse e-mail pour " +"l'utilisateur\n" +" %(user_display)s.\n" +" " + +#: templates/account/email_confirm.html:26 +msgid "Confirm" +msgstr "Confirmer" + +#: templates/account/email_confirm.html:34 +#, python-format +msgid "" +"\n" +" This e-mail confirmation link expired or is invalid.
    \n" +" Please issue a new e-mail confirmation " +"request.\n" +" " +msgstr "" +"\n" +" Ce lien de confirmation d'e-mail a expiré ou est invalide.
    \n" +" Merci de soumettre une nouvelle requête de " +"confirmation d'e-mail.\n" +" " + +#: templates/account/login.html:5 templates/account/login.html:6 +#: templates/account/login.html:78 +msgid "Sign In" +msgstr "Connexion" + +#: templates/account/login.html:14 +msgid "" +"\n" +" Authentication failed. Please check your credentials and try " +"again.\n" +" " +msgstr "" +"\n" +" L'authentification a échoué. Merci de vérifier vos identifiants et " +"essayer à nouveau.\n" +" " + +#: templates/account/login.html:22 +#, python-format +msgid "" +"\n" +" Your are authenticated as %(user_str)s, but are not authorized to " +"access\n" +" this page. Would you like to login to a different account ?\n" +" " +msgstr "" +"\n" +" Vous êtes identifié comme %(user_str)s, mais vous n'être pas " +"autorisé à accéder\n" +" à cette page. Voulez-vous essayer avec un compte différent ?\n" +" " + +#: templates/account/login.html:44 +msgid "Connect with Clipper" +msgstr "Connexion via Clipper" + +#: templates/account/login.html:45 +msgid "Other ways to sign in/sign up" +msgstr "Autres méthodes de connexion" + +#: templates/account/login.html:65 +#, fuzzy +msgid "" +"\n" +" Please sign in with one of your existing third party accounts, or with " +"the form below.\n" +" " +msgstr "" +"\n" +" Merci de vous connecter avec un de vos comptes tiers existants, ou avec " +"le formulaire ci-dessous.\n" +" " + +#: templates/account/login.html:70 +msgid "Forgot Password?" +msgstr "Mot de passe oublié ?" + +#: templates/account/login.html:73 templates/account/signup.html:17 +#: templates/socialaccount/signup.html:19 +msgid "Sign Up" +msgstr "Nouveau compte" + +#: templates/account/logout.html:4 templates/account/logout.html:5 +#: templates/account/logout.html:20 +msgid "Sign Out" +msgstr "Déconnexion" + +#: templates/account/logout.html:11 +msgid "" +"\n" +" Are you sure you want to sign out?\n" +" " +msgstr "" +"\n" +" Êtes-vous sûr de vouloir vous déconnecter ?\n" +" " + +#: templates/account/password_change.html:4 +#: templates/account/password_change.html:5 +#: templates/account/password_change.html:18 +#: templates/account/password_reset_from_key.html:4 +#: templates/account/password_reset_from_key.html:5 +#: templates/account/password_reset_from_key_done.html:4 +#: templates/account/password_reset_from_key_done.html:5 +msgid "Change Password" +msgstr "Changer le mot de passe" + +#: templates/account/password_reset.html:4 +#: templates/account/password_reset.html:5 +#: templates/account/password_reset_done.html:4 +#: templates/account/password_reset_done.html:5 +msgid "Password Reset" +msgstr "Réinitialisation du mot de passe" + +#: templates/account/password_reset.html:11 +msgid "" +"\n" +" Forgotten your password? Enter your e-mail address below, and we'll " +"send\n" +" you an e-mail allowing you to reset it.\n" +" " +msgstr "" +"\n" +" Vous avez oublié votre mot de passe ? Entrez votre adresse e-mail ci-" +"dessous, et\n" +" nous vous enverrons un e-mail qui vous permettra de le réinitialiser.\n" +" " + +#: templates/account/password_reset.html:18 +#: templates/account/password_reset_from_key.html:21 +msgid "Reset Password" +msgstr "Réinitialiser le mot de passe" + +#: templates/account/password_reset_done.html:11 +msgid "" +"\n" +" We have sent you an e-mail. Please contact us if you do not receive it " +"within a few minutes.\n" +" " +msgstr "" +"\n" +" Nous vous avons envoyé un e-mail. Merci de nous contacter si vous ne " +"l'avez pas reçu d'ici quelques minutes.\n" +" " + +#: templates/account/password_reset_from_key.html:13 +#, python-format +msgid "" +"\n" +" The password reset link was invalid, possibly because it has already " +"been used.\n" +" Please request a new password reset.\n" +" " +msgstr "" +"\n" +" Le lien de réinitialisation de mot de passe est invalide, possiblement " +"parce qu'il a déjà été utilisé.\n" +" Merci de faire une nouvelle demande.\n" +" " + +#: templates/account/password_reset_from_key.html:24 +msgid "Your password is now changed." +msgstr "Votre mot de passe a été modifié." + +#: templates/account/password_reset_from_key_done.html:11 +msgid "" +"\n" +" Your password is now changed.\n" +" " +msgstr "" +"\n" +" Votre mot de passe a été modifié.\n" +" " + +#: templates/account/password_set.html:4 templates/account/password_set.html:5 +#: templates/account/password_set.html:24 +msgid "Set Password" +msgstr "Définir le mot de passe" + +#: templates/account/password_set.html:17 +msgid "" +"\n" +" Your account does not have a password yet. Add one to authenticate " +"without\n" +" third parties.\n" +" " +msgstr "" +"\n" +" Votre compte n'a pas encore de mot de passe. Ajoutez-en un pour vous " +"connecter\n" +" sans compte tiers.\n" +" " + +#: templates/account/signup.html:4 templates/account/signup.html:5 +#: templates/socialaccount/signup.html:4 templates/socialaccount/signup.html:5 +msgid "Signup" +msgstr "Nouveau compte" + +#: templates/account/signup.html:12 +msgid "Already have an account?" +msgstr "Vous avez déjà un compte ?" + +#: templates/account/signup_closed.html:4 +#: templates/account/signup_closed.html:5 +msgid "Sign Up Closed" +msgstr "Création de compte fermée" + +#: templates/account/signup_closed.html:11 +msgid "" +"\n" +" We are sorry, but the sign up is currently closed.\n" +" " +msgstr "" +"\n" +" Nous sommes désolés, mais la création de compte est actuellement " +"désactivée.\n" +" " + +#: templates/allauth_ens/base.html:71 +msgid "Not Connected" +msgstr "Non connecté" + +#: templates/socialaccount/authentication_error.html:4 +#: templates/socialaccount/authentication_error.html:5 +msgid "Login Failure" +msgstr "Échec de la connexion" + +#: templates/socialaccount/authentication_error.html:11 +msgid "" +"\n" +" An error occured while attempting to login via your social network " +"account.\n" +" " +msgstr "" +"\n" +" Une erreur s'est produite lors de la connexion via le site externe.\n" +" " + +#: templates/socialaccount/connections.html:5 +#: templates/socialaccount/connections.html:6 +#, fuzzy +msgid "Account Connections" +msgstr "Méthodes de connexion" + +#: templates/socialaccount/connections.html:13 +msgid "" +"\n" +" You can sign in to your account using any of the following third party " +"accounts:\n" +" " +msgstr "" +"\n" +" Vous pouvez vous connecter à votre compte en utilisant n'importe lequel " +"de ces comptes tiers :\n" +" " + +#: templates/socialaccount/connections.html:17 +msgid "" +"\n" +" You currently have no third party accounts connected to this account.\n" +" " +msgstr "" +"\n" +" Vous n'avez actuellement aucun compte tiers associé à ce compte.\n" +" " + +#: templates/socialaccount/login_cancelled.html:4 +#: templates/socialaccount/login_cancelled.html:5 +msgid "Login Cancelled" +msgstr "Connexion annulée" + +#: templates/socialaccount/login_cancelled.html:13 +#, fuzzy, python-format +msgid "" +"\n" +" You decided to cancel logging into our site using one of your existing " +"accounts. If this was a mistake, please proceed to sign in." +msgstr "" +"\n" +" Vous avez décidé d'annuler la connexion à notre site via un de vos " +"comptes existants. Si cela était une erreur, merci de retourner à la page de connexion." + +#: templates/socialaccount/signup.html:11 +#, python-format +msgid "" +"\n" +" You are about to use your %(provider_name)s account to login.\n" +" As a final step, please complete the following form:\n" +" " +msgstr "" +"\n" +" Vous êtes sur le point d'utiliser votre compte %(provider_name)s pour " +"vous connecter\n" +" Pour finaliser la procédure, merci de remplir le formulaire suivant :\n" +" " -- 2.47.0 From 232236b50b6ec20dc5289116aa481d112b4213b4 Mon Sep 17 00:00:00 2001 From: Evarin Date: Sun, 24 Jun 2018 20:11:33 +0200 Subject: [PATCH 3/3] Fix translation and indentation --- allauth_ens/locale/fr/LC_MESSAGES/django.mo | Bin 6572 -> 6615 bytes allauth_ens/locale/fr/LC_MESSAGES/django.po | 12 ++++++++---- allauth_ens/templates/account/login.html | 12 ++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/allauth_ens/locale/fr/LC_MESSAGES/django.mo b/allauth_ens/locale/fr/LC_MESSAGES/django.mo index 3a2bb04b636abd72949f637e7a204528ebc7cfe1..bc56d21e9d798158368217bb86c9703a30e247d8 100644 GIT binary patch delta 1078 zcmYk*Pe_zO7{~G7w(Gy#UDHk1f0d@&pIxihRmx20AQFYqK{`n0p+!p~Ht8Z2yB5p z(dI2<4Sx6guCzwOCPt%D44aWh>7aigZ~(V3K7?_cL|b?o*{o)Q@j2wt0xt{XC9*fY z3Hpm@^Ovxc@9PTCvcEsxqx~4ubBM;(?tCaKjQ?>v%Nu#S4+q7 z6!zc~e1uO&q4^WqdWiH&##SweTwGG0h>{;aLn4A@yMp?@|(e+_Nn8V;Dvs~t&_vS^t( zjIDSY?QXbeAAF2k@fq^yV=%soHvbn|;A$ZMO<2{iK9IpQ{a$RxF|>tm1pVj8N%;R3 z8@J%?cNVl2J2oqJ-d6TdGk!}7qXoT>x`Dcj>QA;E@GtT+U}>?`T2QtVE8D%B;bh9f z`oCC0|CJpy>~1^WVz{feBN!%DKYMnkQeJf=5!zi$Me54Sa_90Bxv@*d?r1Jl*4>hI mdOIEOeylYbv@=fDalDauoA*9;tLVn(DoSk1R54LM8~O{cXl}y* delta 1048 zcmXxjJ7`l;9LMp0OzblcZQ7=-TARMonyPsal&X^;TB?H4p;%k!ps0hmXa{M8LW_uk zxwvTRAnIT{8AmB71z+H#s6(6t!50p?Dfs=}+#c?^pK}hJ$NzuseV<**7CtovZW<*; z-AFC@%=W77=S3L^n2q5e-osg3)c9Jn34Dur%+{D4!+9LS3eI3dt=SY_!4dq9J-DOJ ztY}uS<1}_N@DopBvfk`67V#lQ8_Z7OGA6LU(QF+aLWXP-+wcrVa2DCa9Bjqg*o==* z^PXc9esKE*vu`vs@h^rj7^GqcFZC0+33C|6JZixyBuKmHjn5#DUE`$#+(KfqyIy}0 zHNT9S_Y8a3-(J$#j6XDhA$HYAy zhgIpW;@-2GLsYG&q8~_yR>sy)wXTW+;HPl|jcCEGRGmtZxW!rU$NC0Wd!9<WYUMC)i`Uc9mKx 1);\n" -"Last-Translator: \n" -"Language-Team: \n" "X-Generator: Poedit 1.8.7.1\n" #: apps.py:7 @@ -168,6 +168,10 @@ msgstr "" msgid "Connect with Clipper" msgstr "Connexion via Clipper" +#: templates/account/login.html:45 +msgid "Other choices" +msgstr "Autres choix" + #: templates/account/login.html:45 msgid "Other ways to sign in/sign up" msgstr "Autres méthodes de connexion" diff --git a/allauth_ens/templates/account/login.html b/allauth_ens/templates/account/login.html index 87196a5..a683783 100644 --- a/allauth_ens/templates/account/login.html +++ b/allauth_ens/templates/account/login.html @@ -39,12 +39,12 @@ {% is_clipper_highlighted as highlight_clipper %} {% if highlight_clipper %} - + {% endif %} {% if socialaccount_providers %} -- 2.47.0