Merge pull request #243 from warpc/230-registration_page

[Refs #230] Fix I18n and remove wrong js for registration page
This commit is contained in:
Vladimir Sharshov 2012-02-29 11:23:35 -08:00
commit d3231b5faa
3 changed files with 18 additions and 21 deletions

View File

@ -8,7 +8,6 @@
= javascript_include_tag "login"
- elsif ['registrations', 'passwords'].include?(controller_name) && ['new', 'create'].include?(action_name)
= stylesheet_link_tag "registration"
= javascript_include_tag "registration"
= csrf_meta_tag
%body

View File

@ -617,16 +617,6 @@ en:
platform: Platform
counter: Downloads
notifications:
subjects:
new_comment_notification: New comment to your task
new_issue_notification: New task added to project
new_user_notification: Registered on project «%{ project_name }»
issue_assign_notification: New task assigned
new_commit_comment_notification: New comment to commit
invite_approve_notification: Invitation to ABF
activerecord:
errors:
messages:
too_long:
@ -635,3 +625,12 @@ en:
too_short:
one: "minimum is %{count} character"
other: "minimum is %{count} characters"
notifications:
subjects:
new_comment_notification: New comment to your task
new_issue_notification: New task added to project
new_user_notification: Registered on project «%{ project_name }»
issue_assign_notification: New task assigned
new_commit_comment_notification: New comment to commit
invite_approve_notification: Invitation to ABF

View File

@ -612,16 +612,6 @@ ru:
platform: Архитектура
counter: Закачки
notifications:
subjects:
new_comment_notification: Новый комментарий к Вашей задаче
new_issue_notification: Новая задача добавлена к проекту
new_user_notification: Регистрация на проекте «%{ project_name }»
issue_assign_notification: Вам назначили задачу
new_commit_comment_notification: Новый комментарий к коммиту
invite_approve_notification: Приглашение в ABF
activerecord:
errors:
messages:
too_long:
@ -634,3 +624,12 @@ ru:
few: "не может быть меньше %{count} символов"
many: "не может быть меньше %{count} символов"
other: "не может быть меньше %{count} символа"
notifications:
subjects:
new_comment_notification: Новый комментарий к Вашей задаче
new_issue_notification: Новая задача добавлена к проекту
new_user_notification: Регистрация на проекте «%{ project_name }»
issue_assign_notification: Вам назначили задачу
new_commit_comment_notification: Новый комментарий к коммиту
invite_approve_notification: Приглашение в ABF