From 043d5f28c3dce5a58370a97adfb243a7224939b4 Mon Sep 17 00:00:00 2001 From: Levi Date: Fri, 15 Apr 2016 22:25:57 -0500 Subject: [PATCH] fixing url translations --- cms_templates/detail.html | 2 +- digitalglarus/locale/de/LC_MESSAGES/django.po | 45 +++++++++++-------- digitalglarus/templates/base_glarus.html | 2 +- digitalglarus/urls.py | 2 +- .../ungleich_page/includes/_contact_us.html | 2 +- 5 files changed, 30 insertions(+), 23 deletions(-) diff --git a/cms_templates/detail.html b/cms_templates/detail.html index 412a6b91..e4ff4c55 100644 --- a/cms_templates/detail.html +++ b/cms_templates/detail.html @@ -8,4 +8,4 @@
  • {{ message.received_date }} -

    Back to Main +

    Back to Main diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.po b/digitalglarus/locale/de/LC_MESSAGES/django.po index 0aa6bf8a..87b79204 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: 2016-04-09 12:46-0500\n" +"POT-Creation-Date: 2016-04-15 22:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,22 +26,6 @@ msgstr "" msgid "Digital Glarus Supporters" msgstr "" -#: forms.py:21 -msgid "Name" -msgstr "Name" - -#: forms.py:22 -msgid "Email" -msgstr "Email" - -#: forms.py:23 -msgid "Phone number" -msgstr "Telefon" - -#: forms.py:24 -msgid "Message" -msgstr "Nachricht" - #: templates/glarus_blog/includes/blog_item.html:32 msgid "read more" msgstr "" @@ -79,17 +63,40 @@ msgid "Change to language:" msgstr "" #: urls.py:8 +msgid "home/?$" +msgstr "haus/?$" + +#: urls.py:9 +msgid "about/?$" +msgstr "etwa/?$" + +#: urls.py:10 msgid "contact/?$" msgstr "kontakt/?$" -#: urls.py:9 +#: urls.py:11 msgid "supporters/?$" msgstr "befurworter/?$" -#: urls.py:10 +#: urls.py:12 msgid "support-us/?$" msgstr "" #: views.py:23 msgid "Message Successfully Sent" msgstr "" + +#~ msgid "index/?$" +#~ msgstr "index/?$" + +#~ msgid "Name" +#~ msgstr "Name" + +#~ msgid "Email" +#~ msgstr "Email" + +#~ msgid "Phone number" +#~ msgstr "Telefon" + +#~ msgid "Message" +#~ msgstr "Nachricht" diff --git a/digitalglarus/templates/base_glarus.html b/digitalglarus/templates/base_glarus.html index b57158f3..192f7f66 100644 --- a/digitalglarus/templates/base_glarus.html +++ b/digitalglarus/templates/base_glarus.html @@ -83,7 +83,7 @@ {# 

     {% filter force_escape %} {% debug %} {% endfilter %}
    #} {# {% show_menu 0 0 0 1 %}#}
  • - Home + Home
    • {% show_menu_below_id "digital-glarus-page" 0 %}
  • diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index eeeccf81..defb8f66 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -5,7 +5,7 @@ from . import views from .views import ContactView, IndexView, AboutView urlpatterns = [ - url(_(r'index/?$'), IndexView.as_view(), name='index'), + url(_(r'home/?$'), IndexView.as_view(), name='home'), url(_(r'about/?$'), AboutView.as_view(), name='about'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'supporters/?$'), views.supporters, name='supporters'), diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 7d206cad..055c92f1 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -13,7 +13,7 @@ {% endfor %}

    {% trans "Contact Us" %}


    -

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, +

    {% trans "Join us at" %} {% trans "Digital Glarus" %}, {% trans "a great co-working space in the middle of Alps!" %}

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

    info@ungleich.ch

    (044) 534-66-22