Compare commits

..

No commits in common. "master" and "feature/yearly-subscription" have entirely different histories.

3 changed files with 51 additions and 59 deletions
datacenterlight
locale/de/LC_MESSAGES
views.py
hosting/locale/de/LC_MESSAGES

View file

@ -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: 2019-11-15 17:33+0000\n" "POT-Creation-Date: 2019-11-15 14:29+0000\n"
"PO-Revision-Date: 2018-03-30 23:22+0000\n" "PO-Revision-Date: 2018-03-30 23:22+0000\n"
"Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n" "Last-Translator: b'Anonymous User <coder.purple+25@gmail.com>'\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -20,7 +20,7 @@ msgstr ""
"X-Translated-Using: django-rosetta 0.8.1\n" "X-Translated-Using: django-rosetta 0.8.1\n"
msgid "CMS Favicon" msgid "CMS Favicon"
msgstr "CMS Favicon" msgstr ""
#, python-format #, python-format
msgid "Your New VM %(vm_name)s at Data Center Light" msgid "Your New VM %(vm_name)s at Data Center Light"
@ -52,7 +52,7 @@ msgid "Login"
msgstr "Anmelden" msgstr "Anmelden"
msgid "Dashboard" msgid "Dashboard"
msgstr "Dashboard" msgstr ""
msgid "Thank you for contacting us." msgid "Thank you for contacting us."
msgstr "Nachricht gesendet." msgstr "Nachricht gesendet."
@ -64,7 +64,7 @@ msgid "Get in touch with us!"
msgstr "Sende uns eine Nachricht." msgstr "Sende uns eine Nachricht."
msgid "Name" msgid "Name"
msgstr "Name" msgstr ""
msgid "Please enter your name." msgid "Please enter your name."
msgstr "Bitte gib Deinen Namen ein." msgstr "Bitte gib Deinen Namen ein."
@ -108,7 +108,7 @@ msgid "Your account details are as follows"
msgstr "Deine Account Details sind unten aufgelistet" msgstr "Deine Account Details sind unten aufgelistet"
msgid "Username" msgid "Username"
msgstr "Benusername" msgstr "Username"
msgid "Your email address" msgid "Your email address"
msgstr "Deine E-Mail-Adresse" msgstr "Deine E-Mail-Adresse"
@ -155,7 +155,7 @@ msgid "Please enter a value in range %(min_ram)s - 200."
msgstr "Bitte gib einen Wert von %(min_ram)s bis 200 ein." msgstr "Bitte gib einen Wert von %(min_ram)s bis 200 ein."
msgid "VM hosting" msgid "VM hosting"
msgstr "VM Hosting" msgstr ""
msgid "month" msgid "month"
msgstr "Monat" msgstr "Monat"
@ -207,14 +207,14 @@ msgstr ""
msgid "Only wants you to pay for what you actually need." msgid "Only wants you to pay for what you actually need."
msgstr "" msgstr ""
"Du möchtest nur das bezahlen, was du auch wirklich brauchst: Wähle deine " "Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine "
"Ressourcen individuell aus!" "Ressourcen individuell aus!"
msgid "" msgid ""
"Is creative, using a modern and alternative design for a data center in " "Is creative, using a modern and alternative design for a data center in "
"order to make it more sustainable and affordable at the same time." "order to make it more sustainable and affordable at the same time."
msgstr "" msgstr ""
"Es ist kreativ, da es sich ein modernes und alternatives Layout zu Nutze" "Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze "
"macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu " "macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu "
"können." "können."
@ -222,9 +222,9 @@ msgid ""
"Cuts down the costs for you by using FOSS (Free Open Source Software) " "Cuts down the costs for you by using FOSS (Free Open Source Software) "
"exclusively, wherefore we can save money from paying licenses." "exclusively, wherefore we can save money from paying licenses."
msgstr "" msgstr ""
"Um unnötige Kosten zu sparen werden, wird ausschliesslich Software auf" "Sorgt dafür, dass unnötige Kosten erspart werden, indem es ausschliesslich "
"Basis von FOSS (Free Open Source Software) eingesetzt und dadurch können auf " "mit FOSS (Free Open Source Software) arbeitet und wir daher auf "
"Lizenzgebühren verzichtet werden." "Lizenzgebühren verzichten können."
msgid "Scale out" msgid "Scale out"
msgstr "Skalierung" msgstr "Skalierung"
@ -311,7 +311,7 @@ msgid "Billing Address"
msgstr "Rechnungsadresse" msgstr "Rechnungsadresse"
msgid "Make a payment" msgid "Make a payment"
msgstr "Tätige eine Bezahlung" msgstr ""
msgid "Your Order" msgid "Your Order"
msgstr "Deine Bestellung" msgstr "Deine Bestellung"
@ -422,19 +422,19 @@ msgid "Price"
msgstr "Preise" msgstr "Preise"
msgid "VAT for" msgid "VAT for"
msgstr "MwSt für" msgstr ""
msgid "Total Amount" msgid "Total Amount"
msgstr "Gesamtsumme" msgstr "Gesamtsumme"
msgid "Amount" msgid "Amount"
msgstr "Betrag" msgstr ""
msgid "Description" msgid "Description"
msgstr "Beschreibung" msgstr ""
msgid "Recurring" msgid "Recurring"
msgstr "Wiederholend" msgstr ""
msgid "Subtotal" msgid "Subtotal"
msgstr "Zwischensumme" msgstr "Zwischensumme"
@ -450,16 +450,15 @@ msgid ""
"By clicking \"Place order\" this plan will charge your credit card account " "By clicking \"Place order\" this plan will charge your credit card account "
"with %(total_price)s CHF/year" "with %(total_price)s CHF/year"
msgstr "" msgstr ""
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(total_price)s " "Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
"CHF pro Jahr belastet" "%(total_price)s CHF pro Jahr belastet"
msgid "" msgid ""
"By clicking \"Place order\" this plan will charge your credit card account " "By clicking \"Place order\" this plan will charge your credit card account "
"with %(total_price)s CHF/month" "with %(total_price)s CHF/month"
msgstr "" msgstr ""
"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(total_price)s " "Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit "
"CHF pro Monat belastet" "%(total_price)s CHF pro Monat belastet"
#, fuzzy, python-format #, fuzzy, python-format
#| msgid "" #| msgid ""
@ -490,10 +489,10 @@ msgid "Hold tight, we are processing your request"
msgstr "Bitte warten - wir verarbeiten Deine Anfrage gerade" msgstr "Bitte warten - wir verarbeiten Deine Anfrage gerade"
msgid "OK" msgid "OK"
msgstr "Ok" msgstr ""
msgid "Close" msgid "Close"
msgstr "Schliessen" msgstr ""
msgid "Some problem encountered. Please try again later." msgid "Some problem encountered. Please try again later."
msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal." msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal."
@ -505,7 +504,7 @@ msgid "Tech Stack"
msgstr "Tech Stack" msgstr "Tech Stack"
msgid "We are seriously open source." msgid "We are seriously open source."
msgstr "Wir sind vollends Open Source." msgstr "Wir sind vollends opensource."
msgid "" msgid ""
" Our full software stack is open source We don't use anything that isn't " " Our full software stack is open source We don't use anything that isn't "
@ -575,13 +574,13 @@ msgid "Starting from only 15CHF per month. Try now."
msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!" msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!"
msgid "Actions speak louder than words. Let's do it, try our VM now." msgid "Actions speak louder than words. Let's do it, try our VM now."
msgstr "Taten sagen mehr als Worte Teste jetzt unsere VM!" msgstr "Tagen sagen mehr als Worte Teste jetzt unsere VM!"
msgid "Invalid number of cores" msgid "Invalid number of cores"
msgstr "Ungültige Anzahle CPU-Kerne" msgstr "Ungültige Anzahle CPU-Kerne"
msgid "Invalid calculator properties" msgid "Invalid calculator properties"
msgstr "Ungültige Berechnungseigenschaften" msgstr ""
msgid "Invalid RAM size" msgid "Invalid RAM size"
msgstr "Ungültige RAM-Grösse" msgstr "Ungültige RAM-Grösse"
@ -591,7 +590,7 @@ msgstr "Ungültige Speicher-Grösse"
#, python-brace-format #, python-brace-format
msgid "Incorrect pricing name. Please contact support{support_email}" msgid "Incorrect pricing name. Please contact support{support_email}"
msgstr "Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}" msgstr ""
#, python-brace-format #, python-brace-format
msgid "{user} does not have permission to access the card" msgid "{user} does not have permission to access the card"
@ -618,14 +617,11 @@ msgid "An error occurred while associating the card. Details: {details}"
msgstr "" msgstr ""
"Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}" "Beim Verbinden der Karte ist ein Fehler aufgetreten. Details: {details}"
msgid " This is a monthly recurring plan."
msgstr "Dies ist ein monatlich wiederkehrender Plan."
msgid " This is an yearly recurring plan."
msgstr "Dies ist ein jährlich wiederkehrender Plan."
msgid "Confirmation of your payment" msgid "Confirmation of your payment"
msgstr "Bestätigung deiner Zahlung" msgstr ""
msgid " This is a monthly recurring plan."
msgstr ""
#, python-brace-format #, python-brace-format
msgid "" msgid ""
@ -636,8 +632,7 @@ msgid ""
"\n" "\n"
"Cheers,\n" "Cheers,\n"
"Your Data Center Light team" "Your Data Center Light team"
msgstr "Hallo {name},\n" "\n" "vielen Dank für deine Bestellung!\n" "Wir haben deine Bezahlung in Höhe von {amount:.2f} CHF erhalten. {recurring}\n" "\n" "Grüsse\n" msgstr ""
"Dein Data Center Light Team"
msgid "Thank you for the payment." msgid "Thank you for the payment."
msgstr "Danke für Deine Bestellung." msgstr "Danke für Deine Bestellung."
@ -645,7 +640,7 @@ msgstr "Danke für Deine Bestellung."
msgid "" msgid ""
"You will soon receive a confirmation email of the payment. You can always " "You will soon receive a confirmation email of the payment. You can always "
"contact us at info@ungleich.ch for any question that you may have." "contact us at info@ungleich.ch for any question that you may have."
msgstr "Du wirst bald eine Bestätigungs-E-Mail über die Zahlung erhalten. Du kannst jederzeit unter info@ungleich.ch kontaktieren." msgstr ""
msgid "Thank you for the order." msgid "Thank you for the order."
msgstr "Danke für Deine Bestellung." msgstr "Danke für Deine Bestellung."

View file

@ -994,9 +994,6 @@ class OrderConfirmationView(DetailView, FormView):
'reply_to': [context['email']], 'reply_to': [context['email']],
} }
send_plain_email_task.delay(email_data) send_plain_email_task.delay(email_data)
recurring_text = _(" This is a monthly recurring plan.")
if gp_details['recurring_interval'] == "year":
recurring_text = _(" This is an yearly recurring plan.")
email_data = { email_data = {
'subject': _("Confirmation of your payment"), 'subject': _("Confirmation of your payment"),
@ -1010,7 +1007,7 @@ class OrderConfirmationView(DetailView, FormView):
name=user.get('name'), name=user.get('name'),
amount=gp_details['amount'], amount=gp_details['amount'],
recurring=( recurring=(
recurring_text _(' This is a monthly recurring plan.')
if gp_details['recurring'] else '' if gp_details['recurring'] else ''
) )
) )

View file

@ -28,31 +28,31 @@ msgid "User does not exist"
msgstr "Der Benutzer existiert nicht" msgstr "Der Benutzer existiert nicht"
msgid "Choose a product" msgid "Choose a product"
msgstr "Wähle ein Produkt" msgstr ""
msgid "Amount in CHF" msgid "Amount in CHF"
msgstr "Betrag" msgstr "Betrag"
msgid "Recurring monthly" msgid "Recurring monthly"
msgstr "monatlich wiederkehrend" msgstr ""
msgid "Amount field does not match" msgid "Amount field does not match"
msgstr "Betragsfeld stimmt nicht überein" msgstr ""
msgid "Recurring field does not match" msgid "Recurring field does not match"
msgstr "Betragsfeld stimmt nicht überein" msgstr ""
msgid "Product name" msgid "Product name"
msgstr "Produkt" msgstr "Produkt"
msgid "Monthly subscription" msgid "Monthly subscription"
msgstr "Monatliches Abonnement" msgstr ""
msgid "Yearly subscription" msgid "Yearly subscription"
msgstr "Jährliches Abonnement" msgstr ""
msgid "One time payment" msgid "One time payment"
msgstr "Einmalzahlung" msgstr ""
msgid "Confirm Password" msgid "Confirm Password"
msgstr "Passwort Bestätigung" msgstr "Passwort Bestätigung"
@ -76,7 +76,7 @@ msgid "Please input a proper SSH key"
msgstr "Bitte verwende einen gültigen SSH-Key" msgstr "Bitte verwende einen gültigen SSH-Key"
msgid "Comma not accepted in the name of the key" msgid "Comma not accepted in the name of the key"
msgstr "Komma im Namen des Keys wird nicht akzeptiert" msgstr ""
msgid "All Rights Reserved" msgid "All Rights Reserved"
msgstr "Alle Rechte vorbehalten" msgstr "Alle Rechte vorbehalten"
@ -404,19 +404,19 @@ msgid "Amount"
msgstr "Betrag" msgstr "Betrag"
msgid "Description" msgid "Description"
msgstr "Beschreibung" msgstr ""
msgid "Recurring" msgid "Recurring"
msgstr "wiederkehrend" msgstr ""
msgid "of" msgid "of"
msgstr "von" msgstr ""
msgid "each year" msgid "each year"
msgstr "jedes Jahr" msgstr ""
msgid "of every month" msgid "of every month"
msgstr "jeden Monat" msgstr ""
msgid "BACK TO LIST" msgid "BACK TO LIST"
msgstr "ZURÜCK ZUR LISTE" msgstr "ZURÜCK ZUR LISTE"
@ -428,13 +428,13 @@ msgid "VM ID"
msgstr "" msgstr ""
msgid "IP Address" msgid "IP Address"
msgstr "IP-Adresse" msgstr ""
msgid "See Invoice" msgid "See Invoice"
msgstr "Siehe Rechnung" msgstr "Siehe Rechnung"
msgid "Page" msgid "Page"
msgstr "Seite" msgstr ""
msgid "Log in" msgid "Log in"
msgstr "Anmelden" msgstr "Anmelden"
@ -496,7 +496,7 @@ msgid "Hold tight, we are processing your request"
msgstr "Bitte warten - wir bearbeiten Deine Anfrage gerade" msgstr "Bitte warten - wir bearbeiten Deine Anfrage gerade"
msgid "OK" msgid "OK"
msgstr "Ok" msgstr ""
msgid "Close" msgid "Close"
msgstr "Schliessen" msgstr "Schliessen"
@ -852,7 +852,7 @@ msgstr "Ungültige Speicher-Grösse"
#, python-brace-format #, python-brace-format
msgid "Incorrect pricing name. Please contact support{support_email}" msgid "Incorrect pricing name. Please contact support{support_email}"
msgstr "Ungültige Preisbezeichnung. Bitte kontaktiere den Support{support_email}" msgstr ""
msgid "" msgid ""
"We could not find the requested VM. Please " "We could not find the requested VM. Please "
@ -871,7 +871,7 @@ msgstr "Fehler beenden VM"
msgid "" msgid ""
"VM terminate action timed out. Please contact support@datacenterlight.ch for " "VM terminate action timed out. Please contact support@datacenterlight.ch for "
"further information." "further information."
msgstr "VM beendet wegen Zeitüberschreitung. Bitte kontaktiere support@datacenterlight.ch für weitere Informationen." msgstr ""
#, python-format #, python-format
msgid "Virtual Machine %(vm_name)s Cancelled" msgid "Virtual Machine %(vm_name)s Cancelled"