From 1fd5b51caeeb073482661cc87c9fdf6491408201 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 14 Oct 2017 23:04:19 +0530 Subject: [PATCH 01/22] cdn links for vendor files --- .../templates/ungleich_page/glasfaser.html | 2 +- .../templates/ungleich_page/landing.html | 57 ++++++------------- 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index 486e4334..c0556c34 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -14,7 +14,7 @@ ungleich GmbH - + diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html index ebfd346c..96f3851f 100644 --- a/ungleich_page/templates/ungleich_page/landing.html +++ b/ungleich_page/templates/ungleich_page/landing.html @@ -1,6 +1,5 @@ -{% load static %} -{% load bootstrap3 %} -{% load i18n %} +{% load static i18n %} + @@ -13,9 +12,8 @@ ungleich GmbH - - + @@ -51,10 +49,9 @@ -

- -

 

+ + + @@ -64,13 +61,11 @@
  • - {% trans "Services"%}
    • -
  • -
  • -
  • + {% trans "Services"%} +
  • - {% trans "products"%}
    • -
  • + {% trans "products"%} +
  • {% trans "About"%}
    • @@ -78,7 +73,7 @@ {% trans "WHY UNGLEICH?"%}
  • - {% trans "BLOG"%} + {% trans "BLOG"%}
  • {% trans "CONTACT"%} @@ -114,19 +109,6 @@ {% include "ungleich_page/includes/_footer.html" %} - - - - - - - - - - - - - - + - - + + - + - - + - - + From cf426b88e23c45674521f98a8c58a509f933037b Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 26 Oct 2017 02:14:09 +0530 Subject: [PATCH 02/22] de text modified --- ungleich_page/templates/ungleich_page/glasfaser.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index 486e4334..2e797814 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -91,8 +91,8 @@

    Surfen Sie mit 100 Mbit/s im Internet!

    -

    Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit symmetrisch in beide Richtungen verfügbar. Damit kann ihr Firmennetzwerk auch Dienste bereitstellen.

    -

    Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot.

    +

    Mit dem neuen Glasfaser-Angebot der ungleich macht das Arbeiten im Internet richtig Spass. Das beste daran: die Geschwindigkeit ist symmetrisch in beide Richtungen verfügbar. Damit kann Ihr Firmennetzwerk auch Dienste bereitstellen.

    +

    Dieses Angebot ist im Moment ausschliesslich für Firmenkunden verfügbar. Die Aufschaltkosten der Glasfaserleitung sind von der Entfernung zum nächsten Anschlusspunkt abhängig. Fragen Sie noch heute nach einem individuellem Angebot. Gerne stellen wir Ihnen eine persönliche Offerte zusammen.

    @@ -144,7 +144,7 @@

    Einfach zu nutzen

    -

    2 vorkonfigurierte Endgeräte (benötigt zwei Steckdosen auf Ihrer Seite)

    +

    2 bereits für Sie konfigurierte Endgeräte (benötigt zwei Ihrer Steckdosen)

    Einfach einstecken und los!

    @@ -199,7 +199,7 @@
    -

    Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie bllitzschnell im Internet!

    +

    Sie müssen dann nur noch Ihre Geräte anschliessen und schon surfen Sie blitzschnell im Internet!

    • From 64ffca6ded510643c7c3b595efc31f3df84eb954 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Thu, 26 Oct 2017 03:24:29 +0530 Subject: [PATCH 03/22] signup form placeholder translation --- hosting/forms.py | 10 ++++++---- hosting/locale/de/LC_MESSAGES/django.po | 11 ++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/hosting/forms.py b/hosting/forms.py index 7be7a588..d1c9d03a 100644 --- a/hosting/forms.py +++ b/hosting/forms.py @@ -50,15 +50,17 @@ class HostingUserLoginForm(forms.Form): class HostingUserSignupForm(forms.ModelForm): - confirm_password = forms.CharField(widget=forms.PasswordInput()) - password = forms.CharField(widget=forms.PasswordInput()) + confirm_password = forms.CharField(label=_("Confirm Password"), + widget=forms.PasswordInput()) + password = forms.CharField(label=_("Password"), + widget=forms.PasswordInput()) class Meta: model = CustomUser fields = ['name', 'email', 'password'] widgets = { 'name': forms.TextInput( - attrs={'placeholder': 'Enter your name or company name'}), + attrs={'placeholder': _('Enter your name or company name')}), } def clean_confirm_password(self): @@ -106,7 +108,7 @@ class UserHostingKeyForm(forms.ModelForm): public_key=openssh_pubkey_str).first().name KEY_EXISTS_MESSAGE = _( "This key exists already with the name \"%(name)s\"") % { - 'name': key_name} + 'name': key_name} raise forms.ValidationError(KEY_EXISTS_MESSAGE) with tempfile.NamedTemporaryFile(delete=True) as tmp_public_key_file: diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index fa24637a..9bb4a7be 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-16 01:06+0530\n" +"POT-Creation-Date: 2017-10-26 03:21+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,6 +27,15 @@ msgstr "Dein Account wurde noch nicht aktiviert." msgid "User does not exist" msgstr "Der Benutzer existiert nicht" +msgid "Confirm Password" +msgstr "Passwort Bestätigung" + +msgid "Password" +msgstr "Passwort" + +msgid "Enter your name or company name" +msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" + msgid "Paste here your public key" msgstr "Füge Deinen Public Key ein" From 372f015760891a6442c67bdcb10ad8cb1b24205d Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 31 Oct 2017 20:50:15 +0530 Subject: [PATCH 04/22] translation fix --- hosting/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 9bb4a7be..2be2ae6d 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -34,7 +34,7 @@ msgid "Password" msgstr "Passwort" msgid "Enter your name or company name" -msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" +msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein" msgid "Paste here your public key" msgstr "Füge Deinen Public Key ein" From b8d0ca17d77770a6a6b5bd1c21cac78d561d37f2 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 31 Oct 2017 21:01:54 +0530 Subject: [PATCH 05/22] translation fix in utils.forms --- utils/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/locale/de/LC_MESSAGES/django.po b/utils/locale/de/LC_MESSAGES/django.po index 8a961e7a..f18fc9c2 100644 --- a/utils/locale/de/LC_MESSAGES/django.po +++ b/utils/locale/de/LC_MESSAGES/django.po @@ -736,7 +736,7 @@ msgid "Unknown or unspecified country" msgstr "" msgid "Enter your name or company name" -msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein" +msgstr "Gib Deinen Namen oder den Name Deines Unternehmens ein" msgid "Your username and/or password were incorrect." msgstr "Dein Benutzername und/oder Dein Passwort ist falsch." From 16f8ab6eccc76bfb647a38d61aebf9d8c785b6b3 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 1 Nov 2017 02:50:47 +0530 Subject: [PATCH 06/22] ungleich landing page animation delay reduced, direction changed --- .../static/ungleich_page/js/ungleich.js | 6 +-- .../ungleich_page/includes/_about.html | 5 +-- .../ungleich_page/includes/_contact_us.html | 10 +---- .../ungleich_page/includes/_portfolio.html | 6 +-- .../ungleich_page/includes/_services.html | 45 +++++++++---------- 5 files changed, 31 insertions(+), 41 deletions(-) diff --git a/ungleich_page/static/ungleich_page/js/ungleich.js b/ungleich_page/static/ungleich_page/js/ungleich.js index e5e4ed34..ca6a71e3 100644 --- a/ungleich_page/static/ungleich_page/js/ungleich.js +++ b/ungleich_page/static/ungleich_page/js/ungleich.js @@ -2,16 +2,16 @@ $(function(){ new WOW().init(); - $('.img-toggle').one('mouseover', toggleImage); + $('.img-toggle').one('mouseenter', toggleImage); }); function toggleImage(e) { var $this = $(this), toggle_img = $this.attr('data-replaced'), current_img = $this.attr('src'); - $this.fadeOut(600, function() { + $this.fadeOut(200, function() { $this.attr('src', toggle_img); $this.attr('data-replaced', current_img); - $this.fadeIn(900); + $this.fadeIn(300); }); }; diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 0b8218d9..b2bd393f 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -1,5 +1,4 @@ -{% load static %} -{% load i18n %} +{% load static i18n %}
    @@ -32,7 +31,7 @@

    {% trans "ungleich founded" %}

    -

    {% trans "in Switzerland" %}

    +

    {% trans "in Switzerland" %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 5c4d2da0..a104fbb3 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -8,7 +8,7 @@ {% for message in messages %} {% endfor %} @@ -16,7 +16,7 @@

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, + href="{% url 'digitalglarus:landing' %}">{% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}

    {% trans "You can contact us at" %}

    info@ungleich.ch @@ -62,12 +62,6 @@ --> -

     

    - -
    -
    - -

    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/includes/_portfolio.html b/ungleich_page/templates/ungleich_page/includes/_portfolio.html index 0df3b4c2..2c439a5d 100644 --- a/ungleich_page/templates/ungleich_page/includes/_portfolio.html +++ b/ungleich_page/templates/ungleich_page/includes/_portfolio.html @@ -10,7 +10,7 @@
    -
    +

    {% trans "Data Center Light" %}

    @@ -18,7 +18,7 @@

    {% trans "We offer the most affordable hosting in Switzerland. Data Center Light has full FOSS stack, 100% IPv6 and 100% SSD. Choose any configuration among CentOS, Debian, Ubuntu, Devuan, and FreeBSD." %}

    -
    +

    {% trans "Rails Hosting" %}

    @@ -26,7 +26,7 @@

    {% trans "Ready to go live with your Ruby on Rails application? We offer you ready-to-deploy virtual machines or configure your existing infrastructure for Ruby on Rails." %}

    -
    +

    {% trans "High Speed Internet" %}

    diff --git a/ungleich_page/templates/ungleich_page/includes/_services.html b/ungleich_page/templates/ungleich_page/includes/_services.html index 5a0ef848..2c3a8f62 100644 --- a/ungleich_page/templates/ungleich_page/includes/_services.html +++ b/ungleich_page/templates/ungleich_page/includes/_services.html @@ -2,48 +2,45 @@ {% load i18n %}
    -
    -
    -
    -

    {% trans "our services" %}

    -

    - {% trans "We support our clients in all areas of Unix infrastructure." %}
    - {% trans "Our top notch configuration management is refreshingly simple and reliable." %} -

    -
    -
    +
    +
    +

    {% trans "our services" %}

    +

    + {% trans "We support our clients in all areas of Unix infrastructure." %}
    + {% trans "Our top notch configuration management is refreshingly simple and reliable." %} +

    +
    -
    +
    -

    {% trans "Hosting" %}

    -

     

    -

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    +

    {% trans "Hosting" %}

    +

     

    +

    {% trans "Ruby on Rails. Java hosting, Django hosting, we make it everything run smooth and safe." %}

    -
    +
    -

    {% trans "Configuration as a Service" %}

    -

     

    -

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    -

     

    +

    {% trans "Configuration as a Service" %}

    +

     

    +

    {% trans "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that needs to configured, we provide comprehensive solutions. Amazon, rackspace or bare metal servers, we configure for you." %}

    -
    +
    -

    {% trans "Linux System Engineering" %}

    -

     

    -

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    +

    {% trans "Linux System Engineering" %}

    +

     

    +

    {% trans "Let your developers develop! We take care of your system administration. Gentoo, Archlinux, Debian, Ubuntu, and many more." %}

    -
    +
    From 0d3258dbbac602364805da05445e9f47faad0c4f Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 1 Nov 2017 03:05:47 +0530 Subject: [PATCH 07/22] navbar brand icon padding fixed --- ungleich_page/static/ungleich_page/css/agency.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ungleich_page/static/ungleich_page/css/agency.css b/ungleich_page/static/ungleich_page/css/agency.css index c898aa9f..8e6f4155 100755 --- a/ungleich_page/static/ungleich_page/css/agency.css +++ b/ungleich_page/static/ungleich_page/css/agency.css @@ -264,7 +264,8 @@ fieldset[disabled] .btn-xl.active { } .navbar-default.navbar-shrink .navbar-brand { - font-size: 1.5em; + font-size: 1.5em; + padding: 8px; } } From 994f193276790736137d86e5a0ca72480b4d0a14 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 6 Nov 2017 00:26:39 +0530 Subject: [PATCH 08/22] html fix --- digitalglarus/locale/de/LC_MESSAGES/django.po | 5 +- ungleich_page/locale/de/LC_MESSAGES/django.po | 8 ++- .../templates/ungleich_page/404.html | 16 ++--- .../ungleich_page/includes/_contact_us.html | 17 ++--- .../ungleich_page/includes/_footer.html | 12 ++-- .../ungleich_page/includes/_team.html | 68 +++++++++---------- .../templates/ungleich_page/landing.html | 8 +-- 7 files changed, 68 insertions(+), 66 deletions(-) diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.po b/digitalglarus/locale/de/LC_MESSAGES/django.po index 6ae6a6bb..23c0ecab 100644 --- a/digitalglarus/locale/de/LC_MESSAGES/django.po +++ b/digitalglarus/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-10 21:35+0530\n" +"POT-Creation-Date: 2017-11-06 00:24+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,6 +95,9 @@ msgstr "Seite" msgid "Data Center Light" msgstr "" +msgid "Glasfaser" +msgstr "" + msgid "English" msgstr "" diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 78921c45..c4d9510a 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-13 02:21+0530\n" +"POT-Creation-Date: 2017-11-06 00:24+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "Glasfaser menu" +msgstr "" + +msgid "\"Sorry, we could not find the page you are looking for!\"" +msgstr "" + msgid "Toggle navigation" msgstr "Umschalten" diff --git a/ungleich_page/templates/ungleich_page/404.html b/ungleich_page/templates/ungleich_page/404.html index bcd2260b..6bba094c 100644 --- a/ungleich_page/templates/ungleich_page/404.html +++ b/ungleich_page/templates/ungleich_page/404.html @@ -11,7 +11,7 @@ Page not found | ungleich - + @@ -33,27 +33,21 @@ - - +
    -
    -
    +

     

    404

    - "Sorry, we could not find the page you are looking for!" -

    -
    + {% trans '"Sorry, we could not find the page you are looking for!"' %} +

    -
    - - diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index a104fbb3..e87fe8ac 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -3,8 +3,8 @@
    -
    -
    +
    +
    {% for message in messages %}
    diff --git a/ungleich_page/templates/ungleich_page/includes/_team.html b/ungleich_page/templates/ungleich_page/includes/_team.html index a9a32c74..e207e336 100644 --- a/ungleich_page/templates/ungleich_page/includes/_team.html +++ b/ungleich_page/templates/ungleich_page/includes/_team.html @@ -3,29 +3,27 @@
    -
    -
    -

    {% trans "Why ungleich?*" %}

    -

    {% trans "What our customers say" %}

    -
    -
    +
    +

    {% trans "Why ungleich?*" %}

    +

    {% trans "What our customers say" %}

    +
    -
    +
      -
    1. -
    2. -
    3. +
    4. +
    5. +
    -
    - -

    +

    + +

    {% blocktrans %} "ungleich helped us getting started with our internal infrastructure, hosted on physical servers in a @@ -40,14 +38,14 @@ engineers to work more efficiently and comfortable than before." {% endblocktrans %} -

    -

    - - Luciano Franceschina, CTO at Teralytics -

    -
    -
    - -

    +

    +

    + - Luciano Franceschina, CTO at Teralytics +

    +
    +
    + +

    {% blocktrans %} "Thanks to ungleich team, who has designed and configured our company's Linux infrastructure, our @@ -56,14 +54,14 @@ significantly not only in cost but also in time saving, which is crucial for IT companies like ours." {% endblocktrans %} -

    -

    - - Beat Seeliger , CTO at Panter AG -

    -
    -
    - -

    +

    +

    + - Beat Seeliger , CTO at Panter AG +

    +
    +
    + +

    {% blocktrans %} "ungleich provided an excellent service in designing our system architecture and created secure and stable @@ -77,21 +75,21 @@ recommend them to any companies with high demand in solid infrastructures." {% endblocktrans %} -

    -

    +

    +

    {% blocktrans %} - Sebastian Plattner, Teamleader Development Cyber Security Products at RUAG {% endblocktrans %} -

    -
    +

    +
    -
    -

    {% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}

    +
    +

    {% blocktrans %}*ungleich means not equal to (≠) U+2260.{% endblocktrans %}

    \ No newline at end of file diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html index 96f3851f..a1434929 100644 --- a/ungleich_page/templates/ungleich_page/landing.html +++ b/ungleich_page/templates/ungleich_page/landing.html @@ -15,6 +15,7 @@ + @@ -43,7 +44,7 @@
    - +
    From a56f626aefe664f45552ceaff14eb0714431cfee Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 10 Nov 2017 21:57:43 +0100 Subject: [PATCH 14/22] Update Changelog --- Changelog | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog b/Changelog index af9ee184..cd040f1e 100644 --- a/Changelog +++ b/Changelog @@ -1,8 +1,9 @@ 1.2.9: (Next release) - * #3848: [ungleich] optimize ungleich.ch landing page - * #3360: [ungleich] ungleich.ch landing page animation fix - * #3421: [hosting] signup form placeholder translations - * #3856: [ungleich] glasfaser text modified + * #3848: [ungleich] Optimize ungleich.ch landing page + * #3360: [ungleich] Ungleich.ch landing page animation fix + * #3421: [hosting] Signup form placeholder translations + * #3856: [ungleich] Glasfaser text modified + * bugfix: [blog] Redirect user to ungleich home on ungliech logo click 1.2.8: 2017-10-21 * Remove ALLOWED_HOST alplora.ch * Add ALLOWED_HOST hack4glarus.ch From de76311ea35cd9f91da144cd35be32fcb72f13bd Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 11 Nov 2017 11:39:25 +0100 Subject: [PATCH 15/22] Change "affordable vm hosting.." text --- datacenterlight/static/datacenterlight/css/landing-page.css | 4 ++++ datacenterlight/templates/datacenterlight/index.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 9b02420c..54ff8b8c 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -434,6 +434,10 @@ button, input, optgroup, select, textarea { font-size: 21px !important; } +.new-lead .small-text { + font-size: 16px; +} + .split-section .split-text .split-title{ position: relative; margin-bottom: 25px; diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 85e66571..6eed1392 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -130,7 +130,7 @@

    {% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

    -

    {% trans "Affordable VM hosting based in Switzerland" %}

    +

    {% blocktrans %}Ready in 30 seconds.
    Experience the unbeatable speed from Data Center Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may take few seconds longer.{% endblocktrans %}

    From 0b340f29e17636deb68a1472c70645285de8b3b3 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 11 Nov 2017 11:40:26 +0100 Subject: [PATCH 16/22] Add DE translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index ac796b95..80f22aff 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-16 00:57+0530\n" +"POT-Creation-Date: 2017-11-11 10:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -270,8 +270,16 @@ msgstr "" "Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit " "federleichten Preisen." -msgid "Affordable VM hosting based in Switzerland" -msgstr "Bezahlbares VM Hosting in der Schweiz" +msgid "" +"Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " +"Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may " +"take few seconds longer." +msgstr "" +"Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von Data " +"Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM dauert es " +"nur 30 Sekunden.
    *Dies bezieht sich auf eine " +"einzelne VM. Mehrere VMs können einige Sekunden länger dauern." msgid "Contact us" msgstr "Kontaktiere uns" @@ -513,6 +521,9 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." +#~ msgid "Affordable VM hosting based in Switzerland" +#~ msgstr "Bezahlbares VM Hosting in der Schweiz" + #~ msgid "Processing..." #~ msgstr "Abarbeitung..." From 629eb41ff5bf4a51d9132c4549add1feacb89f4e Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:00:56 +0100 Subject: [PATCH 17/22] Remove "From confirmation to access" text --- .../locale/de/LC_MESSAGES/django.po | 22 +++++++++++++------ .../datacenterlight/css/landing-page.css | 4 ---- .../templates/datacenterlight/index.html | 2 +- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 80f22aff..e87a7616 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-11 10:31+0000\n" +"POT-Creation-Date: 2017-11-13 17:59+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -272,14 +272,10 @@ msgstr "" msgid "" "Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " -"Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may " -"take few seconds longer." +"Light." msgstr "" "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von Data " -"Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM dauert es " -"nur 30 Sekunden.
    *Dies bezieht sich auf eine " -"einzelne VM. Mehrere VMs können einige Sekunden länger dauern." +"Center Light.
    " msgid "Contact us" msgstr "Kontaktiere uns" @@ -521,6 +517,18 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." +#~ msgid "" +#~ "Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " +#~ "Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs " +#~ "may take few seconds longer." +#~ msgstr "" +#~ "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von " +#~ "Data Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM " +#~ "dauert es nur 30 Sekunden.
    *Dies bezieht " +#~ "sich auf eine einzelne VM. Mehrere VMs können einige Sekunden länger " +#~ "dauern." + #~ msgid "Affordable VM hosting based in Switzerland" #~ msgstr "Bezahlbares VM Hosting in der Schweiz" diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 54ff8b8c..9b02420c 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -434,10 +434,6 @@ button, input, optgroup, select, textarea { font-size: 21px !important; } -.new-lead .small-text { - font-size: 16px; -} - .split-section .split-text .split-title{ position: relative; margin-bottom: 25px; diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html index 6eed1392..cc3597ec 100755 --- a/datacenterlight/templates/datacenterlight/index.html +++ b/datacenterlight/templates/datacenterlight/index.html @@ -130,7 +130,7 @@

    {% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

    -

    {% blocktrans %}Ready in 30 seconds.
    Experience the unbeatable speed from Data Center Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs may take few seconds longer.{% endblocktrans %}

    +

    {% blocktrans %}Ready in 30 seconds.
    Experience the unbeatable speed from Data Center Light.{% endblocktrans %}

    From 0038bb8ee45b5ae3aec9e9c03316ac1c4e2f9a51 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:37:46 +0100 Subject: [PATCH 18/22] Remove commented translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index e87a7616..ca5bd19d 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -517,18 +517,6 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." -#~ msgid "" -#~ "Ready in 30 seconds.
    Experience the unbeatable speed from Data Center " -#~ "Light.
    From confirmation to access, our VM takes only 30 seconds.
    *measurement for a single VM, multiple VMs " -#~ "may take few seconds longer." -#~ msgstr "" -#~ "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von " -#~ "Data Center Light.
    Von der Bestätigung bis zum Zugriff auf die VM " -#~ "dauert es nur 30 Sekunden.
    *Dies bezieht " -#~ "sich auf eine einzelne VM. Mehrere VMs können einige Sekunden länger " -#~ "dauern." - #~ msgid "Affordable VM hosting based in Switzerland" #~ msgstr "Bezahlbares VM Hosting in der Schweiz" From 6d7d24eafe76777b58297a4c366d7504221178a7 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:40:00 +0100 Subject: [PATCH 19/22] Remove unwanted br tag in de translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index ca5bd19d..c69f83d1 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -275,7 +275,7 @@ msgid "" "Light." msgstr "" "Fertig in 30 Sekunden.
    Erlebe die unschlagbare Geschwindigkeit von Data " -"Center Light.
    " +"Center Light." msgid "Contact us" msgstr "Kontaktiere uns" From b9a5c9fea1136bb62fb4c884da33581a80bd3a4b Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:43:53 +0100 Subject: [PATCH 20/22] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index cd040f1e..52607287 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ * #3421: [hosting] Signup form placeholder translations * #3856: [ungleich] Glasfaser text modified * bugfix: [blog] Redirect user to ungleich home on ungliech logo click + * #3858: [dcl] Change "affordable vm ..." text to "Ready in 30 seconds ..." 1.2.8: 2017-10-21 * Remove ALLOWED_HOST alplora.ch * Add ALLOWED_HOST hack4glarus.ch From dbd3fea5caedc561feb59f5767b3f3bb7baac1b2 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:46:20 +0100 Subject: [PATCH 21/22] Update Changelog: Add date for 1.2.9 --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 52607287..e288f85d 100644 --- a/Changelog +++ b/Changelog @@ -1,4 +1,4 @@ -1.2.9: (Next release) +1.2.9: 2017-11-13 * #3848: [ungleich] Optimize ungleich.ch landing page * #3360: [ungleich] Ungleich.ch landing page animation fix * #3421: [hosting] Signup form placeholder translations From 1651dc00b59e80c1393e49fd9923f20ddb0c1f68 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 13 Nov 2017 19:54:37 +0100 Subject: [PATCH 22/22] Changelog: Correct ungleich spelling --- Changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog b/Changelog index e288f85d..77c53a4b 100644 --- a/Changelog +++ b/Changelog @@ -3,7 +3,7 @@ * #3360: [ungleich] Ungleich.ch landing page animation fix * #3421: [hosting] Signup form placeholder translations * #3856: [ungleich] Glasfaser text modified - * bugfix: [blog] Redirect user to ungleich home on ungliech logo click + * bugfix: [blog] Redirect user to ungleich home on ungleich logo click * #3858: [dcl] Change "affordable vm ..." text to "Ready in 30 seconds ..." 1.2.8: 2017-10-21 * Remove ALLOWED_HOST alplora.ch