Merge pull request #35 from levivm/develop

fixing url translations

cms_templates/detail.html

@@ -8,4 +8,4 @@
     <li>{{ message.received_date }}
 </ul>
 
-<p><a href="{% url 'digitalglarus:index' %}">Back to Main</a>
+<p><a href="{% url 'digitalglarus:home' %}">Back to Main</a>

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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"

digitalglarus/templates/base_glarus.html

@@ -83,7 +83,7 @@
 {#                <pre> {% filter force_escape %} {% debug %} {% endfilter %} </pre>#}
 {#                {% show_menu 0 0 0 1 %}#}
                 <li>
-                    <a href="{% url 'digitalglarus:index' %}">Home</a>
+                    <a href="{% url 'digitalglarus:home' %}">Home</a>
                 </li>
                 {% show_menu_below_id "digital-glarus-page" 0 %}
                 <li>

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'),

ungleich_page/templates/ungleich_page/includes/_contact_us.html

@@ -13,7 +13,7 @@
 			{% endfor %}
 		    <h2 class="section-heading">{% trans "Contact Us" %}</h2>
 		    <br>
-		    <h3 class="intro-smallcap">{% trans "Join us at" %} <a href="{% url 'digitalglarus:index'%}">{% trans "Digital Glarus" %}</a>,
+		    <h3 class="intro-smallcap">{% trans "Join us at" %} <a href="{% url 'digitalglarus:home'%}">{% trans "Digital Glarus" %}</a>,
 		      {% trans "a great co-working space in the middle of Alps!" %} <p></p> {% trans "You can contact us at" %} </h3>
 		    <h3 class="intro-smallcap"><a href="mailto:info@ungleich.ch" ><i class="fa fa-envelope">info@ungleich.ch</i></a></h3>
 		    <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3>