diff --git a/fabfile.py b/fabfile.py index f3621b8f..0237ff20 100644 --- a/fabfile.py +++ b/fabfile.py @@ -138,13 +138,14 @@ def stage4_firstrun(): call_state('stop') run('git fetch') run('git checkout stage4') - run('git checkout -- proj/settings.py') + # run('git checkout -- proj/settings.py') pull(with_configs=True) run('python manage.py syncdb') ticket1374() ticket1393() ticket1392() ticket1384() + ticket1395() ticket1384_p1() ticket1384_p2() t1443() @@ -195,6 +196,7 @@ def ticket1384_p2(): with cd(REMOTE_HOME_DIR): run('python manage.py check_translation') + @ticket def t1443(): with cd(REMOTE_HOME_DIR): diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html index ade96a13..c55714a7 100644 --- a/templates/client/includes/event_steps.html +++ b/templates/client/includes/event_steps.html @@ -6,7 +6,7 @@
  • {% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}
    {% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %}