Merge pull request #387 from ungleich/deaspo-372-credit-card-text
This PR is @deaspo's 372 plus the DE translations as provided in #3570 by @moep. Also I cleaned up some commented html code. The "Place Order" button in the payment page is called "Submit" to avoid duplication.
This commit is contained in:
Pcoder
GitHub
commit
b3a10ca04a
2 changed files with 75 additions and 85 deletions
|
|
@ -8,7 +8,7 @@ msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2017-07-01 02:09+0530\n"
|
"POT-Creation-Date: 2017-07-10 11:40+0530\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
@ -18,11 +18,11 @@ msgstr ""
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
||||||
|
|
||||||
#: forms.py:28
|
#: forms.py:25
|
||||||
msgid "Your account is not activated yet."
|
msgid "Your account is not activated yet."
|
||||||
msgstr "Dein Account wurde noch nicht aktiviert."
|
msgstr "Dein Account wurde noch nicht aktiviert."
|
||||||
|
|
||||||
#: forms.py:65
|
#: forms.py:62
|
||||||
msgid "Paste here your public key"
|
msgid "Paste here your public key"
|
||||||
msgstr "Fügen Sie Ihren public key ein"
|
msgstr "Fügen Sie Ihren public key ein"
|
||||||
|
|
||||||
|
|
@ -185,20 +185,14 @@ msgid "New Virtual Machine"
|
||||||
msgstr "Neue virtuelle Maschine"
|
msgstr "Neue virtuelle Maschine"
|
||||||
|
|
||||||
#: templates/hosting/create_virtual_machine.html:28
|
#: templates/hosting/create_virtual_machine.html:28
|
||||||
#, fuzzy
|
|
||||||
#| msgid "Select VM Template:"
|
|
||||||
msgid "Step 1. Select VM Template:"
|
msgid "Step 1. Select VM Template:"
|
||||||
msgstr "Wähle eine Vorlage"
|
msgstr "Wähle eine Vorlage"
|
||||||
|
|
||||||
#: templates/hosting/create_virtual_machine.html:42
|
#: templates/hosting/create_virtual_machine.html:42
|
||||||
#, fuzzy
|
|
||||||
#| msgid "Select VM Configuration:"
|
|
||||||
msgid "Step2. Select VM Configuration"
|
msgid "Step2. Select VM Configuration"
|
||||||
msgstr "Wähle eine Konfiguration"
|
msgstr "Wähle eine Konfiguration"
|
||||||
|
|
||||||
#: templates/hosting/create_virtual_machine.html:59
|
#: templates/hosting/create_virtual_machine.html:59
|
||||||
#, fuzzy
|
|
||||||
#| msgid "Pricing"
|
|
||||||
msgid "Price "
|
msgid "Price "
|
||||||
msgstr "Preis"
|
msgstr "Preis"
|
||||||
|
|
||||||
|
|
@ -239,7 +233,7 @@ msgid "Don't have an account yet ? "
|
||||||
msgstr "Besitzt du kein Benutzerkonto?"
|
msgstr "Besitzt du kein Benutzerkonto?"
|
||||||
|
|
||||||
#: templates/hosting/login.html:37 templates/hosting/signup.html.py:13
|
#: templates/hosting/login.html:37 templates/hosting/signup.html.py:13
|
||||||
#: templates/hosting/signup.html:21 views.py:223
|
#: templates/hosting/signup.html:21 views.py:219
|
||||||
msgid "Sign up"
|
msgid "Sign up"
|
||||||
msgstr "Registrieren"
|
msgstr "Registrieren"
|
||||||
|
|
||||||
|
|
@ -372,25 +366,32 @@ msgstr "Rechnungsadresse"
|
||||||
msgid "Payment Details"
|
msgid "Payment Details"
|
||||||
msgstr "Rechnungsdetails"
|
msgstr "Rechnungsdetails"
|
||||||
|
|
||||||
#: templates/hosting/payment.html:65
|
#: templates/hosting/payment.html:56
|
||||||
msgid "Submit Payment"
|
msgid ""
|
||||||
msgstr "Betrag überweisen"
|
"Please fill in your credit card information below. We are using <a href="
|
||||||
|
"\"https://stripe.com\" target=\"_blank\">Stripe</a> for payment and do not "
|
||||||
|
"store your information in our database."
|
||||||
|
msgstr ""
|
||||||
|
"Bitte füll deine Kreditkarteninformationen unten aus. Wir nutzen <a href="
|
||||||
|
"\"https://stripe.com\" target=\"_blank\">Stripe</a> für die Bezahlung und "
|
||||||
|
"speichern keine Informationen in unserer Datenbank."
|
||||||
|
|
||||||
#: templates/hosting/payment.html:84
|
#: templates/hosting/payment.html:71 templates/hosting/payment.html.py:96
|
||||||
msgid "CARD NUMBER"
|
msgid ""
|
||||||
msgstr "Kreditkartennummer"
|
"You are not making any payment yet. After placing your order, you will be "
|
||||||
|
"taken to the Submit Payment Page."
|
||||||
|
msgstr ""
|
||||||
|
"Es wird noch keine Bezahlung vorgenommen. Nachdem du die Bestellung "
|
||||||
|
"aufgegeben hast, wirst du zu der <a href=\"https://stripe.com\" target="
|
||||||
|
"\"_blank\">Stripe</a> Seite weitergeleitet."
|
||||||
|
|
||||||
#: templates/hosting/payment.html:89
|
#: templates/hosting/payment.html:76
|
||||||
msgid "Valid Card Number"
|
msgid "Place Order"
|
||||||
msgstr "Gültige Kreditkartennummer"
|
msgstr "Bestelle"
|
||||||
|
|
||||||
#: templates/hosting/payment.html:98
|
#: templates/hosting/payment.html:100
|
||||||
msgid "EXPIRATION DATE"
|
msgid "Submit"
|
||||||
msgstr "Ablaufdatum"
|
msgstr "Absenden"
|
||||||
|
|
||||||
#: templates/hosting/payment.html:109
|
|
||||||
msgid "CV CODE"
|
|
||||||
msgstr "CV Code"
|
|
||||||
|
|
||||||
#: templates/hosting/reset_password.html:15
|
#: templates/hosting/reset_password.html:15
|
||||||
msgid "Reset your password"
|
msgid "Reset your password"
|
||||||
|
|
@ -431,14 +432,10 @@ msgid "Created at"
|
||||||
msgstr "Erstellt am"
|
msgstr "Erstellt am"
|
||||||
|
|
||||||
#: templates/hosting/user_keys.html:43
|
#: templates/hosting/user_keys.html:43
|
||||||
#, fuzzy
|
|
||||||
#| msgid "Delete"
|
|
||||||
msgid "Delete Key"
|
msgid "Delete Key"
|
||||||
msgstr "Löschen"
|
msgstr "Löschen"
|
||||||
|
|
||||||
#: templates/hosting/user_keys.html:56
|
#: templates/hosting/user_keys.html:56
|
||||||
#, fuzzy
|
|
||||||
#| msgid "Do You want do delete your order?"
|
|
||||||
msgid "Do You want to delete this key?"
|
msgid "Do You want to delete this key?"
|
||||||
msgstr "Möchtest Du den Schlüssel löschen?"
|
msgstr "Möchtest Du den Schlüssel löschen?"
|
||||||
|
|
||||||
|
|
@ -502,11 +499,11 @@ msgstr "IPv4"
|
||||||
msgid "Ipv6"
|
msgid "Ipv6"
|
||||||
msgstr "IPv6"
|
msgstr "IPv6"
|
||||||
|
|
||||||
#: views.py:213 views.py:232
|
#: views.py:207 views.py:229
|
||||||
msgid "login"
|
msgid "login"
|
||||||
msgstr "einloggen"
|
msgstr "einloggen"
|
||||||
|
|
||||||
#: views.py:217
|
#: views.py:212
|
||||||
msgid ""
|
msgid ""
|
||||||
"Thank you for signing up. We have sent an email to you. Please follow the "
|
"Thank you for signing up. We have sent an email to you. Please follow the "
|
||||||
"instructions in it to activate your account. Once activated, you can login "
|
"instructions in it to activate your account. Once activated, you can login "
|
||||||
|
|
@ -516,32 +513,44 @@ msgstr ""
|
||||||
"den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über "
|
"den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über "
|
||||||
"diesen"
|
"diesen"
|
||||||
|
|
||||||
#: views.py:218 views.py:243
|
#: views.py:214 views.py:240
|
||||||
msgid "Go back to"
|
msgid "Go back to"
|
||||||
msgstr "Zurück"
|
msgstr "Zurück"
|
||||||
|
|
||||||
#: views.py:233
|
#: views.py:230
|
||||||
msgid "Account activation"
|
msgid "Account activation"
|
||||||
msgstr "Accountaktivierung"
|
msgstr "Accountaktivierung"
|
||||||
|
|
||||||
#: views.py:236
|
#: views.py:233
|
||||||
msgid "Your account has been activated."
|
msgid "Your account has been activated."
|
||||||
msgstr "Dein Account wurde aktiviert."
|
msgstr "Dein Account wurde aktiviert."
|
||||||
|
|
||||||
#: views.py:237
|
#: views.py:234
|
||||||
msgid "You can now"
|
msgid "You can now"
|
||||||
msgstr "Du kannst dich nun"
|
msgstr "Du kannst dich nun"
|
||||||
|
|
||||||
#: views.py:242
|
#: views.py:239
|
||||||
msgid "Sorry. Your request is invalid."
|
msgid "Sorry. Your request is invalid."
|
||||||
msgstr "Entschuldigung, deine Anfrage ist ungültig."
|
msgstr "Entschuldigung, deine Anfrage ist ungültig."
|
||||||
|
|
||||||
#: views.py:760
|
#: views.py:756
|
||||||
msgid ""
|
msgid ""
|
||||||
"We could not find the requested VM. Please "
|
"We could not find the requested VM. Please "
|
||||||
"contact Data Center Light Support."
|
"contact Data Center Light Support."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#~ msgid "CARD NUMBER"
|
||||||
|
#~ msgstr "Kreditkartennummer"
|
||||||
|
|
||||||
|
#~ msgid "Valid Card Number"
|
||||||
|
#~ msgstr "Gültige Kreditkartennummer"
|
||||||
|
|
||||||
|
#~ msgid "EXPIRATION DATE"
|
||||||
|
#~ msgstr "Ablaufdatum"
|
||||||
|
|
||||||
|
#~ msgid "CV CODE"
|
||||||
|
#~ msgstr "CV Code"
|
||||||
|
|
||||||
#~ msgid "Home"
|
#~ msgid "Home"
|
||||||
#~ msgstr "Home"
|
#~ msgstr "Home"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,10 @@
|
||||||
<h3><b>{%trans "Payment Details"%}</b></h3>
|
<h3><b>{%trans "Payment Details"%}</b></h3>
|
||||||
<hr>
|
<hr>
|
||||||
<div>
|
<div>
|
||||||
|
<div>
|
||||||
|
<p> {% trans 'Please fill in your credit card information below. We are using <a href="https://stripe.com" target="_blank">Stripe</a> for payment and do not store your information in our database.' %}</p>
|
||||||
|
</div>
|
||||||
|
<br>
|
||||||
<div>
|
<div>
|
||||||
{% if credit_card_data.last4 %}
|
{% if credit_card_data.last4 %}
|
||||||
<form role="form" id="payment-form-with-creditcard"novalidate>
|
<form role="form" id="payment-form-with-creditcard"novalidate>
|
||||||
|
|
@ -60,61 +64,42 @@
|
||||||
<h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
|
<h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
|
||||||
<input type="hidden" name="credit_card_needed" value="false"/>
|
<input type="hidden" name="credit_card_needed" value="false"/>
|
||||||
</form>
|
</form>
|
||||||
<div class="col-xs-6">
|
|
||||||
<button id="payment_button_with_creditcard" class="btn btn-success btn-sm btn-block" type="submit">
|
<div class="row">
|
||||||
{% trans "Submit Payment" %}
|
<br>
|
||||||
</button>
|
<div class="col-xs-12>
|
||||||
</div>
|
<p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px; "> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-12">
|
||||||
|
<div class="col-xs-6 pull-right">
|
||||||
|
<button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" id="payment_button_with_creditcard" class="btn btn-success" type="submit">
|
||||||
|
{% trans "Place Order" %}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
||||||
|
|
||||||
<form role="form" id="payment-form" novalidate>
|
<form role="form" id="payment-form" novalidate>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="form-group">
|
<div class="form-group col-xs-12">
|
||||||
<div id="card-element">
|
<div id="card-element">
|
||||||
<!-- a Stripe Element will be inserted here. -->
|
<!-- a Stripe Element will be inserted here. -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="card-errors" role="alert"></div>
|
<div id="card-errors" role="alert"></div>
|
||||||
|
|
||||||
<!-- <div class="row">
|
|
||||||
<div class="col-xs-9 col-md-12">
|
|
||||||
<div class="form-group">
|
|
||||||
<label class="control-label" for="cardNumber">{%trans "CARD NUMBER"%}</label>
|
|
||||||
<div class="input-group">
|
|
||||||
<input type="text"
|
|
||||||
class="form-control"
|
|
||||||
name="cardNumber"
|
|
||||||
placeholder="{%trans "Valid Card Number"%}" required autofocus data-stripe="number" />
|
|
||||||
<span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xs-6 col-md-7">
|
<br>
|
||||||
<div class="form-group">
|
<div class="col-xs-12">
|
||||||
<label for="expMonth">{%trans "EXPIRATION DATE"%}</label><br/>
|
<p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px;"> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
|
||||||
<div class="col-xs-6 col-lg-6 col-md-6 pl-ziro">
|
</div>
|
||||||
<input type="text" class="form-control" name="expMonth" placeholder="MM" required data-stripe="exp_month" />
|
<div class="col-xs-12">
|
||||||
</div>
|
<div class="col-xs-6 pull-right">
|
||||||
<div class="col-xs-6 col-lg-6 col-md-6 pl-ziro">
|
<button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Submit" %}</button>
|
||||||
<input type="text" class="form-control" name="expYear" placeholder="YY" required data-stripe="exp_year" />
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="col-xs-4 col-md-5 pull-right">
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="cvCode">{%trans "CV CODE"%}</label>
|
|
||||||
<input type="password" class="form-control" name="cvCode" placeholder="CV" required data-stripe="cvc" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div> -->
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xs-6 float-right">
|
|
||||||
<button class="btn btn-success btn-sm btn-block" type="submit">Submit Payment</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row" style="display:none;">
|
<div class="row" style="display:none;">
|
||||||
<div class="col-xs-12">
|
<div class="col-xs-12">
|
||||||
|
|
@ -164,7 +149,3 @@
|
||||||
{%endif%}
|
{%endif%}
|
||||||
|
|
||||||
{%endblock%}
|
{%endblock%}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue