Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix previous conflict resolving #295

Merged
merged 1 commit into from Jul 6, 2023
Merged

Fix previous conflict resolving #295

merged 1 commit into from Jul 6, 2023

Conversation

faciledictu
Copy link
Contributor

  1. Возвращает частично потерянные изменения из ПР Fix signIn error message #286 и Fix SignUp form hints about the login or email used #290
  2. Удаляет дубликаты сообщений в русской локали и переименовывает некоторые ключи (correctEmail в incorrectEmail)
  3. Убирает ненужный вызов функции t из i18n в файле со схемами валидации

@fey fey requested a review from dzencot July 4, 2023 13:05
@faciledictu faciledictu mentioned this pull request Jul 4, 2023
Closed
@dzencot dzencot merged commit 2704eaa into hexlet-rus:main Jul 6, 2023
2 checks passed
@faciledictu faciledictu deleted the fix-previous-resolving branch August 17, 2023 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dzencot dzencot Awaiting requested review from dzencot

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@faciledictu @dzencot