From 68cf63304c2234fbaedf1ceee0efbc6a49563f28 Mon Sep 17 00:00:00 2001
From: alice
Date: Thu, 19 May 2022 21:06:16 +0200
Subject: [PATCH] add 'why cc' box on homepage, fix cancel translation
---
locale/fr/LC_MESSAGES/django.po | 37 +++++++++++++++++++++------
static/css/style.css | 15 +++++++++++
templates/ccvpn/index.html | 9 +++++++
templates/payments/cancel_subscr.html | 2 +-
4 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 282f8e0..b922c99 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: unnamed project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-18 23:54+0000\n"
+"POT-Creation-Date: 2022-05-19 19:04+0000\n"
"PO-Revision-Date: 2021-09-14 22:21+0200\n"
"Last-Translator: alice \n"
"Language-Team: French \n"
@@ -38,27 +38,27 @@ msgstr "Chat Live"
msgid "Download {} v{}"
msgstr "Télécharger {} v{}"
-#: lambdainst/admin.py:48
+#: lambdainst/admin.py:47
msgid "(rewarded)"
msgstr ""
-#: lambdainst/admin.py:50
+#: lambdainst/admin.py:49
msgid "(not rewarded)"
msgstr ""
-#: lambdainst/admin.py:54
+#: lambdainst/admin.py:53
msgid "Referrer"
msgstr ""
-#: lambdainst/admin.py:60 lambdainst/admin.py:90
+#: lambdainst/admin.py:59 lambdainst/admin.py:89
msgid "Is paid?"
msgstr "Est payé?"
-#: lambdainst/admin.py:69
+#: lambdainst/admin.py:68
msgid "Important dates"
msgstr "Dates importantes"
-#: lambdainst/admin.py:71
+#: lambdainst/admin.py:70
msgid "Permissions"
msgstr "Permissions"
@@ -387,7 +387,24 @@ msgstr "Créez un compte et essayez gratuitement"
msgid "No CC required, 3€/month after 7 days"
msgstr "Abonnez-vous pour 3€/mois après 7 jours"
-#: templates/ccvpn/index.html:75
+#: templates/ccvpn/index.html:71
+msgid "CCrypto is a non-profit organization."
+msgstr "CCrypto est une association à but non lucratif."
+
+#: templates/ccvpn/index.html:72
+msgid ""
+"As such, we pledge that we will never sell your personal information, "
+"exploit your trust or data, or get acquired by a company without such "
+"boundaries. Your payments will go exclusively towards funding our services "
+"and staff, or to other non-profits."
+msgstr ""
+"À ce titre, nous promettons ne jamais vendre vos données personnelles, "
+"exploiter votre traffic ou votre confiance, ou laisser une entreprise sans "
+"de tels principes nous racheter. Vos paiements seront exclusivement utilisés "
+"pour financer notre service et rémunérer notre équipe, ou reversés à "
+"d'autres associations."
+
+#: templates/ccvpn/index.html:84
msgid "more on our infrastructure"
msgstr "plus sur notre infrastructure"
@@ -1675,6 +1692,10 @@ msgstr ""
"Voudriez-vous nous dire pourquoi, ou laisser un retour pour nous permettre "
"d'améliorer notre service ? C'est optionel."
+#: templates/payments/cancel_subscr.html:27
+msgid "You do not have any active subscription to cancel."
+msgstr "Vous n'avez pas d'abonnement à annuller."
+
#: templates/payments/order-pay.html:5 templates/payments/success.html:12
msgid "Payment"
msgstr "Paiement"
diff --git a/static/css/style.css b/static/css/style.css
index 97be359..74811cb 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -731,6 +731,15 @@ ul.errorlist {
margin: auto;
}
+p.home-whyus {
+ width: 47%;
+ margin: auto;
+ border: 2px solid #1c619a;
+ padding: 0.5em 1em;
+ background: #f8F8FF;
+}
+
+
@media screen and (max-width: 80em) {
.homepage .features {
margin-left: 0;
@@ -775,6 +784,9 @@ a.home-signup-button .subtext {
.home-signup-button {
min-width: 50%;
}
+ p.home-whyus {
+ width: 90%;
+ }
}
@@ -1242,6 +1254,9 @@ div.ticket-message-private {
.homepage h2 {
text-shadow: 0px 0px 5px #ffd99f50;
}
+ p.home-whyus {
+ background: #22222b;
+ }
.content-box {
background: #272727;
diff --git a/templates/ccvpn/index.html b/templates/ccvpn/index.html
index 4a38008..6416213 100644
--- a/templates/ccvpn/index.html
+++ b/templates/ccvpn/index.html
@@ -67,6 +67,15 @@
+
+ {% trans "CCrypto is a non-profit organization." %}
+ {% blocktrans trimmed %}
+ As such, we pledge that we will never sell your personal information, exploit your trust or data,
+ or get acquired by a company without such boundaries.
+ Your payments will go exclusively towards funding our services and staff, or to other non-profits.
+ {% endblocktrans %}
+