From 7fc420496032ab7626217eb29178a5725818dc65 Mon Sep 17 00:00:00 2001 From: Alice Date: Sun, 12 Jul 2020 20:39:43 +0200 Subject: [PATCH] more wireguard ui polishing --- lambdainst/views.py | 9 ++ locale/fr/LC_MESSAGES/django.po | 167 +++++++++++++++++----------- templates/account_layout.html | 2 +- templates/ccvpn/index.html | 6 +- templates/lambdainst/wireguard.html | 18 ++- templates/pages/help.en.md | 2 +- templates/pages/help.fr.md | 2 +- 7 files changed, 129 insertions(+), 77 deletions(-) diff --git a/lambdainst/views.py b/lambdainst/views.py index 5994870..58cb419 100644 --- a/lambdainst/views.py +++ b/lambdainst/views.py @@ -422,6 +422,15 @@ def wireguard(request): def wireguard_new(request): if not request.user.vpnuser.is_paid: return redirect('account:index') + + try: + keys = django_lcore.api.get_wg_peers(request.user.username) + except lcoreapi.APINotFoundError: + django_lcore.sync_user(request.user.vpnuser) + keys = [] + if len(keys) >= int(site_config.WIREGUARD_MAX_PEERS): + return redirect('/account/wireguard') + api = django_lcore.api if request.method == 'POST': action = request.POST.get('action') diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index d8be94c..902d4cb 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-03-27 18:32+0000\n" +"POT-Creation-Date: 2020-07-15 22:27+0000\n" "PO-Revision-Date: 2016-04-07 01:32+0000\n" "Last-Translator: \n" "Language-Team: \n" @@ -35,39 +35,39 @@ msgstr "Chat Live" msgid "Download {} v{}" msgstr "Télécharger {} v{}" -#: lambdainst/admin.py:25 +#: lambdainst/admin.py:26 msgid "Code must be [a-zA-Z0-9]" msgstr "" -#: lambdainst/admin.py:27 +#: lambdainst/admin.py:28 msgid "Code must be between 1 and 32 characters" msgstr "" -#: lambdainst/admin.py:46 +#: lambdainst/admin.py:47 msgid "(rewarded)" msgstr "" -#: lambdainst/admin.py:48 +#: lambdainst/admin.py:49 msgid "(not rewarded)" msgstr "" -#: lambdainst/admin.py:51 +#: lambdainst/admin.py:52 msgid "Referrer" msgstr "" -#: lambdainst/admin.py:56 lambdainst/admin.py:100 +#: lambdainst/admin.py:57 lambdainst/admin.py:99 msgid "Is paid?" msgstr "Est payé?" -#: lambdainst/admin.py:90 +#: lambdainst/admin.py:89 msgid "Important dates" msgstr "Dates importantes" -#: lambdainst/admin.py:91 +#: lambdainst/admin.py:90 msgid "Permissions" msgstr "Permissions" -#: lambdainst/admin.py:139 tickets/admin.py:44 +#: lambdainst/admin.py:138 tickets/admin.py:44 msgid "Comment" msgstr "Notes" @@ -213,50 +213,50 @@ msgstr "" msgid "%s Pbps" msgstr "" -#: lambdainst/views.py:156 +#: lambdainst/views.py:155 msgid "Awesome VPN! 3€ per month, with a free 7 days trial!" msgstr "" -#: lambdainst/views.py:172 templates/account_layout.html:10 +#: lambdainst/views.py:171 templates/account_layout.html:10 #: templates/lambdainst/account.html:17 msgid "Account" msgstr "Compte" -#: lambdainst/views.py:217 lambdainst/views.py:237 lambdainst/views.py:262 +#: lambdainst/views.py:216 lambdainst/views.py:236 lambdainst/views.py:261 msgid "OK!" msgstr "OK!" -#: lambdainst/views.py:219 +#: lambdainst/views.py:218 msgid "Invalid captcha" msgstr "Captcha invalide" -#: lambdainst/views.py:233 +#: lambdainst/views.py:232 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: lambdainst/views.py:247 templates/account_layout.html:28 +#: lambdainst/views.py:246 templates/account_layout.html:28 #: templates/lambdainst/settings.html:6 msgid "Settings" msgstr "Options" -#: lambdainst/views.py:258 +#: lambdainst/views.py:257 msgid "Gift code not found or already used." msgstr "Code inconnu ou déjà utilisé." -#: lambdainst/views.py:260 +#: lambdainst/views.py:259 msgid "Gift code only available to free accounts." msgstr "Code uniquement disponible pour les nouveaux comptes." -#: lambdainst/views.py:288 templates/account_layout.html:36 +#: lambdainst/views.py:287 templates/account_layout.html:36 #: templates/lambdainst/logs.html:6 msgid "Logs" msgstr "Logs" -#: lambdainst/views.py:295 templates/lambdainst/config.html:7 +#: lambdainst/views.py:294 templates/lambdainst/config.html:7 msgid "Config" msgstr "Config" -#: lambdainst/views.py:319 payments/backends/bitcoin.py:90 +#: lambdainst/views.py:322 payments/backends/bitcoin.py:90 #: payments/backends/bitcoin.py:92 templates/admin/index.html:53 #: templates/admin/index.html:56 templates/lambdainst/admin_ref.html:16 #: templates/lambdainst/admin_status.html:16 templates/payments/list.html:13 @@ -425,13 +425,13 @@ msgstr "" msgid "Overview" msgstr "Vue d'ensemble" -#: templates/account_layout.html:18 -msgid "OpenVPN Config" -msgstr "Config OpenVPN" +#: templates/account_layout.html:18 templates/ccvpn/index.html:41 +msgid "OpenVPN" +msgstr "OpenVPN" #: templates/account_layout.html:23 msgid "WireGuard" -msgstr "" +msgstr "WireGuard" #: templates/account_layout.html:32 templates/payments/list.html:6 msgid "Payments" @@ -571,21 +571,21 @@ msgstr "avec une adresse anonyme." msgid "Supports DNSSEC and PFS." msgstr "Avec du DNSSEC et PFS." -#: templates/ccvpn/index.html:41 -msgid "OpenVPN" -msgstr "OpenVPN" - #: templates/ccvpn/index.html:54 msgid "Fast" msgstr "Rapide" +#: templates/ccvpn/index.html:55 +msgid "Up to 1Gbps." +msgstr "Jusqu'à 1Gbps." + #: templates/ccvpn/index.html:56 -msgid "Compressed tunnel." -msgstr "Tunnel compressé." +msgid "With WireGuard compatibility" +msgstr "Compatible avec WireGuard" #: templates/ccvpn/index.html:57 -msgid "Even on YouTube." -msgstr "Même sur YouTube." +msgid "for the best performances." +msgstr "pour de meilleures performances." #: templates/ccvpn/index.html:66 msgid "Sign up and get your free trial" @@ -849,7 +849,6 @@ msgid "Gateway" msgstr "Serveur" #: templates/lambdainst/config.html:22 -#: templates/lambdainst/wireguard_peer.html:26 msgid "Random" msgstr "Aléatoire" @@ -857,7 +856,7 @@ msgstr "Aléatoire" msgid "All (multiple config files)" msgstr "Tous (plusieurs fichiers)" -#: templates/lambdainst/config.html:26 +#: templates/lambdainst/config.html:26 templates/lambdainst/wireguard.html:97 msgid "Country" msgstr "Pays" @@ -885,8 +884,7 @@ msgstr "Dans le doute, laissez vide." msgid "Requires TCP." msgstr "Nécéssite TCP." -#: templates/lambdainst/config.html:56 -#: templates/lambdainst/wireguard_new.html:38 +#: templates/lambdainst/config.html:56 templates/lambdainst/wireguard.html:127 msgid "Enable IPv6?" msgstr "Activer l'IPv6?" @@ -947,7 +945,7 @@ msgid "repeat" msgstr "répétez" #: templates/lambdainst/settings.html:27 -#: templates/lambdainst/wireguard.html:158 +#: templates/lambdainst/wireguard.html:239 msgid "Save" msgstr "Enregistrer" @@ -1003,60 +1001,89 @@ msgstr "Serveurs" #: templates/lambdainst/wireguard.html:10 msgid "" -"This page lets you manage WireGuard peers. Each can only have one concurrent " -"connection." +"This page lets you manage WireGuard clients. Each can only have one concurrent connection." msgstr "" -"Gérez vos appareils et clés WireGuard. Chaque clé permet une connexion " -"simultanée." +"Gérez vos appareils et clés WireGuard. Chaque clé permet une connexion simultanée." -#: templates/lambdainst/wireguard.html:18 +#: templates/lambdainst/wireguard.html:15 +msgid "" +"WireGuard has better performances than OpenVPN, but is not as widely " +"supported." +msgstr "" +"WireGuard a de meilleurs performances qu'OpenVPN, mais n'est pas aussi " +"couramment compatible." + +#: templates/lambdainst/wireguard.html:22 msgid "Your Devices" msgstr "Vos appareils" -#: templates/lambdainst/wireguard.html:23 +#: templates/lambdainst/wireguard.html:34 #: templates/lambdainst/wireguard_new.html:5 #: templates/lambdainst/wireguard_new.html:7 msgid "New Device" msgstr "Nouvel appareil" -#: templates/lambdainst/wireguard.html:32 -msgid "Key" -msgstr "Clé" +#: templates/lambdainst/wireguard.html:44 +#: templates/lambdainst/wireguard_new.html:25 +msgid "Public Key" +msgstr "Clé publique" -#: templates/lambdainst/wireguard.html:33 +#: templates/lambdainst/wireguard.html:45 #: templates/lambdainst/wireguard_new.html:15 #: templates/lambdainst/wireguard_new.html:17 msgid "Name" msgstr "Nom" -#: templates/lambdainst/wireguard.html:34 -msgid "Actions" -msgstr "Actions" - -#: templates/lambdainst/wireguard.html:46 -msgid "Download" -msgstr "Télécharger" - -#: templates/lambdainst/wireguard.html:51 -msgid "Show QR Code" -msgstr "Afficher le code QR" - -#: templates/lambdainst/wireguard.html:56 +#: templates/lambdainst/wireguard.html:58 msgid "Edit" msgstr "Éditer" -#: templates/lambdainst/wireguard.html:65 +#: templates/lambdainst/wireguard.html:67 msgid "Delete" msgstr "Supprimer" +#: templates/lambdainst/wireguard.html:80 +msgid "Device" +msgstr "Appareil" + +#: templates/lambdainst/wireguard.html:95 +msgid "Server" +msgstr "Serveur" + +#: templates/lambdainst/wireguard.html:107 +msgid "All (zip archive)" +msgstr "Tous (en tant qu'archive zip)" + +#: templates/lambdainst/wireguard.html:112 +msgid "Server Port" +msgstr "Port Serveur" + +#: templates/lambdainst/wireguard.html:114 +msgid "(WireGuard default)" +msgstr "(WireGuard par défaut)" + +#: templates/lambdainst/wireguard.html:115 +msgid "(standard DNS port)" +msgstr "(port standard DNS)" + +#: templates/lambdainst/wireguard.html:116 +msgid "(standard HTTP port)" +msgstr "(port standard HTTP)" + +#: templates/lambdainst/wireguard.html:117 +msgid "(standard HTTPS port)" +msgstr "(port standard HTTPS)" + +#: templates/lambdainst/wireguard.html:120 +msgid "You can try an alternative server port if 51820 is blocked." +msgstr "Essayez un port alternatif si 51820 est bloqué pour vous." + #: templates/lambdainst/wireguard_new.html:20 msgid "Used to identify the device in your account." msgstr "Utilisé pour l'identifier dans votre compte." -#: templates/lambdainst/wireguard_new.html:25 -msgid "Public Key" -msgstr "Clé publique" - #: templates/lambdainst/wireguard_new.html:27 msgid "Public key (base64)" msgstr "Clé publique (base64)" @@ -1065,7 +1092,7 @@ msgstr "Clé publique (base64)" msgid "Use an existing public key. Leave empty to generate a new one." msgstr "Pour générer votre propre clé privée. Laissez vide sinon." -#: templates/lambdainst/wireguard_new.html:42 +#: templates/lambdainst/wireguard_new.html:37 msgid "Create Key" msgstr "Ajouter" @@ -1369,3 +1396,9 @@ msgstr "Peut envoyer des messages privés" #: tickets/models.py:55 msgid "Waiting for staff" msgstr "En attente du support" + +#~ msgid "Compressed tunnel." +#~ msgstr "Tunnel compressé." + +#~ msgid "Even on YouTube." +#~ msgstr "Même sur YouTube." diff --git a/templates/account_layout.html b/templates/account_layout.html index 0e3a93c..ee1a39c 100644 --- a/templates/account_layout.html +++ b/templates/account_layout.html @@ -15,7 +15,7 @@
  •   - {% trans 'OpenVPN Config' %} + {% trans 'OpenVPN' %}
    • {% if config.WIREGUARD %}
  • diff --git a/templates/ccvpn/index.html b/templates/ccvpn/index.html index 18524ed..da3b19c 100644 --- a/templates/ccvpn/index.html +++ b/templates/ccvpn/index.html @@ -52,9 +52,9 @@

    {% trans 'Fast' %}

    -

    1Gbps
    - {% trans 'Compressed tunnel.' %}
    - {% trans 'Even on YouTube.' %} +

    {% trans 'Up to 1Gbps.' %}
    + {% trans 'With WireGuard compatibility' %} + {% trans 'for the best performances.' %}

    diff --git a/templates/lambdainst/wireguard.html b/templates/lambdainst/wireguard.html index 9e73a01..1035a7d 100644 --- a/templates/lambdainst/wireguard.html +++ b/templates/lambdainst/wireguard.html @@ -8,9 +8,13 @@

    {% blocktrans trimmed %} - This page lets you manage WireGuard peers. + This page lets you manage WireGuard clients. Each can only have one concurrent connection. {% endblocktrans %} +
    + {% blocktrans trimmed %} + WireGuard has better performances than OpenVPN, but is not as widely supported. + {% endblocktrans %}

    @@ -18,8 +22,14 @@ {% trans "Your Devices" %} {{ keys|length }}/{{ config.WIREGUARD_MAX_PEERS }}

    - {% trans "New Device" %} @@ -31,7 +41,7 @@ - + diff --git a/templates/pages/help.en.md b/templates/pages/help.en.md index d33be26..ea4f357 100644 --- a/templates/pages/help.en.md +++ b/templates/pages/help.en.md @@ -3,7 +3,7 @@ Title: Support --- -### Installation Guides +### OpenVPN Installation Guides
    • Android
      • diff --git a/templates/pages/help.fr.md b/templates/pages/help.fr.md index a0a2471..dd80135 100644 --- a/templates/pages/help.fr.md +++ b/templates/pages/help.fr.md @@ -2,7 +2,7 @@ Title: Guides --- -### Installation +### Installation d'OpenVPN
    {% trans "Key" %}{% trans "Public Key" %} {% trans "Name" %}