Merge pull request #35 from levivm/develop

fixing url translations
This commit is contained in:
Levi Velázquez 2016-04-15 22:41:59 -05:00
commit 8efa851430
5 changed files with 30 additions and 23 deletions

View file

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

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: 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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -26,22 +26,6 @@ msgstr ""
msgid "Digital Glarus Supporters" msgid "Digital Glarus Supporters"
msgstr "" 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 #: templates/glarus_blog/includes/blog_item.html:32
msgid "read more" msgid "read more"
msgstr "" msgstr ""
@ -79,17 +63,40 @@ msgid "Change to language:"
msgstr "" msgstr ""
#: urls.py:8 #: urls.py:8
msgid "home/?$"
msgstr "haus/?$"
#: urls.py:9
msgid "about/?$"
msgstr "etwa/?$"
#: urls.py:10
msgid "contact/?$" msgid "contact/?$"
msgstr "kontakt/?$" msgstr "kontakt/?$"
#: urls.py:9 #: urls.py:11
msgid "supporters/?$" msgid "supporters/?$"
msgstr "befurworter/?$" msgstr "befurworter/?$"
#: urls.py:10 #: urls.py:12
msgid "support-us/?$" msgid "support-us/?$"
msgstr "" msgstr ""
#: views.py:23 #: views.py:23
msgid "Message Successfully Sent" msgid "Message Successfully Sent"
msgstr "" msgstr ""
#~ msgid "index/?$"
#~ msgstr "index/?$"
#~ msgid "Name"
#~ msgstr "Name"
#~ msgid "Email"
#~ msgstr "Email"
#~ msgid "Phone number"
#~ msgstr "Telefon"
#~ msgid "Message"
#~ msgstr "Nachricht"

View file

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

View file

@ -5,7 +5,7 @@ from . import views
from .views import ContactView, IndexView, AboutView from .views import ContactView, IndexView, AboutView
urlpatterns = [ 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'about/?$'), AboutView.as_view(), name='about'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'supporters/?$'), views.supporters, name='supporters'), url(_(r'supporters/?$'), views.supporters, name='supporters'),

View file

@ -13,7 +13,7 @@
{% endfor %} {% endfor %}
<h2 class="section-heading">{% trans "Contact Us" %}</h2> <h2 class="section-heading">{% trans "Contact Us" %}</h2>
<br> <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> {% 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"><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> <h3 class="intro-smallcap"><i class="fa fa-phone"></i> (044) 534-66-22<p></p></h3>