mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

places fixes

Browse Source
remotes/origin/search
Alexander Burdeiny 10 years ago
parent 1fb9d259ea
commit 19cae53c1c
6 changed files with 251 additions and 223 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 226
      locale/en/LC_MESSAGES/django.po
  2. 226
      locale/ru/LC_MESSAGES/django.po
  3. 2
      static/participation_landing/js/main.js
  4. 10
      templates/client/includes/catalog_paginator.html
  5. 6
      templates/client/includes/side_places.html
  6. 4
      templates/client/simple_pages/participation_landing.html

226
locale/en/LC_MESSAGES/django.po
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-19 18:27+0000\n"
"POT-Creation-Date: 2016-05-20 07:13+0000\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"
@ -243,8 +243,8 @@ msgstr ""
msgid "Тематика"
msgstr ""
#: accounts/forms.py:314 accounts/models.py:284 article/forms.py:23
#: article/forms.py:159 article/models.py:35 company/forms.py:36
#: accounts/forms.py:314 accounts/models.py:284 article/forms.py:27
#: article/forms.py:159 article/models.py:34 company/forms.py:36
#: company/forms.py:229 company/models.py:39 conference/forms.py:63
#: conference/models.py:63 exposition/forms.py:60 exposition/models.py:72
#: functions/search_forms.py:247 news/forms.py:35 news/models.py:35
@ -428,7 +428,7 @@ msgstr ""
msgid "Вебинары"
msgstr ""
#: accounts/models.py:283 article/forms.py:19 article/forms.py:112
#: accounts/models.py:283 article/forms.py:20 article/forms.py:112
#: article/forms.py:157 article/models.py:33 company/forms.py:33
#: company/forms.py:228 conference/forms.py:54 conference/models.py:61
#: emencia/django/newsletter/admin_forms.py:69
@ -500,38 +500,38 @@ msgstr ""
msgid "Конференции"
msgstr ""
#: article/forms.py:21 company/forms.py:30 expobanner/models.py:43
#: article/forms.py:25 company/forms.py:30 expobanner/models.py:43
#: expobanner/models.py:55 expobanner/models.py:93
msgid "URL"
msgstr ""
#: article/forms.py:22 article/models.py:45
#: article/forms.py:26 article/models.py:44
msgid "Дата публикации"
msgstr ""
#: article/forms.py:24 file/models.py:19 settings/models.py:25
#: article/forms.py:28 file/models.py:19 settings/models.py:25
#: settings/models.py:71
msgid "Лого"
msgstr ""
#: article/forms.py:38 article/forms.py:175 article/models.py:66
#: article/forms.py:42 article/forms.py:175 article/models.py:65
#: expobanner/models.py:26 expobanner/models.py:88 meta/models.py:160
#: news/forms.py:57 news/models.py:41 photologue/forms.py:22
#: photologue/forms.py:54 service/forms.py:51 specialist_catalog/models.py:44
#: templates/admin/article/article_admin_list.html:18
#: templates/admin/specialist/catalog_all.html:11
#: templates/admin/specialist/catalog_all.html:41 theme/forms.py:34
#: theme/forms.py:101 theme/forms.py:178
#: templates/admin/specialist/catalog_all.html:41 theme/forms.py:31
#: theme/forms.py:97
msgid "Заголовок"
msgstr ""
#: article/forms.py:39 article/forms.py:176 article/models.py:67
#: article/forms.py:43 article/forms.py:176 article/models.py:66
#: file/forms.py:20 file/models.py:23 file/models.py:24 news/forms.py:59
#: news/models.py:42
msgid "Превью"
msgstr ""
#: article/forms.py:40 article/forms.py:177 city/forms.py:59 city/models.py:46
#: article/forms.py:44 article/forms.py:177 city/forms.py:59 city/models.py:46
#: company/forms.py:73 conference/forms.py:104 conference/models.py:107
#: country/forms.py:88 exposition/forms.py:114 exposition/models.py:108
#: file/forms.py:36 file/forms.py:111 file/forms.py:189 news/forms.py:60
@ -539,22 +539,21 @@ msgstr ""
#: photologue/forms.py:23 photologue/forms.py:53 photoreport/forms.py:36
#: seminar/forms.py:85 seminar/models.py:85 service/forms.py:52
#: templates/client/city/city.html:94
#: templates/client/country/country.html:108 theme/forms.py:35
#: theme/forms.py:102 theme/forms.py:179 webinar/forms.py:78
#: webinar/models.py:80
#: templates/client/country/country.html:108 theme/forms.py:32
#: theme/forms.py:98 webinar/forms.py:78 webinar/models.py:80
msgid "Описание"
msgstr ""
#: article/forms.py:42 article/forms.py:179 city/forms.py:66
#: article/forms.py:46 article/forms.py:179 city/forms.py:66
#: company/forms.py:79 conference/forms.py:113 country/forms.py:95
#: news/forms.py:62 organiser/forms.py:84 photoreport/forms.py:39
#: place_conference/forms.py:93 place_exposition/forms.py:94
#: seminar/forms.py:90 service/forms.py:55 theme/forms.py:37
#: theme/forms.py:104 translator/forms.py:56 webinar/forms.py:83
#: seminar/forms.py:90 service/forms.py:55 theme/forms.py:34
#: theme/forms.py:100 translator/forms.py:56 webinar/forms.py:83
msgid "Тайтл"
msgstr ""
#: article/forms.py:44 article/forms.py:183 city/forms.py:68
#: article/forms.py:48 article/forms.py:183 city/forms.py:68
#: company/forms.py:83 conference/forms.py:117 country/forms.py:99
#: news/forms.py:66 organiser/forms.py:88 photoreport/forms.py:41
#: place_conference/forms.py:97 place_exposition/forms.py:98
@ -562,7 +561,7 @@ msgstr ""
msgid "Кейвордс"
msgstr ""
#: article/forms.py:46 article/forms.py:181 city/forms.py:70
#: article/forms.py:50 article/forms.py:181 city/forms.py:70
#: company/forms.py:81 conference/forms.py:115 country/forms.py:97
#: news/forms.py:64 organiser/forms.py:86 photoreport/forms.py:44
#: place_conference/forms.py:95 place_exposition/forms.py:96
@ -570,25 +569,25 @@ msgstr ""
msgid "Дескрипшен"
msgstr ""
#: article/forms.py:99 article/models.py:62
#: article/forms.py:99 article/models.py:61
#: templates/admin/article/article_admin_list.html:30
msgid "Черновик"
msgstr ""
#: article/forms.py:110 article/models.py:38 expobanner/forms.py:115
#: article/forms.py:110 article/models.py:37 expobanner/forms.py:115
#: expobanner/forms.py:148 expobanner/forms.py:312
#: import_xls/export_forms.py:170 import_xls/import_forms.py:371
#: news/forms.py:40 theme/models.py:37
msgid "Выставка"
msgstr ""
#: article/forms.py:111 article/models.py:39 expobanner/forms.py:132
#: article/forms.py:111 article/models.py:38 expobanner/forms.py:132
#: expobanner/forms.py:178 import_xls/export_forms.py:171
#: import_xls/import_forms.py:372 news/forms.py:39 theme/models.py:38
msgid "Конференция"
msgstr ""
#: article/forms.py:154 article/models.py:36
#: article/forms.py:154 article/models.py:35
#: templates/admin/article/article_admin_list.html:19
msgid "Автор"
msgstr ""
@ -597,13 +596,13 @@ msgstr ""
msgid "Статья с таким названием уже существует"
msgstr ""
#: article/forms.py:279 article/forms.py:305 article/forms.py:318
#: article/forms.py:279 article/forms.py:306 article/forms.py:320
#: templates/client/wizard/first_step.html:24
msgid "Тематика:"
msgstr ""
#: article/forms.py:281 article/forms.py:297 article/forms.py:310
#: templates/client/wizard/first_step.html:28 theme/models.py:175
#: article/forms.py:281 article/forms.py:297 article/forms.py:312
#: templates/client/wizard/first_step.html:28 theme/models.py:150
msgid "Теги:"
msgstr ""
@ -617,131 +616,127 @@ msgstr ""
msgid "Логотип"
msgstr ""
#: article/models.py:34
msgid "Тематики для блогов"
msgstr ""
#: article/models.py:41 conference/forms.py:82 expobanner/models.py:243
#: article/models.py:40 conference/forms.py:82 expobanner/models.py:243
#: place_conference/models.py:42 service/forms.py:138
#: stats_collector/forms.py:37
#: stats_collector/forms.py:37 theme/forms.py:165
msgid "Тип"
msgstr ""
#: article/models.py:43
#: article/models.py:42
msgid "Позволить коментарии"
msgstr ""
#: article/models.py:46
#: article/models.py:45
msgid "Expires on"
msgstr ""
#: article/models.py:47
#: article/models.py:46
msgid "With Published chosen, won't be shown after this time"
msgstr ""
#: article/models.py:49
#: article/models.py:48
msgid "Show in sitemap"
msgstr ""
#: article/models.py:52
#: article/models.py:51
msgid "Показывать на главной"
msgstr ""
#: article/models.py:56
#: article/models.py:55
msgid "Generate description"
msgstr ""
#: article/models.py:57
#: article/models.py:56
msgid ""
"If checked, the description will be automatically generated from content. "
"Uncheck if you want to manually set a custom description."
msgstr ""
#: article/models.py:68
#: article/models.py:67
msgid "Основной текст"
msgstr ""
#: article/views.py:184 article/views.py:236 conference/views.py:154
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:485
#: support/prod/settings.py:485
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:488
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:488
#: support/prod/settings.py:488
msgid "Январь"
msgstr ""
#: article/views.py:184 article/views.py:236 conference/views.py:154
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:485
#: support/prod/settings.py:485
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:488
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:488
#: support/prod/settings.py:488
msgid "Февраль"
msgstr ""
#: article/views.py:185 article/views.py:237 conference/views.py:155
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:486
#: support/prod/settings.py:486
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:489
#: support/prod/settings.py:489
msgid "Март"
msgstr ""
#: article/views.py:185 article/views.py:237 conference/views.py:155
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:486
#: support/prod/settings.py:486
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:489
#: support/prod/settings.py:489
msgid "Апрель"
msgstr ""
#: article/views.py:186 article/views.py:238 conference/views.py:156
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:487
#: support/prod/settings.py:487
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:490
#: support/prod/settings.py:490
msgid "Май"
msgstr ""
#: article/views.py:186 article/views.py:238 conference/views.py:156
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:487
#: support/prod/settings.py:487
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:490
#: support/prod/settings.py:490
msgid "Июнь"
msgstr ""
#: article/views.py:187 article/views.py:239 conference/views.py:157
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:488
#: support/prod/settings.py:488
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:491
#: support/prod/settings.py:491
msgid "Июль"
msgstr ""
#: article/views.py:187 article/views.py:239 conference/views.py:157
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:488
#: support/prod/settings.py:488
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:491
#: support/prod/settings.py:491
msgid "Август"
msgstr ""
#: article/views.py:188 article/views.py:240 conference/views.py:158
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:489
#: support/prod/settings.py:489
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:492
#: support/prod/settings.py:492
msgid "Сентябрь"
msgstr ""
#: article/views.py:188 article/views.py:240 conference/views.py:158
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:489
#: support/prod/settings.py:489
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:492
#: support/prod/settings.py:492
msgid "Октябрь"
msgstr ""
#: article/views.py:189 article/views.py:241 conference/views.py:159
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:494
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:490
#: support/prod/settings.py:490
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:493
#: support/prod/settings.py:493
msgid "Ноябрь"
msgstr ""
#: article/views.py:189 article/views.py:241 conference/views.py:159
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:494
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:490
#: support/prod/settings.py:490
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:493
#: support/prod/settings.py:493
msgid "Декабрь"
msgstr ""
@ -775,7 +770,7 @@ msgstr ""
#: functions/admin_forms.py:26 organiser/forms.py:75 organiser/models.py:65
#: photoreport/forms.py:35 place_conference/forms.py:86
#: place_exposition/forms.py:86 seminar/forms.py:82 seminar/models.py:83
#: theme/forms.py:33 theme/forms.py:100 theme/forms.py:177 webinar/forms.py:75
#: theme/forms.py:30 theme/forms.py:96 webinar/forms.py:75
#: webinar/models.py:78
msgid "Название"
msgstr ""
@ -3302,19 +3297,19 @@ msgstr ""
msgid "Месяц"
msgstr ""
#: exposition/models.py:26 proj/settings.py:486
#: specialist_catalog/models.py:36 support/dev/settings.py:482
#: support/prod/settings.py:482
#: exposition/models.py:26 proj/settings.py:485
#: specialist_catalog/models.py:36 support/dev/settings.py:485
#: support/prod/settings.py:485
msgid "Специалисты"
msgstr ""
#: exposition/models.py:27 proj/settings.py:486 support/dev/settings.py:482
#: support/prod/settings.py:482
#: exposition/models.py:27 proj/settings.py:485 support/dev/settings.py:485
#: support/prod/settings.py:485
msgid "Специалисты и потребители"
msgstr ""
#: exposition/models.py:28 proj/settings.py:487 support/dev/settings.py:483
#: support/prod/settings.py:483
#: exposition/models.py:28 proj/settings.py:486 support/dev/settings.py:486
#: support/prod/settings.py:486
msgid "Широкая публика"
msgstr ""
@ -3587,11 +3582,11 @@ msgstr ""
msgid "Title"
msgstr ""
#: meta/forms.py:29 service/forms.py:57 theme/forms.py:39 theme/forms.py:106
#: meta/forms.py:29 service/forms.py:57 theme/forms.py:36 theme/forms.py:102
msgid "Description"
msgstr ""
#: meta/forms.py:31 service/forms.py:59 theme/forms.py:41 theme/forms.py:108
#: meta/forms.py:31 service/forms.py:59 theme/forms.py:38 theme/forms.py:104
msgid "Keywords"
msgstr ""
@ -5207,12 +5202,12 @@ msgstr ""
msgid "Delete?"
msgstr ""
#: templates/admin/includes/admin_nav.html:58
#: templates/admin/includes/admin_nav.html:59
#: templates/admin/stats/event_stat.html:26
msgid "Статистика разделов"
msgstr ""
#: templates/admin/includes/admin_nav.html:59
#: templates/admin/includes/admin_nav.html:60
msgid "Статистика событий"
msgstr ""
@ -5997,6 +5992,30 @@ msgstr ""
msgid "В расписание"
msgstr ""
#: templates/client/includes/catalog_paginator.html:8
#: templates/client/includes/search_paginator.html:6
msgid "Показано"
msgstr ""
#: templates/client/includes/catalog_paginator.html:8
#, python-format
msgid "(всего %(page_obj.paginator.count)s позиций)"
msgstr ""
#: templates/client/includes/catalog_paginator.html:11
#: templates/client/includes/catalog_paginator.html:13
#: templates/client/includes/search_paginator.html:9
#: templates/client/includes/search_paginator.html:11
msgid "Предыдущая"
msgstr ""
#: templates/client/includes/catalog_paginator.html:42
#: templates/client/includes/catalog_paginator.html:44
#: templates/client/includes/search_paginator.html:38
#: templates/client/includes/search_paginator.html:40
msgid "Следующая"
msgstr ""
#: templates/client/includes/catalog_search.html:10
msgid "Я ищу:"
msgstr ""
@ -6275,24 +6294,10 @@ msgstr ""
msgid "Указать диапазон дат"
msgstr ""
#: templates/client/includes/search_paginator.html:6
msgid "Показано"
msgstr ""
#: templates/client/includes/search_paginator.html:6
msgid "всего"
msgstr ""
#: templates/client/includes/search_paginator.html:9
#: templates/client/includes/search_paginator.html:11
msgid "Предыдущая"
msgstr ""
#: templates/client/includes/search_paginator.html:38
#: templates/client/includes/search_paginator.html:40
msgid "Следующая"
msgstr ""
#: templates/client/includes/services.html:3
msgid "Наши услуги"
msgstr ""
@ -6321,20 +6326,29 @@ msgid "Участие в выставках"
msgstr ""
#: templates/client/includes/side_confs.html:9
#: templates/client/includes/side_places.html:8
msgid "Конференции в Москве"
msgstr ""
#: templates/client/includes/side_confs.html:10
#: templates/client/includes/side_places.html:9
msgid "Конференции в Петербурге"
msgstr ""
#: templates/client/includes/side_confs.html:11
#: templates/client/includes/side_places.html:10
msgid "Конференции в России"
msgstr ""
#: templates/client/includes/side_places.html:8
msgid "Места в Москве"
msgstr ""
#: templates/client/includes/side_places.html:9
msgid "Места в Петербурге"
msgstr ""
#: templates/client/includes/side_places.html:10
msgid "Места в России"
msgstr ""
#: templates/client/includes/translators_aside.html:8
msgid "Переводчики в Москве"
msgstr ""

226
locale/ru/LC_MESSAGES/django.po
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-05-19 18:27+0000\n"
"POT-Creation-Date: 2016-05-20 07:13+0000\n"
"PO-Revision-Date: 2016-05-19 12:48+0000\n"
"Last-Translator: <bonus05@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -248,8 +248,8 @@ msgstr ""
msgid "Тематика"
msgstr ""
#: accounts/forms.py:314 accounts/models.py:284 article/forms.py:23
#: article/forms.py:159 article/models.py:35 company/forms.py:36
#: accounts/forms.py:314 accounts/models.py:284 article/forms.py:27
#: article/forms.py:159 article/models.py:34 company/forms.py:36
#: company/forms.py:229 company/models.py:39 conference/forms.py:63
#: conference/models.py:63 exposition/forms.py:60 exposition/models.py:72
#: functions/search_forms.py:247 news/forms.py:35 news/models.py:35
@ -433,7 +433,7 @@ msgstr ""
msgid "Вебинары"
msgstr ""
#: accounts/models.py:283 article/forms.py:19 article/forms.py:112
#: accounts/models.py:283 article/forms.py:20 article/forms.py:112
#: article/forms.py:157 article/models.py:33 company/forms.py:33
#: company/forms.py:228 conference/forms.py:54 conference/models.py:61
#: emencia/django/newsletter/admin_forms.py:69
@ -505,38 +505,38 @@ msgstr ""
msgid "Конференции"
msgstr ""
#: article/forms.py:21 company/forms.py:30 expobanner/models.py:43
#: article/forms.py:25 company/forms.py:30 expobanner/models.py:43
#: expobanner/models.py:55 expobanner/models.py:93
msgid "URL"
msgstr ""
#: article/forms.py:22 article/models.py:45
#: article/forms.py:26 article/models.py:44
msgid "Дата публикации"
msgstr ""
#: article/forms.py:24 file/models.py:19 settings/models.py:25
#: article/forms.py:28 file/models.py:19 settings/models.py:25
#: settings/models.py:71
msgid "Лого"
msgstr ""
#: article/forms.py:38 article/forms.py:175 article/models.py:66
#: article/forms.py:42 article/forms.py:175 article/models.py:65
#: expobanner/models.py:26 expobanner/models.py:88 meta/models.py:160
#: news/forms.py:57 news/models.py:41 photologue/forms.py:22
#: photologue/forms.py:54 service/forms.py:51 specialist_catalog/models.py:44
#: templates/admin/article/article_admin_list.html:18
#: templates/admin/specialist/catalog_all.html:11
#: templates/admin/specialist/catalog_all.html:41 theme/forms.py:34
#: theme/forms.py:101 theme/forms.py:178
#: templates/admin/specialist/catalog_all.html:41 theme/forms.py:31
#: theme/forms.py:97
msgid "Заголовок"
msgstr ""
#: article/forms.py:39 article/forms.py:176 article/models.py:67
#: article/forms.py:43 article/forms.py:176 article/models.py:66
#: file/forms.py:20 file/models.py:23 file/models.py:24 news/forms.py:59
#: news/models.py:42
msgid "Превью"
msgstr ""
#: article/forms.py:40 article/forms.py:177 city/forms.py:59 city/models.py:46
#: article/forms.py:44 article/forms.py:177 city/forms.py:59 city/models.py:46
#: company/forms.py:73 conference/forms.py:104 conference/models.py:107
#: country/forms.py:88 exposition/forms.py:114 exposition/models.py:108
#: file/forms.py:36 file/forms.py:111 file/forms.py:189 news/forms.py:60
@ -544,22 +544,21 @@ msgstr ""
#: photologue/forms.py:23 photologue/forms.py:53 photoreport/forms.py:36
#: seminar/forms.py:85 seminar/models.py:85 service/forms.py:52
#: templates/client/city/city.html:94
#: templates/client/country/country.html:108 theme/forms.py:35
#: theme/forms.py:102 theme/forms.py:179 webinar/forms.py:78
#: webinar/models.py:80
#: templates/client/country/country.html:108 theme/forms.py:32
#: theme/forms.py:98 webinar/forms.py:78 webinar/models.py:80
msgid "Описание"
msgstr ""
#: article/forms.py:42 article/forms.py:179 city/forms.py:66
#: article/forms.py:46 article/forms.py:179 city/forms.py:66
#: company/forms.py:79 conference/forms.py:113 country/forms.py:95
#: news/forms.py:62 organiser/forms.py:84 photoreport/forms.py:39
#: place_conference/forms.py:93 place_exposition/forms.py:94
#: seminar/forms.py:90 service/forms.py:55 theme/forms.py:37
#: theme/forms.py:104 translator/forms.py:56 webinar/forms.py:83
#: seminar/forms.py:90 service/forms.py:55 theme/forms.py:34
#: theme/forms.py:100 translator/forms.py:56 webinar/forms.py:83
msgid "Тайтл"
msgstr ""
#: article/forms.py:44 article/forms.py:183 city/forms.py:68
#: article/forms.py:48 article/forms.py:183 city/forms.py:68
#: company/forms.py:83 conference/forms.py:117 country/forms.py:99
#: news/forms.py:66 organiser/forms.py:88 photoreport/forms.py:41
#: place_conference/forms.py:97 place_exposition/forms.py:98
@ -567,7 +566,7 @@ msgstr ""
msgid "Кейвордс"
msgstr ""
#: article/forms.py:46 article/forms.py:181 city/forms.py:70
#: article/forms.py:50 article/forms.py:181 city/forms.py:70
#: company/forms.py:81 conference/forms.py:115 country/forms.py:97
#: news/forms.py:64 organiser/forms.py:86 photoreport/forms.py:44
#: place_conference/forms.py:95 place_exposition/forms.py:96
@ -575,25 +574,25 @@ msgstr ""
msgid "Дескрипшен"
msgstr ""
#: article/forms.py:99 article/models.py:62
#: article/forms.py:99 article/models.py:61
#: templates/admin/article/article_admin_list.html:30
msgid "Черновик"
msgstr ""
#: article/forms.py:110 article/models.py:38 expobanner/forms.py:115
#: article/forms.py:110 article/models.py:37 expobanner/forms.py:115
#: expobanner/forms.py:148 expobanner/forms.py:312
#: import_xls/export_forms.py:170 import_xls/import_forms.py:371
#: news/forms.py:40 theme/models.py:37
msgid "Выставка"
msgstr ""
#: article/forms.py:111 article/models.py:39 expobanner/forms.py:132
#: article/forms.py:111 article/models.py:38 expobanner/forms.py:132
#: expobanner/forms.py:178 import_xls/export_forms.py:171
#: import_xls/import_forms.py:372 news/forms.py:39 theme/models.py:38
msgid "Конференция"
msgstr ""
#: article/forms.py:154 article/models.py:36
#: article/forms.py:154 article/models.py:35
#: templates/admin/article/article_admin_list.html:19
msgid "Автор"
msgstr ""
@ -602,13 +601,13 @@ msgstr ""
msgid "Статья с таким названием уже существует"
msgstr ""
#: article/forms.py:279 article/forms.py:305 article/forms.py:318
#: article/forms.py:279 article/forms.py:306 article/forms.py:320
#: templates/client/wizard/first_step.html:24
msgid "Тематика:"
msgstr ""
#: article/forms.py:281 article/forms.py:297 article/forms.py:310
#: templates/client/wizard/first_step.html:28 theme/models.py:175
#: article/forms.py:281 article/forms.py:297 article/forms.py:312
#: templates/client/wizard/first_step.html:28 theme/models.py:150
msgid "Теги:"
msgstr ""
@ -622,131 +621,127 @@ msgstr ""
msgid "Логотип"
msgstr ""
#: article/models.py:34
msgid "Тематики для блогов"
msgstr ""
#: article/models.py:41 conference/forms.py:82 expobanner/models.py:243
#: article/models.py:40 conference/forms.py:82 expobanner/models.py:243
#: place_conference/models.py:42 service/forms.py:138
#: stats_collector/forms.py:37
#: stats_collector/forms.py:37 theme/forms.py:165
msgid "Тип"
msgstr ""
#: article/models.py:43
#: article/models.py:42
msgid "Позволить коментарии"
msgstr ""
#: article/models.py:46
#: article/models.py:45
msgid "Expires on"
msgstr ""
#: article/models.py:47
#: article/models.py:46
msgid "With Published chosen, won't be shown after this time"
msgstr ""
#: article/models.py:49
#: article/models.py:48
msgid "Show in sitemap"
msgstr ""
#: article/models.py:52
#: article/models.py:51
msgid "Показывать на главной"
msgstr ""
#: article/models.py:56
#: article/models.py:55
msgid "Generate description"
msgstr ""
#: article/models.py:57
#: article/models.py:56
msgid ""
"If checked, the description will be automatically generated from content. "
"Uncheck if you want to manually set a custom description."
msgstr ""
#: article/models.py:68
#: article/models.py:67
msgid "Основной текст"
msgstr ""
#: article/views.py:184 article/views.py:236 conference/views.py:154
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:485
#: support/prod/settings.py:485
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:488
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:488
#: support/prod/settings.py:488
msgid "Январь"
msgstr ""
#: article/views.py:184 article/views.py:236 conference/views.py:154
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:485
#: support/prod/settings.py:485
#: exposition/forms.py:587 exposition/views.py:401 proj/settings.py:488
#: settings/templatetags/tempalte_tags.py:21 support/dev/settings.py:488
#: support/prod/settings.py:488
msgid "Февраль"
msgstr ""
#: article/views.py:185 article/views.py:237 conference/views.py:155
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:486
#: support/prod/settings.py:486
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:489
#: support/prod/settings.py:489
msgid "Март"
msgstr ""
#: article/views.py:185 article/views.py:237 conference/views.py:155
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:486
#: support/prod/settings.py:486
#: exposition/forms.py:587 exposition/views.py:402 proj/settings.py:489
#: settings/templatetags/tempalte_tags.py:22 support/dev/settings.py:489
#: support/prod/settings.py:489
msgid "Апрель"
msgstr ""
#: article/views.py:186 article/views.py:238 conference/views.py:156
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:487
#: support/prod/settings.py:487
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:490
#: support/prod/settings.py:490
msgid "Май"
msgstr ""
#: article/views.py:186 article/views.py:238 conference/views.py:156
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:487
#: support/prod/settings.py:487
#: exposition/forms.py:588 exposition/views.py:403 proj/settings.py:490
#: settings/templatetags/tempalte_tags.py:23 support/dev/settings.py:490
#: support/prod/settings.py:490
msgid "Июнь"
msgstr ""
#: article/views.py:187 article/views.py:239 conference/views.py:157
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:488
#: support/prod/settings.py:488
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:491
#: support/prod/settings.py:491
msgid "Июль"
msgstr ""
#: article/views.py:187 article/views.py:239 conference/views.py:157
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:488
#: support/prod/settings.py:488
#: exposition/forms.py:588 exposition/views.py:404 proj/settings.py:491
#: settings/templatetags/tempalte_tags.py:24 support/dev/settings.py:491
#: support/prod/settings.py:491
msgid "Август"
msgstr ""
#: article/views.py:188 article/views.py:240 conference/views.py:158
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:489
#: support/prod/settings.py:489
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:492
#: support/prod/settings.py:492
msgid "Сентябрь"
msgstr ""
#: article/views.py:188 article/views.py:240 conference/views.py:158
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:489
#: support/prod/settings.py:489
#: exposition/forms.py:589 exposition/views.py:405 proj/settings.py:492
#: settings/templatetags/tempalte_tags.py:25 support/dev/settings.py:492
#: support/prod/settings.py:492
msgid "Октябрь"
msgstr ""
#: article/views.py:189 article/views.py:241 conference/views.py:159
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:494
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:490
#: support/prod/settings.py:490
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:493
#: support/prod/settings.py:493
msgid "Ноябрь"
msgstr ""
#: article/views.py:189 article/views.py:241 conference/views.py:159
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:494
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:490
#: support/prod/settings.py:490
#: exposition/forms.py:589 exposition/views.py:406 proj/settings.py:493
#: settings/templatetags/tempalte_tags.py:26 support/dev/settings.py:493
#: support/prod/settings.py:493
msgid "Декабрь"
msgstr ""
@ -780,7 +775,7 @@ msgstr ""
#: functions/admin_forms.py:26 organiser/forms.py:75 organiser/models.py:65
#: photoreport/forms.py:35 place_conference/forms.py:86
#: place_exposition/forms.py:86 seminar/forms.py:82 seminar/models.py:83
#: theme/forms.py:33 theme/forms.py:100 theme/forms.py:177 webinar/forms.py:75
#: theme/forms.py:30 theme/forms.py:96 webinar/forms.py:75
#: webinar/models.py:78
msgid "Название"
msgstr ""
@ -3322,19 +3317,19 @@ msgstr ""
msgid "Месяц"
msgstr ""
#: exposition/models.py:26 proj/settings.py:486
#: specialist_catalog/models.py:36 support/dev/settings.py:482
#: support/prod/settings.py:482
#: exposition/models.py:26 proj/settings.py:485
#: specialist_catalog/models.py:36 support/dev/settings.py:485
#: support/prod/settings.py:485
msgid "Специалисты"
msgstr ""
#: exposition/models.py:27 proj/settings.py:486 support/dev/settings.py:482
#: support/prod/settings.py:482
#: exposition/models.py:27 proj/settings.py:485 support/dev/settings.py:485
#: support/prod/settings.py:485
msgid "Специалисты и потребители"
msgstr ""
#: exposition/models.py:28 proj/settings.py:487 support/dev/settings.py:483
#: support/prod/settings.py:483
#: exposition/models.py:28 proj/settings.py:486 support/dev/settings.py:486
#: support/prod/settings.py:486
msgid "Широкая публика"
msgstr ""
@ -3610,11 +3605,11 @@ msgstr ""
msgid "Title"
msgstr ""
#: meta/forms.py:29 service/forms.py:57 theme/forms.py:39 theme/forms.py:106
#: meta/forms.py:29 service/forms.py:57 theme/forms.py:36 theme/forms.py:102
msgid "Description"
msgstr ""
#: meta/forms.py:31 service/forms.py:59 theme/forms.py:41 theme/forms.py:108
#: meta/forms.py:31 service/forms.py:59 theme/forms.py:38 theme/forms.py:104
msgid "Keywords"
msgstr ""
@ -5235,12 +5230,12 @@ msgstr ""
msgid "Delete?"
msgstr ""
#: templates/admin/includes/admin_nav.html:58
#: templates/admin/includes/admin_nav.html:59
#: templates/admin/stats/event_stat.html:26
msgid "Статистика разделов"
msgstr ""
#: templates/admin/includes/admin_nav.html:59
#: templates/admin/includes/admin_nav.html:60
msgid "Статистика событий"
msgstr ""
@ -6025,6 +6020,30 @@ msgstr ""
msgid "В расписание"
msgstr ""
#: templates/client/includes/catalog_paginator.html:8
#: templates/client/includes/search_paginator.html:6
msgid "Показано"
msgstr ""
#: templates/client/includes/catalog_paginator.html:8
#, python-format
msgid "(всего %(page_obj.paginator.count)s позиций)"
msgstr ""
#: templates/client/includes/catalog_paginator.html:11
#: templates/client/includes/catalog_paginator.html:13
#: templates/client/includes/search_paginator.html:9
#: templates/client/includes/search_paginator.html:11
msgid "Предыдущая"
msgstr ""
#: templates/client/includes/catalog_paginator.html:42
#: templates/client/includes/catalog_paginator.html:44
#: templates/client/includes/search_paginator.html:38
#: templates/client/includes/search_paginator.html:40
msgid "Следующая"
msgstr ""
#: templates/client/includes/catalog_search.html:10
msgid "Я ищу:"
msgstr ""
@ -6303,24 +6322,10 @@ msgstr ""
msgid "Указать диапазон дат"
msgstr ""
#: templates/client/includes/search_paginator.html:6
msgid "Показано"
msgstr ""
#: templates/client/includes/search_paginator.html:6
msgid "всего"
msgstr ""
#: templates/client/includes/search_paginator.html:9
#: templates/client/includes/search_paginator.html:11
msgid "Предыдущая"
msgstr ""
#: templates/client/includes/search_paginator.html:38
#: templates/client/includes/search_paginator.html:40
msgid "Следующая"
msgstr ""
#: templates/client/includes/services.html:3
msgid "Наши услуги"
msgstr ""
@ -6349,20 +6354,29 @@ msgid "Участие в выставках"
msgstr ""
#: templates/client/includes/side_confs.html:9
#: templates/client/includes/side_places.html:8
msgid "Конференции в Москве"
msgstr ""
#: templates/client/includes/side_confs.html:10
#: templates/client/includes/side_places.html:9
msgid "Конференции в Петербурге"
msgstr ""
#: templates/client/includes/side_confs.html:11
#: templates/client/includes/side_places.html:10
msgid "Конференции в России"
msgstr ""
#: templates/client/includes/side_places.html:8
msgid "Места в Москве"
msgstr ""
#: templates/client/includes/side_places.html:9
msgid "Места в Петербурге"
msgstr ""
#: templates/client/includes/side_places.html:10
msgid "Места в России"
msgstr ""
#: templates/client/includes/translators_aside.html:8
msgid "Переводчики в Москве"
msgstr ""

2
static/participation_landing/js/main.js
Unescape View File

@ -41,7 +41,7 @@ $(function(){
})
$(document).ready(function(){
$("form#advertise").on("submit", function(e){
$("form#form_request").on("submit", function(e){
e.preventDefault();
var $form = $(this),
url = $form.attr("action"),

10
templates/client/includes/catalog_paginator.html
Unescape View File

@ -5,12 +5,12 @@
{% if page_obj.paginator.num_pages > 1 %}
{% with path=request.path|without_page %}
<div class="pagination clearfix">
<div class="pg-info"> Показано {{ page_obj.start_index }} - {{ page_obj.end_index }} <i>(всего {{ page_obj.paginator.count }} позиций)</i></div>
<div class="pg-info"> {% trans "Показано" %} {{ page_obj.start_index }} - {{ page_obj.end_index }} <i>{% blocktrans %}(всего {{ page_obj.paginator.count }} позиций){% endblocktrans %}</i></div>
<div class="pg-body">
{% if page_obj.has_previous %}
<a class="pg-prev" href="{{ path }}page/{{ page_obj.previous_page_number }}/{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}">Предыдущая</a>
<a class="pg-prev" href="{{ path }}page/{{ page_obj.previous_page_number }}/{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}">{% trans "Предыдущая" %}</a>
{% else %}
<a class="pg-prev disabled" href="#">Предыдущая</a>
<a class="pg-prev disabled" href="#">{% trans "Предыдущая" %}</a>
{% endif %}
<ul>
@ -39,9 +39,9 @@
</ul>
{% if page_obj.has_next %}
<a class="pg-next" href="{{ path }}page/{{ page_obj.next_page_number }}/{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}">Следующая</a>
<a class="pg-next" href="{{ path }}page/{{ page_obj.next_page_number }}/{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}">{% trans "Следующая" %}</a>
{% else %}
<a class="pg-next disabled" href="#">Следующая</a>
<a class="pg-next disabled" href="#">{% trans "Следующая" %}</a>
{% endif %}
</div>

6
templates/client/includes/side_places.html
Unescape View File

@ -5,9 +5,9 @@
<ul>
<li><a href="/places/country/">{% trans 'По странам' %}</a></li>
<li><a href="/places/city/">{% trans 'По городам' %}</a></li>
<li><a href="/places/city/moscow/">{% trans 'Конференции в Москве' %}</a></li>
<li><a href="/places/city/saint-petersburg/">{% trans 'Конференции в Петербурге' %}</a></li>
<li><a href="/places/country/russia/">{% trans 'Конференции в России' %}</a></li>
<li><a href="/places/city/moscow/">{% trans 'Места в Москве' %}</a></li>
<li><a href="/places/city/saint-petersburg/">{% trans 'Места в Петербурге' %}</a></li>
<li><a href="/places/country/russia/">{% trans 'Места в России' %}</a></li>
</ul>
</nav>
</div>

4
templates/client/simple_pages/participation_landing.html
Unescape View File

@ -316,7 +316,7 @@
<div class="modal" id="modal_presentation">
<h2>{% trans "Запросить презентацию" %}</h2>
<h3>{% trans "Отправьте заявку и мы пришлем Вам нашу презентацию!" %}</h3>
<form action="." id="advertise" method="POST">
<form action="." id="form_request" method="POST">
{% csrf_token %}
<input type="hidden" name="event" value="лендинг - Запросить презентацию">
{# <input type="text" name="person_inf" placeholder="{% trans "Ваше имя" %}"> #}
@ -332,7 +332,7 @@
<div class="modal" id="modal_request">
<h2>{% trans "Отправить запрос" %}</h2>
<h3>{% trans "Оставьте свои контакты, и мы оперативно свяжемся с Вами для обсуждения деталей!" %}</h3>
<form action="." id="advertise" method="POST">
<form action="." id="form_request" method="POST">
{% csrf_token %}
<input type="hidden" name="event" value="лендинг - Отправить запрос">
{{ form.person_inf }}

Write Preview
Loading…
Cancel
Save