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.49.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.49.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 zcmZ2ueBHSIo)F7a1_lNOLk0#083qQ1C5#LV&I}9;I?NzZ1_lcj28Kum1_nzO28JaJ z3=ET57#LPFFfdrKGBCt3Ffcq}Wnc(qU|?`&V_*nnU|^We#=xM%z`*d9je((#fq_Aa zoq-{Vfq`KrI|G9k0|Ub!b_NDz1_lOq4hDuv3=H)Q*&GZEHVh05|2P;J(ij*RtT`DN z8W`_}28JUH3=H@A85lA_Q76E_;KRVcz$eJS;LE_k5G}~S zV8Ot^uu_nLVHpDh!y`ckhC&7ghE5>{22TbChTlRA4D|{O3=FQq3=C@+7#Pxo85m+1 z7#M^_7#J!T7#IpfAW`sAgn{8X0|UbpQHTR-#26U#7#JAdh(SU^TAYDF5ab|nNE)&c zXJ8O#U|@(8XJFt2g_Jl0gA@Y;L$x>qgD3+7!!&V7RIL$bs0YW*9&t!qT@;7L4V3>I zYOs(5Bx+P7AW>r^0SOs<2?hp51_p*$2}s(gmw;HfT!Mi?j)8$;qXZ;vT!4zdgzEn+ z0dY8kWIY3eGy?+zza&IJTatl6i-Cc`N|J#=g@J(~RT5%w7nHwAl7WE{np;4L5tOh% z>Oct!lwUw88$^TR8$|0eFfeF?7z_*ypbP~{Kl%&|3``6R3>qMDkY~ z&CRMTVjS$r8TpyXsl}U3c#;{}O%#j_tPBk%&*N3(fwHv?j0_AW$M7jnKEpe4b3NZ2 OPF9eXip|0jGZ_J|Xl}y* delta 1048 zcmca^yvDfxo)F7a1_lNO0|o{L83qQ1IgAVp&LB23NR)v=gN1=1l7WFilZAm{2?GN| zGYbR5Y6b=d4ORw*I0goWE36C*!3+!x#%v4>p$rTR?Q9GTIt&a9ci9*i>KGUpxY!vO zk{B2mI@uW*ycif5-mo(;C^IlHm~${NOk!ZDXNcxtV6b6eV0g#Dz>vnkz@W{^z|g?J zz%YrEfngN`1A{OZ14B9k1H(Qp1_pHo1_m{51_l8J1_nQF1_mw$28MWU1_lWR28Jwd z1_pkR1GyO(*cliYCUY||h%qoQ%;sib5Mf|o*aX#goST6`h=GCO2AE&Z!0;NX@eelx z11|#u0}l@a0}lfOgA@;hug=53Aj`nOV9LY5z{kMA5X=KHFo}nOfsKKIp&Tk+2i4ch z198AC9tH*u1_p*jQ2uJDy3J61hj$kLL$(kDgC{6zgcukU7#JATg&7#?*Dx?JcnC8v#4s>0 zd=+M3s9<1V2oiw={b>;fhUW|n3}vDa2gHdnFz7KbFq{*Egv4Jl1_nWpgTx_eM^2o9 zL7ahs!CIVwffE!`;tUK@3=9mh;tUL;3=9kv;*con6NiN0JaLA4a2#zGhs4P#aY&rq z6^9u7MH~_ZY!Z+V5s_eEP-I|WFp_|zg%AmdMKux(40525kbtCxrBLyG5|F4oApvpl zRS50tGinkOATWRtAVi`9UdDmjU7`P>_MuOrFau zuBr)UA_!1G!g#6-kUXG2`6jcms5Vqsk^vHGptPhiS&>DUQDd_yix|h|NS+u*b|VEN pBP&D0$$NMedBALAQ*8qy1B1!je3K@>;#Jx_mv0W|W;cn6i~wMrXAJ-V diff --git a/allauth_ens/locale/fr/LC_MESSAGES/django.po b/allauth_ens/locale/fr/LC_MESSAGES/django.po index d8ee51a..b3ce885 100644 --- a/allauth_ens/locale/fr/LC_MESSAGES/django.po +++ b/allauth_ens/locale/fr/LC_MESSAGES/django.po @@ -7,15 +7,15 @@ 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" +"POT-Creation-Date: 2018-06-24 20:10+0200\n" +"PO-Revision-Date: 2018-06-24 20:10+0200\n" +"Last-Translator: \n" +"Language-Team: \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 @@ -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.49.0