Skip to content

Commit eb98c76

Browse files
playpauseandstopplaypauseandstop
committed
Update flow links and translations.
1 parent 6d4c801 commit eb98c76

5 files changed

Lines changed: 51 additions & 42 deletions

File tree

‎learnpython/static/css/screen.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ nav ul {
9090

9191
nav ul li {
9292
float: left;
93-
width: 240px;
93+
width: 320px;
9494
}
9595

9696
nav ul li a {

‎learnpython/templates/base.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<link href="{{ url_for("static", filename="css/screen.css") }}" media="screen,projection,tv" rel="stylesheet" type="text/css">
88
{% block extra_head %}{% endblock %}
99

10+
{% if not request.host.startswith("127.0.0.1") %}
1011
<script type="text/javascript"><!--
1112
var _gaq = _gaq || [];
1213
_gaq.push(['_setAccount', 'UA-5480567-4']);
@@ -18,6 +19,7 @@
1819
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
1920
})();
2021
--></script>
22+
{% endif %}
2123
</head>
2224

2325
<body>
@@ -30,24 +32,23 @@ <h1>
3032
{% if not is_index %}</a>{% endif %}
3133
</h1>
3234
<p>
33-
<a{% if is_about %} class="active"{% endif %} href="{{ url_for("page", name="about") }}">{{ _("About us") }}</a> -
35+
<a{% if is_about %} class="active"{% endif %} href="{{ url_for("page", name="about") }}">{{ _("About us") }}</a> &ndash;
3436
<a{% if is_contacts %} class="active"{% endif %} href="{{ url_for("page", name="contacts") }}">{{ _("Contacts") }}</a>
3537
</p>
3638
</div>
3739
<div class="right-wrapper">
38-
<h3>{{ _("3 flows on 12 studies") }}</h3>
40+
<h3>{{ _("2 flows on 12 studies") }}</h3>
3941
</div>
4042
<div class="clear">
4143
<a class="github-ribbon" href="https://github.com/playpauseandstop/learnpython.in.ua">
42-
<img alt="Fork us on GitHub" src="{{ url_for("static", filename="img/github-ribbon.png") }}">
44+
<img alt="{{ _("Fork us on GitHub") }}" src="{{ url_for("static", filename="img/github-ribbon.png") }}">
4345
</a>
4446
</div>
4547
</header>
4648

4749
<nav>
4850
<ul>
49-
<li><a id="medium-link-nav" href="{{ url_for("flows", _anchor="medium") }}">{{ _("Medium flow") }}</a></li>
50-
<li><a id="normal-link-nav" href="{{ url_for("flows", _anchor="normal") }}">{{ _("Normal flow") }}</a></li>
51+
<li><a id="web-link-nav" href="{{ url_for("flows", _anchor="web") }}">{{ _("Web flow") }}</a></li>
5152
<li><a id="advanced-link-nav" href="{{ url_for("flows", _anchor="advanced") }}">{{ _("Advanced flow") }}</a></li>
5253
<li><a class="{% if is_subscribe %}active {% endif %}subscribe" href="{{ url_for("subscribe") }}">{{ _("Subscribe") }} &rarr;</a></li>
5354
</ul>
@@ -58,14 +59,13 @@ <h3>{{ _("3 flows on 12 studies") }}</h3>
5859
</article>
5960

6061
<footer>
61-
2012 &copy; <a{% if is_index %} class="active"{% endif %} href="{{ url_for("index") }}">Learn Python</a><br>
62+
2012 &copy; <a{% if is_index %} class="active"{% endif %} href="{{ url_for("index") }}">{{ _("Learn Python") }}</a><br>
6263

63-
<a id="medium-link-footer" href="{{ url_for("flows", _anchor="medium") }}">{{ _("Medium flow") }}</a> &middot;
64-
<a id="normal-link-footer" href="{{ url_for("flows", _anchor="normal") }}">{{ _("Normal flow") }}</a> &middot;
64+
<a id="web-link-footer" href="{{ url_for("flows", _anchor="web") }}">{{ _("Web flow") }}</a> &ndash;
6565
<a id="advanced-link-footer" href="{{ url_for("flows", _anchor="advanced") }}">{{ _("Advanced flow") }}</a><br>
6666

67-
<a{% if is_about %} class="active"{% endif %} href="{{ url_for("page", name="about") }}">{{ _("About us") }}</a> &middot;
68-
<a{% if is_subscribe %} class="active"{% endif %} href="{{ url_for("subscribe") }}">{{ _("Subscribe") }}</a> &middot;
67+
<a{% if is_about %} class="active"{% endif %} href="{{ url_for("page", name="about") }}">{{ _("About us") }}</a> &ndash;
68+
<a{% if is_subscribe %} class="active"{% endif %} href="{{ url_for("subscribe") }}">{{ _("Subscribe") }}</a> &ndash;
6969
<a{% if is_contacts %} class="active"{% endif %} href="{{ url_for("page", name="contacts") }}">{{ _("Contacts") }}</a>
7070
</footer>
7171
</div>

‎learnpython/translations/messages.pot‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: learnpython VERSION\n"
1111
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
12-
"POT-Creation-Date: 2012-09-30 09:58+0300\n"
12+
"POT-Creation-Date: 2012-10-23 10:59+0300\n"
1313
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1414
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1515
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,8 +58,8 @@ msgstr ""
5858
msgid "Additional comments"
5959
msgstr ""
6060

61-
#: learnpython/forms.py:89 learnpython/templates/base.html:40
62-
#: learnpython/templates/base.html:56
61+
#: learnpython/forms.py:89 learnpython/templates/base.html:53
62+
#: learnpython/templates/base.html:68
6363
msgid "Subscribe"
6464
msgstr ""
6565

@@ -83,34 +83,38 @@ msgid ""
8383
" necessary information later!"
8484
msgstr ""
8585

86-
#: learnpython/templates/base.html:4 learnpython/templates/base.html:17
86+
#: learnpython/templates/base.html:4 learnpython/templates/base.html:31
8787
msgid "Learn Python in Kyiv, Ukraine"
8888
msgstr ""
8989

90-
#: learnpython/templates/base.html:21 learnpython/templates/base.html:55
90+
#: learnpython/templates/base.html:35 learnpython/templates/base.html:67
9191
msgid "About us"
9292
msgstr ""
9393

94-
#: learnpython/templates/base.html:22 learnpython/templates/base.html:57
94+
#: learnpython/templates/base.html:36 learnpython/templates/base.html:69
9595
msgid "Contacts"
9696
msgstr ""
9797

98-
#: learnpython/templates/base.html:26
99-
msgid "3 flows on 12 studies"
98+
#: learnpython/templates/base.html:40
99+
msgid "2 flows on 12 studies"
100100
msgstr ""
101101

102-
#: learnpython/templates/base.html:37 learnpython/templates/base.html:51
103-
msgid "Medium flow"
102+
#: learnpython/templates/base.html:44
103+
msgid "Fork us on GitHub"
104104
msgstr ""
105105

106-
#: learnpython/templates/base.html:38 learnpython/templates/base.html:52
107-
msgid "Normal flow"
106+
#: learnpython/templates/base.html:51 learnpython/templates/base.html:64
107+
msgid "Web flow"
108108
msgstr ""
109109

110-
#: learnpython/templates/base.html:39 learnpython/templates/base.html:53
110+
#: learnpython/templates/base.html:52 learnpython/templates/base.html:65
111111
msgid "Advanced flow"
112112
msgstr ""
113113

114+
#: learnpython/templates/base.html:62
115+
msgid "Learn Python"
116+
msgstr ""
117+
114118
#: learnpython/templates/contacts.html:9
115119
msgid "Cannot submit form! Please, fix errors below:"
116120
msgstr ""

‎learnpython/translations/ru/LC_MESSAGES/messages.mo‎

60 Bytes
Binary file not shown.

‎learnpython/translations/ru/LC_MESSAGES/messages.po‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
# This file is distributed under the same license as the PROJECT project.
44
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
55
#
6+
msgid ""
7+
msgstr ""
68
"Project-Id-Version: PROJECT VERSION\n"
79
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
8-
"POT-Creation-Date: 2012-09-30 09:58+0300\n"
9-
"PO-Revision-Date: 2012-09-26 12:54+0300\n"
10+
"POT-Creation-Date: 2012-10-23 10:59+0300\n"
11+
"PO-Revision-Date: 2012-10-23 10:59+0300\n"
1012
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1113
"Language-Team: ru <LL@li.org>\n"
1214
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
@@ -56,8 +58,8 @@ msgstr "Поток"
5658
msgid "Additional comments"
5759
msgstr "Дополнительные комментарии"
5860

59-
#: learnpython/forms.py:89 learnpython/templates/base.html:40
60-
#: learnpython/templates/base.html:56
61+
#: learnpython/forms.py:89 learnpython/templates/base.html:53
62+
#: learnpython/templates/base.html:68
6163
msgid "Subscribe"
6264
msgstr "Запись на курс"
6365

@@ -88,34 +90,38 @@ msgstr ""
8890
" всю необходимую информацию о сроках и цене курса на ваш электронный "
8991
"адрес!"
9092

91-
#: learnpython/templates/base.html:4 learnpython/templates/base.html:17
93+
#: learnpython/templates/base.html:4 learnpython/templates/base.html:31
9294
msgid "Learn Python in Kyiv, Ukraine"
9395
msgstr "Учим Python в Киеве"
9496

95-
#: learnpython/templates/base.html:21 learnpython/templates/base.html:55
97+
#: learnpython/templates/base.html:35 learnpython/templates/base.html:67
9698
msgid "About us"
9799
msgstr "О нас"
98100

99-
#: learnpython/templates/base.html:22 learnpython/templates/base.html:57
101+
#: learnpython/templates/base.html:36 learnpython/templates/base.html:69
100102
msgid "Contacts"
101103
msgstr "Контакты"
102104

103-
#: learnpython/templates/base.html:26
104-
msgid "3 flows on 12 studies"
105-
msgstr "3 потока по 12 занятий"
105+
#: learnpython/templates/base.html:40
106+
msgid "2 flows on 12 studies"
107+
msgstr "2 потока по 12 занятий"
106108

107-
#: learnpython/templates/base.html:37 learnpython/templates/base.html:51
108-
msgid "Medium flow"
109-
msgstr "Medium поток"
109+
#: learnpython/templates/base.html:44
110+
msgid "Fork us on GitHub"
111+
msgstr "Форкайте нас на GitHub"
110112

111-
#: learnpython/templates/base.html:38 learnpython/templates/base.html:52
112-
msgid "Normal flow"
113-
msgstr "Normal поток"
113+
#: learnpython/templates/base.html:51 learnpython/templates/base.html:64
114+
msgid "Web flow"
115+
msgstr "Web поток"
114116

115-
#: learnpython/templates/base.html:39 learnpython/templates/base.html:53
117+
#: learnpython/templates/base.html:52 learnpython/templates/base.html:65
116118
msgid "Advanced flow"
117119
msgstr "Advanced поток"
118120

121+
#: learnpython/templates/base.html:62
122+
msgid "Learn Python"
123+
msgstr "Learn Python"
124+
119125
#: learnpython/templates/contacts.html:9
120126
msgid "Cannot submit form! Please, fix errors below:"
121127
msgstr "Пожалуйста, исправьте указанные ошибки:"
@@ -140,4 +146,3 @@ msgstr "Вы будете перенаправлены на следующую
140146
#: learnpython/templates/status.html:11
141147
msgid "Click here, if you don't wanna wait"
142148
msgstr "Нажмите здесь, если вы не хотите ждать"
143-

0 commit comments

Comments
 (0)