Merge branch 'develop' of github.com:ungleich/dynamicweb into develop

This commit is contained in:
Levi 2017-06-04 17:08:09 -05:00
commit 8adcb75b8c
20 changed files with 279 additions and 211 deletions

View file

@ -25,47 +25,47 @@ msgstr "Fügen Sie Ihren public key ein"
#: hosting/templates/hosting/base_short.html:68
#: hosting/templates/hosting/base_short.html:139
msgid "My Virtual Machines"
msgstr ""
msgstr "Meine virtuellen Maschinen"
#: hosting/templates/hosting/base_short.html:73
#: hosting/templates/hosting/base_short.html:145
#: hosting/templates/hosting/orders.html:12
msgid "My Orders"
msgstr ""
msgstr "Meine Bestellungen"
#: hosting/templates/hosting/base_short.html:78
#: hosting/templates/hosting/base_short.html:152
msgid "Keys"
msgstr ""
msgstr "Schlüssel"
#: hosting/templates/hosting/base_short.html:83
#: hosting/templates/hosting/base_short.html:158
msgid "Notifications "
msgstr ""
msgstr "Benachrichtigungen"
#: hosting/templates/hosting/base_short.html:90
msgid "Logout"
msgstr ""
msgstr "Abmeleden"
#: hosting/templates/hosting/base_short.html:95
msgid "How it works"
msgstr ""
msgstr "Wie es funktioniert"
#: hosting/templates/hosting/base_short.html:98
msgid "Your infrastructure"
msgstr ""
msgstr "Ihre Infrastruktur"
#: hosting/templates/hosting/base_short.html:101
msgid "Our inftrastructure"
msgstr ""
msgstr "Unsere Infrastruktur"
#: hosting/templates/hosting/base_short.html:104
msgid "Pricing"
msgstr ""
msgstr "Preise"
#: hosting/templates/hosting/base_short.html:107
msgid "Contact"
msgstr ""
msgstr "Kontakt"
#: hosting/templates/hosting/base_short.html:110
#: hosting/templates/hosting/login.html:32
@ -73,21 +73,21 @@ msgstr ""
#: hosting/templates/hosting/reset_password.html:31
#: hosting/templates/hosting/signup.html:30
msgid "Login"
msgstr ""
msgstr "Anmelden"
#: hosting/templates/hosting/base_short.html:134
msgid "Home"
msgstr ""
msgstr "Home"
#: hosting/templates/hosting/bill_detail.html:11
#: hosting/templates/hosting/order_detail.html:10
msgid "Invoice"
msgstr ""
msgstr "Rechnung"
#: hosting/templates/hosting/bill_detail.html:11
#: hosting/templates/hosting/order_detail.html:10
msgid "Order #"
msgstr ""
msgstr "Rechnung #"
#: hosting/templates/hosting/bill_detail.html:25
msgid "ungleich GmbH"
@ -116,7 +116,7 @@ msgstr ""
#: hosting/templates/hosting/bill_detail.html:68
#, python-format
msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
msgstr ""
msgstr "All prices in CHF including 8%% VAT"
#: hosting/templates/hosting/bill_detail.html:69
msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang."
@ -144,7 +144,7 @@ msgstr ""
#: hosting/templates/hosting/bills.html:12
msgid "Customers"
msgstr ""
msgstr "Kunden"
#: hosting/templates/hosting/bills.html:16
#: hosting/templates/hosting/virtual_machine_key.html:42
@ -157,46 +157,58 @@ msgstr ""
#: hosting/templates/hosting/bills.html:28
msgid "View Bill"
msgstr ""
msgstr "Rechnung anzeigen"
#: hosting/templates/hosting/bills.html:41
#: hosting/templates/hosting/orders.html:83
#: hosting/templates/hosting/virtual_machines.html:70
msgid "previous"
msgstr ""
msgstr "vorherige"
#: hosting/templates/hosting/bills.html:47
#: hosting/templates/hosting/orders.html:89
#: hosting/templates/hosting/virtual_machines.html:76
msgid "next"
msgstr ""
msgstr "nächste"
#: hosting/templates/hosting/confirm_reset_password.html:19
msgid "Set your new password"
msgstr ""
msgstr "Setzen Ihr neues Passwort"
#: hosting/templates/hosting/confirm_reset_password.html:28
#: hosting/templates/hosting/reset_password.html:22
msgid "Reset"
msgstr ""
msgstr "Zurücksetzen"
#: hosting/templates/hosting/confirm_reset_password.html:32
#: hosting/templates/hosting/reset_password.html:28
#: hosting/templates/hosting/signup.html:27
msgid "Already have an account ?"
msgstr ""
msgstr "Besitzen sie bereits ein Bentzerkonto"
#: hosting/templates/hosting/confirm_reset_password.html:32
msgid "Log in"
msgstr ""
msgstr "Anmelden"
#: hosting/templates/hosting/create_virtual_machine.html:19
msgid "New Virtual Machine"
msgstr ""
msgstr "Neue virtuelle Maschine"
#: hosting/templates/hosting/create_virtual_machine.html:24
msgid "Select VM Template:"
msgstr "Wählen Sie eine Vorlage"
#: hosting/templates/hosting/create_virtual_machine.html:32
msgid "Select VM Configuration:"
msgstr "Wählen Sie eine Konfiguration"
#: hosting/templates/hosting/create_virtual_machine.html:39
msgid "CHF/Month"
msgstr "CHF/Monat"
#: hosting/templates/hosting/create_virtual_machine.html:45
msgid "Start VM"
msgstr ""
msgstr "Start VM"
#: hosting/templates/hosting/emails/password_reset_email.html:2
#: hosting/templates/hosting/emails/password_reset_email.txt:2
@ -226,49 +238,49 @@ msgstr ""
#: hosting/templates/hosting/reset_password.html:10
#: hosting/templates/hosting/signup.html:9
msgid "Your VM hosted in Switzerland"
msgstr ""
msgstr "Ihre VM gehostet in der Schweiz"
#: hosting/templates/hosting/login.html:26
msgid "You haven been logged out"
msgstr ""
msgstr "Sie wurden abgmeldet"
#: hosting/templates/hosting/login.html:49
msgid "Don't have an account yet ? "
msgstr ""
msgstr "Besitzen Sie kein Benutzerkonto?"
#: hosting/templates/hosting/login.html:52
#: hosting/templates/hosting/signup.html:13
#: hosting/templates/hosting/signup.html:21
msgid "Sign up"
msgstr ""
msgstr "Registrieren"
#: hosting/templates/hosting/login.html:54
msgid "Forgot your password ? "
msgstr ""
msgstr "Passwort vergessen?"
#: hosting/templates/hosting/notifications.html:9
msgid "Notifications"
msgstr ""
msgstr "Benachrichtigungen"
#: hosting/templates/hosting/notifications.html:16
msgid "Unread"
msgstr ""
msgstr "Ungelesen"
#: hosting/templates/hosting/notifications.html:26
msgid "All"
msgstr ""
msgstr "Alle"
#: hosting/templates/hosting/notifications.html:38
msgid "Unread notifications"
msgstr ""
msgstr "Ungelesene Benachrichtigungen"
#: hosting/templates/hosting/notifications.html:48
msgid "Mark as read"
msgstr ""
msgstr "Als gelesen markieren"
#: hosting/templates/hosting/notifications.html:59
msgid "All notifications"
msgstr ""
msgstr "Alle Benachrichtigungen"
#: hosting/templates/hosting/order_detail.html:16
#: hosting/templates/hosting/order_detail.html:24
@ -281,25 +293,28 @@ msgstr ""
#: hosting/templates/hosting/order_detail.html:38
msgid "Payment Method:"
msgstr ""
msgstr "Bezahlmethode"
#: hosting/templates/hosting/order_detail.html:49
msgid "Order summary"
msgstr ""
msgstr "Bestellungsübersicht"
#: hosting/templates/hosting/order_detail.html:52
#: hosting/templates/hosting/payment.html:17
#: hosting/templates/hosting/virtual_machine_detail.html:75
msgid "Cores"
msgstr ""
msgstr "Prozessorkerne"
#: hosting/templates/hosting/order_detail.html:54
#: hosting/templates/hosting/payment.html:20
#: hosting/templates/hosting/virtual_machine_detail.html:81
msgid "Memory"
msgstr ""
msgstr "Arbeitsspeicher"
#: hosting/templates/hosting/order_detail.html:56
#: hosting/templates/hosting/payment.html:23
msgid "Disk space"
msgstr ""
msgstr "Festplattenkapazität"
#: hosting/templates/hosting/order_detail.html:58
msgid "Total"
@ -307,15 +322,15 @@ msgstr ""
#: hosting/templates/hosting/order_detail.html:64
msgid "Finish Configuration"
msgstr ""
msgstr "Konfiguration beenden"
#: hosting/templates/hosting/orders.html:17
msgid "Date"
msgstr ""
msgstr "Datum"
#: hosting/templates/hosting/orders.html:18
msgid "Amount"
msgstr ""
msgstr "Betrag"
#: hosting/templates/hosting/orders.html:19
#: hosting/templates/hosting/virtual_machine_detail.html:30
@ -326,117 +341,159 @@ msgstr ""
#: hosting/templates/hosting/orders.html:30
msgid "Approved"
msgstr ""
msgstr "Akzeptiert"
#: hosting/templates/hosting/orders.html:32
msgid "Declined"
msgstr ""
msgstr "Abgelehnt"
#: hosting/templates/hosting/orders.html:37
#: hosting/templates/hosting/virtual_machines.html:58
msgid "View Detail"
msgstr ""
msgstr "Details anzeigen"
#: hosting/templates/hosting/orders.html:41
msgid "Cancel Order"
msgstr ""
msgstr "Bestellung stornieren"
#: hosting/templates/hosting/orders.html:56
msgid "Do You want do delete your order?"
msgstr ""
msgstr "Wollen Sie ihre Bestellung löschen?"
#: hosting/templates/hosting/orders.html:64
msgid "Close"
msgstr ""
msgstr "Schliessen"
#: hosting/templates/hosting/orders.html:66
msgid "Delete"
msgstr ""
msgstr "Löschen"
#: hosting/templates/hosting/payment.html:12
msgid "Billing Amount"
msgstr "Rechnungsbetrag"
#: hosting/templates/hosting/payment.html:35
msgid "Billing Address"
msgstr "Rechnungsadresse"
#: hosting/templates/hosting/payment.html:49
msgid "Payment Details"
msgstr "Rechnungsdetails"
#: hosting/templates/hosting/payment.html:61
#: hosting/templates/hosting/payment.html:103
msgid "Submit Payment"
msgstr "Betrag überweisen"
#: hosting/templates/hosting/payment.html:70
msgid "CARD NUMBER"
msgstr "Kreditkartennummer"
#: hosting/templates/hosting/payment.html:75
msgid "Valid Card Number"
msgstr "Gültige Kreditkartennummer"
#: hosting/templates/hosting/payment.html:84
msgid "EXPIRATION DATE"
msgstr "Ablaufdatum"
#: hosting/templates/hosting/payment.html:95
msgid "CV CODE"
msgstr "CV Code"
#: hosting/templates/hosting/reset_password.html:14
msgid "Reset your password"
msgstr ""
msgstr "Passwort zurücksetzen"
#: hosting/templates/hosting/virtual_machine_detail.html:19
msgid "Settings"
msgstr ""
msgstr "Einstellungen"
#: hosting/templates/hosting/virtual_machine_detail.html:25
msgid "Billing"
msgstr ""
msgstr "Abrechnungen"
#: hosting/templates/hosting/virtual_machine_detail.html:60
msgid "Ip not assigned yet"
msgstr ""
msgstr "Ip nicht zugewiesen"
#: hosting/templates/hosting/virtual_machine_detail.html:87
msgid "Disk"
msgstr ""
msgstr "Festplatte"
#: hosting/templates/hosting/virtual_machine_detail.html:96
msgid "Configuration"
msgstr ""
msgstr "Konfiguration"
#: hosting/templates/hosting/virtual_machine_detail.html:106
msgid "Current pricing"
msgstr ""
msgstr "Aktueller Preis"
#: hosting/templates/hosting/virtual_machine_detail.html:115
msgid "Current status"
msgstr ""
msgstr "Aktueller Status"
#: hosting/templates/hosting/virtual_machine_detail.html:140
msgid "Terminate Virtual Machine"
msgstr ""
msgstr "Virtuelle Maschine beenden"
#: hosting/templates/hosting/virtual_machine_detail.html:161
msgid "Terminate your Virtual Machine"
msgstr ""
msgstr "Ihre virtuelle Maschine beenden"
#: hosting/templates/hosting/virtual_machine_detail.html:164
msgid "Are you sure do you want to cancel your Virtual Machine "
msgstr ""
#: hosting/templates/hosting/virtual_machine_detail.html:164
msgid "plan?"
msgstr ""
msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "
#: hosting/templates/hosting/virtual_machine_detail.html:167
msgid "Cancel"
msgstr ""
msgstr "Beenden"
#: hosting/templates/hosting/virtual_machine_key.html:11
msgid "Access Key"
msgstr ""
msgstr "Zugriffsschlüssel"
#: hosting/templates/hosting/virtual_machine_key.html:25
msgid "Upload your own key. "
msgstr ""
msgstr "Laden Sie ihren Schlüssel hoch"
#: hosting/templates/hosting/virtual_machine_key.html:29
msgid "Upload Key"
msgstr "Schlüssel hochladen"
#: hosting/templates/hosting/virtual_machine_key.html:33
msgid "Or generate a new key pair."
msgstr ""
msgstr "Oder erstellen Sie ein neues Schlüsselpaar"
#: hosting/templates/hosting/virtual_machine_key.html:31
msgid "Generate Key Pair"
msgstr "Schlüsselpaar generieren"
#: hosting/templates/hosting/virtual_machine_key.html:40
msgid ""
"Use your created key to access to the machine. If you lost it, contact us."
msgstr ""
"Verwenden Sie Ihren privaten SSH Schlüssel um sich mit Ihren Maschinen zu "
"verbinden. Falls Sie ihn verloren haben kontaktieren Sie uns."
#: hosting/templates/hosting/virtual_machine_key.html:43
msgid "Created at"
msgstr ""
msgstr "Erstellt am"
#: hosting/templates/hosting/virtual_machine_key.html:66
#: hosting/templates/hosting/virtual_machine_key.html:79
msgid "Warning!"
msgstr ""
msgstr "Achtung!"
#: hosting/templates/hosting/virtual_machine_key.html:66
msgid "You can download your SSH private key once. Don't lost your key"
msgstr ""
"Sie können ihren privaten SSH Schlüssel nur einmal herunterladen. Bewaren "
"Sie ihn sicher auf."
#: hosting/templates/hosting/virtual_machine_key.html:74
msgid "Copy to Clipboard"
msgstr ""
msgstr "Kopieren"
#: hosting/templates/hosting/virtual_machine_key.html:75
msgid "Download"
@ -447,18 +504,20 @@ msgid ""
"Your SSH private key was already generated and downloaded, if you lost it, "
"contact us. "
msgstr ""
"Ihr privater SSH Schlüssel wurde bereits generiert und heruntergeladen, "
"falls Sie ihn verloren haben kontaktieren Sie uns."
#: hosting/templates/hosting/virtual_machine_key.html:82
msgid "Generate my key"
msgstr ""
msgstr "Generiere meinen Schlüssel"
#: hosting/templates/hosting/virtual_machines.html:9
msgid "Virtual Machines"
msgstr ""
msgstr "Virtuelle Maschinen"
#: hosting/templates/hosting/virtual_machines.html:22
msgid "Create VM"
msgstr ""
msgstr "Neue VM"
#: hosting/templates/hosting/virtual_machines.html:28
msgid "ID"

View file

@ -21,7 +21,7 @@
<form method="POST" action="">
{% csrf_token %}
<div class="form-group">
Select VM Template:
{% trans "Select VM Template:" %}
<select name="vm_template_id">
{% for template in templates %}
<option value="{{template.id}}">{{template.name}} </option>
@ -29,14 +29,14 @@
</select>
</div>
<div class="form-group">
Select VM Configuration:
{% trans "Select VM Configuration:" %}
<select name="configuration">
{% for config in configuration_options %}
<option value="{{config.id}}">
CORE: {{config.cpu|floatformat}},
RAM: {{config.memory|floatformat}} GiB,
SSD: {{config.disk_size|floatformat}} GiB,
PRICE: {{config.price|floatformat}} CHF/Month
RAM: {{config.memory|floatformat}} GB,
SSD: {{config.disk_size|floatformat}} GB,
PRICE: {{config.price|floatformat}} {% trans "CHF/Month" %}
</option>
{% endfor %}
</select>

View file

@ -9,18 +9,18 @@
<form role="form" novalidate>
<div class="row">
<div class="col-xs-12">
<h3><b>Billing Amount</b></h3>
<h3><b>{%trans "Billing Amount" %}</b></h3>
<hr>
<div class="content">
<!-- <p><b>Type</b> <span class="pull-right">{{request.session.vm_specs.location_code}}</span></p> -->
<!-- <hr> -->
<p><b>Cores</b> <span
<p><b>{%trans "Cores"%}</b> <span
class="pull-right">{{request.session.specs.cpu|floatformat}}</span></p>
<hr>
<p><b>Memory</b> <span
<p><b>{%trans "Memory"%}</b> <span
class="pull-right">{{request.session.specs.memory|floatformat}} GiB</span></p>
<hr>
<p><b>Disk space</b> <span
<p><b>{%trans "Disk space"%}</b> <span
class="pull-right">{{request.session.specs.disk_size|floatformat}} GiB</span></p>
<hr>
<h4>Total<p
@ -32,7 +32,7 @@
</div>
<div class="col-xs-12 col-md-4 billing">
<h3><b>Billing Address</b></h3>
<h3><b>{%trans "Billing Address"%}</b></h3>
<hr>
<form role="form" id="billing-form" method="post" action="" novalidate>
{% for field in form %}
@ -46,7 +46,7 @@
<div class="row">
<div class="col-xs-12 col-md-offset-2 col-md-4 "></div>
<div class="col-xs-12 col-md-4 creditcard-box">
<h3><b>Payment Details</b></h3>
<h3><b>{%trans "Payment Details"%}</b></h3>
<hr>
<div>
<div>
@ -57,7 +57,9 @@
<h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
<input type="hidden" name="credit_card_needed" value="false"/>
</form>
<button id="payment_button_with_creditcard" class="btn btn-success btn-lg btn-block" type="submit">Submit Payment</button>
<button id="payment_button_with_creditcard" class="btn btn-success btn-lg btn-block" type="submit">
{% trans "Submit Payment" %}
</button>
{% else %}
@ -74,9 +76,12 @@
<!-- <div class="row">
<div class="col-xs-9 col-md-12">
<div class="form-group">
<label class="control-label" for="cardNumber">CARD NUMBER</label>
<label class="control-label" for="cardNumber">{%trans "CARD NUMBER"%}</label>
<div class="input-group">
<input type="text" class="form-control" name="cardNumber" placeholder="Valid Card Number" required autofocus data-stripe="number" />
<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>
@ -85,7 +90,7 @@
<div class="row">
<div class="col-xs-6 col-md-7">
<div class="form-group">
<label for="expMonth">EXPIRATION DATE</label><br/>
<label for="expMonth">{%trans "EXPIRATION DATE"%}</label><br/>
<div class="col-xs-6 col-lg-6 col-md-6 pl-ziro">
<input type="text" class="form-control" name="expMonth" placeholder="MM" required data-stripe="exp_month" />
</div>
@ -96,7 +101,7 @@
</div>
<div class="col-xs-4 col-md-5 pull-right">
<div class="form-group">
<label for="cvCode">CV CODE</label>
<label for="cvCode">{%trans "CV CODE"%}</label>
<input type="password" class="form-control" name="cvCode" placeholder="CV" required data-stripe="cvc" />
</div>
</div>

View file

@ -161,7 +161,7 @@
{% trans "Terminate your Virtual Machine"%}
</div>
<div class="modal-body">
{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} {% trans "plan?"%}
{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ?
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel"%}</button>

View file

@ -34,7 +34,8 @@
{% endbuttons %}
<div class="form-group">
</div>
<h5> Use your created key to access to the machine. If you lost it, contact us. </h5>
{% else %}
<h5> {% trans "Use your created key to access to the machine. If you lost it, contact us." %} </h5>
<table class="table borderless table-hover">
<br/>
<thead>