From bb6d7321c98955aa5c05e654a41a9cc3b3f50f98 Mon Sep 17 00:00:00 2001 From: Nikita Naumenko Date: Sat, 7 Sep 2019 10:01:08 +0000 Subject: [PATCH] Add facebook rates message after all lesson --- .../controllers/lesson_controller.ex | 2 +- .../templates/layout/app.html.slime | 2 +- services/app/priv/gettext/default.pot | 25 ++++++++-------- .../priv/gettext/en/LC_MESSAGES/default.po | 29 ++++++++++--------- .../priv/gettext/ru/LC_MESSAGES/default.po | 29 ++++++++++--------- 5 files changed, 45 insertions(+), 42 deletions(-) diff --git a/services/app/lib/hexlet_basics_web/controllers/lesson_controller.ex b/services/app/lib/hexlet_basics_web/controllers/lesson_controller.ex index e183427..db8aed1 100644 --- a/services/app/lib/hexlet_basics_web/controllers/lesson_controller.ex +++ b/services/app/lib/hexlet_basics_web/controllers/lesson_controller.ex @@ -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: Share your impressions on Facebook.")) |> redirect(to: Routes.page_path(conn, :index)) next_lesson -> diff --git a/services/app/lib/hexlet_basics_web/templates/layout/app.html.slime b/services/app/lib/hexlet_basics_web/templates/layout/app.html.slime index da40f3a..52e9e57 100644 --- a/services/app/lib/hexlet_basics_web/templates/layout/app.html.slime +++ b/services/app/lib/hexlet_basics_web/templates/layout/app.html.slime @@ -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" × diff --git a/services/app/priv/gettext/default.pot b/services/app/priv/gettext/default.pot index 2dcef82..857558c 100644 --- a/services/app/priv/gettext/default.pot +++ b/services/app/priv/gettext/default.pot @@ -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 "" @@ -42,7 +43,7 @@ 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 "" @@ -50,7 +51,7 @@ msgstr "" 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 "" @@ -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 "" @@ -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 "" @@ -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: Share your impressions on Facebook." msgstr "" diff --git a/services/app/priv/gettext/en/LC_MESSAGES/default.po b/services/app/priv/gettext/en/LC_MESSAGES/default.po index f3e0a6c..0c1c8d6 100644 --- a/services/app/priv/gettext/en/LC_MESSAGES/default.po +++ b/services/app/priv/gettext/en/LC_MESSAGES/default.po @@ -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 "" @@ -42,7 +43,7 @@ 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 "" @@ -50,7 +51,7 @@ msgstr "" 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 "" @@ -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 "" @@ -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 "" @@ -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: Share your impressions on Facebook." msgstr "" diff --git a/services/app/priv/gettext/ru/LC_MESSAGES/default.po b/services/app/priv/gettext/ru/LC_MESSAGES/default.po index 73045aa..4f69cee 100644 --- a/services/app/priv/gettext/ru/LC_MESSAGES/default.po +++ b/services/app/priv/gettext/ru/LC_MESSAGES/default.po @@ -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 "Ошибка аутентификации" @@ -42,7 +43,7 @@ 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 "Вы авторизовались" @@ -50,7 +51,7 @@ msgstr "Вы авторизовались" 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 "Вы вышли" @@ -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 "Вы авторизованы" @@ -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/пароль" @@ -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: Share your impressions on Facebook." +msgstr "Вы прошли все доступные упражнения. Скоро появятся новые. Надеемся, вам понравилось обучение. Пожалуйста, оцените Code Basics: поделитесь впечатлениями на Facebook."