Skip to content
This repository has been archived by the owner on Jan 27, 2021. It is now read-only.

Commit

Permalink
Merge pull request #109 from hexlet-basics/add_facebook_rates_message…
Browse files Browse the repository at this point in the history 
…_after_all_lesson

Add facebook rates message after all lesson
  • Loading branch information
@PlugIN73
PlugIN73 committed Sep 9, 2019
2 parents 0a750a0 + bb6d732 commit 9c1a5ee
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 42 deletions.
2 changes: 1 addition & 1 deletion services/app/lib/hexlet_basics_web/controllers/lesson_controller.ex
View file
Expand Up @@ -32,7 +32,7 @@ defmodule HexletBasicsWeb.LessonController do
case Repo.one(next_lesson_query) || Repo.one(next_not_finished_lesson_query) do
nil ->
conn
|> put_flash(:info, gettext("You did it!"))
|> put_flash(:info, gettext("You did it! We hope you enjoyed the training. Please rate Code Basics: <a href=https://www.facebook.com/pg/codebasicsru/reviews/ target=_blank>Share your impressions</a> on Facebook."))
|> redirect(to: Routes.page_path(conn, :index))

next_lesson ->
Expand Down
2 changes: 1 addition & 1 deletion services/app/lib/hexlet_basics_web/templates/layout/app.html.slime
View file
Expand Up @@ -41,7 +41,7 @@ html.h-100 lang="#{@locale}"
- message = get_flash(@conn, name)
= if message do
.alert class=" alert-dismissible fade show alert-#{alert_name_by_flash(name)}" role="alert"
= message
== message
button.close type="button" data-dismiss="alert" aria-label="Close"
span aria-hidden="true" &times;

Expand Down
25 changes: 13 additions & 12 deletions services/app/priv/gettext/default.pot
View file
Expand Up @@ -20,7 +20,8 @@ msgstr ""
msgid "Start"
msgstr ""

#: lib/hexlet_basics_web/controllers/auth_controller.ex:15
#: lib/hexlet_basics_web/controllers/auth_controller.ex:16
#: lib/hexlet_basics_web/controllers/auth_controller.ex:45
msgid "Failed to authenticate."
msgstr ""

Expand All @@ -42,15 +43,15 @@ msgstr ""
msgid "Sign Out"
msgstr ""

#: lib/hexlet_basics_web/controllers/auth_controller.ex:34
#: lib/hexlet_basics_web/controllers/auth_controller.ex:40
msgid "Successfully authenticated."
msgstr ""

#: lib/hexlet_basics_web/controllers/lesson_controller.ex:35
msgid "You did it!"
msgstr ""

#: lib/hexlet_basics_web/controllers/session_controller.ex:22
#: lib/hexlet_basics_web/controllers/session_controller.ex:23
msgid "You have been logged out!"
msgstr ""

Expand Down Expand Up @@ -451,12 +452,12 @@ msgstr ""
#: lib/hexlet_basics_web/controllers/password_controller.ex:20
#: lib/hexlet_basics_web/controllers/password_controller.ex:36
#: lib/hexlet_basics_web/controllers/remind_password_controller.ex:34
#: lib/hexlet_basics_web/controllers/user_controller.ex:63
#: lib/hexlet_basics_web/controllers/user_controller.ex:68
msgid "User not found"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/session_controller.ex:28
#: lib/hexlet_basics_web/controllers/session_controller.ex:29
msgid "Signed in successfully."
msgstr ""

Expand All @@ -466,17 +467,17 @@ msgid "Change Password"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/user_controller.ex:33
#: lib/hexlet_basics_web/controllers/user_controller.ex:37
msgid "User created! Check your email for confirm registration"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/user_controller.ex:58
#: lib/hexlet_basics_web/controllers/user_controller.ex:63
msgid "Registration confirmed! Welcome!"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/session_controller.ex:35
#: lib/hexlet_basics_web/controllers/session_controller.ex:36
msgid "There was a problem with your email/password"
msgstr ""

Expand All @@ -487,16 +488,16 @@ msgid "Switch language to"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/auth_controller.ex:25
#: lib/hexlet_basics_web/controllers/auth_controller.ex:29
msgid "Please confirm the email in your %{provider} account, then try again"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/templates/shared/social_sign_in.html.slime:1
msgid "Sign In Facebook"
msgid "Sign In Github"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/templates/shared/social_sign_in.html.slime:1
msgid "Sign In Github"
#: lib/hexlet_basics_web/controllers/lesson_controller.ex:35
msgid "You did it! We hope you enjoyed the training. Please rate Code Basics: <a href=https://www.facebook.com/pg/codebasicsru/reviews/ target=_blank>Share your impressions</a> on Facebook."
msgstr ""
29 changes: 15 additions & 14 deletions services/app/priv/gettext/en/LC_MESSAGES/default.po
View file
Expand Up @@ -20,7 +20,8 @@ msgstr ""
msgid "Start"
msgstr ""

#: lib/hexlet_basics_web/controllers/auth_controller.ex:15
#: lib/hexlet_basics_web/controllers/auth_controller.ex:16
#: lib/hexlet_basics_web/controllers/auth_controller.ex:45
msgid "Failed to authenticate."
msgstr ""

Expand All @@ -42,15 +43,15 @@ msgstr ""
msgid "Sign Out"
msgstr ""

#: lib/hexlet_basics_web/controllers/auth_controller.ex:34
#: lib/hexlet_basics_web/controllers/auth_controller.ex:40
msgid "Successfully authenticated."
msgstr ""

#: lib/hexlet_basics_web/controllers/lesson_controller.ex:35
msgid "You did it!"
msgstr ""

#: lib/hexlet_basics_web/controllers/session_controller.ex:22
#: lib/hexlet_basics_web/controllers/session_controller.ex:23
msgid "You have been logged out!"
msgstr ""

Expand Down Expand Up @@ -451,12 +452,12 @@ msgstr ""
#: lib/hexlet_basics_web/controllers/password_controller.ex:20
#: lib/hexlet_basics_web/controllers/password_controller.ex:36
#: lib/hexlet_basics_web/controllers/remind_password_controller.ex:34
#: lib/hexlet_basics_web/controllers/user_controller.ex:63
#: lib/hexlet_basics_web/controllers/user_controller.ex:68
msgid "User not found"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/session_controller.ex:28
#: lib/hexlet_basics_web/controllers/session_controller.ex:29
msgid "Signed in successfully."
msgstr ""

Expand All @@ -466,17 +467,17 @@ msgid "Change Password"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/user_controller.ex:33
#: lib/hexlet_basics_web/controllers/user_controller.ex:37
msgid "User created! Check your email for confirm registration"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/user_controller.ex:58
#: lib/hexlet_basics_web/controllers/user_controller.ex:63
msgid "Registration confirmed! Welcome!"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/session_controller.ex:35
#: lib/hexlet_basics_web/controllers/session_controller.ex:36
msgid "There was a problem with your email/password"
msgstr ""

Expand All @@ -487,16 +488,16 @@ msgid "Switch language to"
msgstr ""

#, elixir-format
#: lib/hexlet_basics_web/controllers/auth_controller.ex:25
#: lib/hexlet_basics_web/controllers/auth_controller.ex:29
msgid "Please confirm the email in your %{provider} account, then try again"
msgstr ""

#, elixir-format, fuzzy
#, elixir-format
#: lib/hexlet_basics_web/templates/shared/social_sign_in.html.slime:1
msgid "Sign In Facebook"
msgid "Sign In Github"
msgstr ""

#, elixir-format, fuzzy
#: lib/hexlet_basics_web/templates/shared/social_sign_in.html.slime:1
msgid "Sign In Github"
#, elixir-format
#: lib/hexlet_basics_web/controllers/lesson_controller.ex:35
msgid "You did it! We hope you enjoyed the training. Please rate Code Basics: <a href=https://www.facebook.com/pg/codebasicsru/reviews/ target=_blank>Share your impressions</a> on Facebook."
msgstr ""
29 changes: 15 additions & 14 deletions services/app/priv/gettext/ru/LC_MESSAGES/default.po
View file
Expand Up @@ -20,7 +20,8 @@ msgstr ""
msgid "Start"
msgstr "Начать"

#: lib/hexlet_basics_web/controllers/auth_controller.ex:15
#: lib/hexlet_basics_web/controllers/auth_controller.ex:16
#: lib/hexlet_basics_web/controllers/auth_controller.ex:45
msgid "Failed to authenticate."
msgstr "Ошибка аутентификации"

Expand All @@ -42,15 +43,15 @@ msgstr "Войти"
msgid "Sign Out"
msgstr "Выйти"

#: lib/hexlet_basics_web/controllers/auth_controller.ex:34
#: lib/hexlet_basics_web/controllers/auth_controller.ex:40
msgid "Successfully authenticated."
msgstr "Вы авторизовались"

#: lib/hexlet_basics_web/controllers/lesson_controller.ex:35
msgid "You did it!"
msgstr "Вы прошли все доступные упражнения. Скоро появятся новые."

#: lib/hexlet_basics_web/controllers/session_controller.ex:22
#: lib/hexlet_basics_web/controllers/session_controller.ex:23
msgid "You have been logged out!"
msgstr "Вы вышли"

Expand Down Expand Up @@ -451,12 +452,12 @@ msgstr "Обновить Пароль"
#: lib/hexlet_basics_web/controllers/password_controller.ex:20
#: lib/hexlet_basics_web/controllers/password_controller.ex:36
#: lib/hexlet_basics_web/controllers/remind_password_controller.ex:34
#: lib/hexlet_basics_web/controllers/user_controller.ex:63
#: lib/hexlet_basics_web/controllers/user_controller.ex:68
msgid "User not found"
msgstr "Пользователь не найден"

#, elixir-format
#: lib/hexlet_basics_web/controllers/session_controller.ex:28
#: lib/hexlet_basics_web/controllers/session_controller.ex:29
msgid "Signed in successfully."
msgstr "Вы авторизованы"

Expand All @@ -466,17 +467,17 @@ msgid "Change Password"
msgstr "Задать новый пароль"

#, elixir-format
#: lib/hexlet_basics_web/controllers/user_controller.ex:33
#: lib/hexlet_basics_web/controllers/user_controller.ex:37
msgid "User created! Check your email for confirm registration"
msgstr "Пользователь успешно создан! Мы выслали вам на почту письмо со ссылкой. Перейдите по ней чтобы завершить регистрацию и войти"

#, elixir-format
#: lib/hexlet_basics_web/controllers/user_controller.ex:58
#: lib/hexlet_basics_web/controllers/user_controller.ex:63
msgid "Registration confirmed! Welcome!"
msgstr " Ваш e-mail подтвержден, и вы авторизованы. Добро пожаловать!"

#, elixir-format
#: lib/hexlet_basics_web/controllers/session_controller.ex:35
#: lib/hexlet_basics_web/controllers/session_controller.ex:36
msgid "There was a problem with your email/password"
msgstr " Неправильные email/пароль"

Expand All @@ -487,16 +488,16 @@ msgid "Switch language to"
msgstr "Сменить язык на"

#, elixir-format
#: lib/hexlet_basics_web/controllers/auth_controller.ex:25
#: lib/hexlet_basics_web/controllers/auth_controller.ex:29
msgid "Please confirm the email in your %{provider} account, then try again"
msgstr "Пожалуйста, подтвердите email в аккаунте %{provider}, затем повторите попытку "

#, elixir-format
#: lib/hexlet_basics_web/templates/shared/social_sign_in.html.slime:1
msgid "Sign In Facebook"
msgstr "Войти через Facebook"

#, elixir-format
#: lib/hexlet_basics_web/templates/shared/social_sign_in.html.slime:1
msgid "Sign In Github"
msgstr "Войти через Github"

#, elixir-format
#: lib/hexlet_basics_web/controllers/lesson_controller.ex:35
msgid "You did it! We hope you enjoyed the training. Please rate Code Basics: <a href=https://www.facebook.com/pg/codebasicsru/reviews/ target=_blank>Share your impressions</a> on Facebook."
msgstr "Вы прошли все доступные упражнения. Скоро появятся новые. Надеемся, вам понравилось обучение. Пожалуйста, оцените Code Basics: <a href=https://www.facebook.com/pg/codebasicsru/reviews/ target=_blank>поделитесь впечатлениями</a> на Facebook."

0 comments on commit 9c1a5ee

Please sign in to comment.