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.

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

v. 0.3.0 - Russian translation #35

Merged
merged 29 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
77e7117
feat:choose locale
Nov 4, 2023
24c6b4d
feat: header and settings for i18n
Dec 9, 2023
b8f7a03
feat: home page translate and fix test
Dec 9, 2023
46b9b45
feat: translate froms
Dec 9, 2023
8e7b8d9
feat: loading ru text
Dec 9, 2023
889dfcd
feat: change text and score by lang
Dec 10, 2023
7a08815
feat: keyboard change by language
Dec 10, 2023
a5634c2
feat: translate score
Dec 10, 2023
0225d0c
feat: lang ssave for score in firebase and print in userScore table
Dec 10, 2023
86debbb
fix: no reset score in custom mode
Dec 10, 2023
5066e01
feat: translate userScore table
Dec 10, 2023
a9b6e54
feat: languages save in local storage
Dec 10, 2023
29831ca
feat: translate sidebar
Dec 10, 2023
d5f285a
faet: link in sidebar is glow
Dec 10, 2023
b0e2435
feat: translate userScore table no data
Dec 10, 2023
c7d2095
fix: userScore table vertical scroll
Dec 10, 2023
a074ded
feat: securyty page translate
Dec 10, 2023
135a53e
feat: translate toast messages
Dec 10, 2023
9fd67dc
fix: check rus keyboard layout
Dec 10, 2023
7e7b285
feat: translate custom mode
Dec 10, 2023
bd26010
fix: keyboard layout ru
Dec 10, 2023
c14f60f
fix: delete logs and fix char ё
Dec 11, 2023
22e134a
feat: logs for dev mode
Dec 11, 2023
4772da4
feat: fix ru typing
Dec 11, 2023
b8acc50
docs: add desc for translate in README
Dec 13, 2023
4d1eaaf
fix: margin for home, game pages
Dec 13, 2023
bf606b8
fix: test for components with locale
Dec 13, 2023
4cd26a9
docs: add test and DevOps in README
Dec 13, 2023
804bb2d
Merge pull request #34 from Ra3d0r/feature/locale
Ra3d0r Dec 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions @types/i18next.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import 'i18next';

import langEn from '../locales/en/translation.json';

declare module 'i18next' {
interface CustomTypeOptions {
resources: {
translation: typeof langEn;
};
defaultNS: 'translation';
ns: ['translation'];
}
}
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,18 @@ Frontend:
- PostCSS
- Twin.macro
- Flowbite
- i18next

Backend:
- Firebase

Test:
- Jest
- testing-library-react

DevOps:
- CI/CD (Github actions, Vercel)

Bundle:
- Webpack

Expand All @@ -51,12 +59,16 @@ Others:
3. Manual deletion of previously written characters
4. Calculation of input results in real time
5. Saving the result of text typing after entering the last character in the text for authorized users.
6. Translate for Russian and English


Text for mode:
1. EN
- easy: https://type.fit/api/quotes
- normal: https://dummyjson.com/posts
- hard: https://api.api-ninjas.com/v1/exercises
2. RU
- https://api.anilibria.tv/v2


<a name="init" ><h3 style="text-align: center">Project Launch</h3></a>
Expand Down
65 changes: 65 additions & 0 deletions locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"Choose a <1>game</1> mode": "Choose a <1>game</1> mode",
"login": "Login",
"playButton": "Play",
"titleSignIn": "Sign in to your account",
"forgotPassword": "Forgot password?",
"notHaveAccount": "Don't have an account?",
"register": "Sign up",
"email": "Email",
"password": "Password",
"signIn": "Sign in",
"rememberMe": "Remember me",
"confirmPassword": "Confirm password",
"createAccount": "Create an account",
"acceptTerms": "I accept the",
"termsAndConditions": "Terms and Conditions",
"confirmConditions": "You must accept the terms and conditions",
"twoPasswordNotMatch": "Passwords do not match",
"fillFields": "Fill in this field",
"passwordLength": "Password must contain at least 6 characters",
"loginLength": "Login must contain at least 3 characters",
"emailError": "Invalid email",
"alreadyHaveAccount": "Already have an account?",
"submit": "Submit",
"enterEmail": "Enter your account email",
"resetPassword": "Reset password",
"changeEmail": "Change email",
"changeLogin": "Change login",
"changePassword": "Change password",
"titleResetPassword": "Reset password by email",
"accuracy": "Accuracy",
"correctness": "Correctness",
"time": "Time",
"totalChars": "Total chars",
"typos": "Typos",
"lang": "Lang",
"action": "Action",
"dateOfPlay": "Date of play",
"remove": "Remove",
"easy": "Easy",
"normal": "Normal",
"hard": "Hard",
"custom": "Custom",
"page": "Page",
"of": "of",
"next": "Next",
"prev": "Previos",
"home": "Home",
"overview": "Overview",
"security": "Security",
"signOut": "Sign out",
"noData": "No data",
"signOutMessage": "Sign out successful!",
"emailMessage": "Email changed",
"loginMessage": "Login changed",
"passwordMessage": "Password changed",
"verifyMessage": "Verification email sent",
"resetPasswordMessage": "Reset password email sent",
"changeKeyboard": "Change the keyboard layout",
"addText": "Add text",
"customText": "Enter your text",
"enterText": "Enter text",
"cancel": "Cancel",
"writeHere": "Write your text here..."
}
65 changes: 65 additions & 0 deletions locales/ru/translation.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"Choose a <1>game</1> mode": "Выберите <1>режим</1> игры",
"login": "Логин",
"playButton": "Играть",
"titleSignIn": "Вход в учетную запись",
"forgotPassword": "Забыли пароль?",
"notHaveAccount": "Ещё не зарегистрированы?",
"register": "Зарегестрироваться",
"email": "Электронная почта",
"password": "Пароль",
"signIn": "Войти",
"rememberMe": "Запомнить меня",
"confirmPassword": "Подтвердите пароль",
"createAccount": "Создать аккаунт",
"acceptTerms": "Я принимаю",
"termsAndConditions": "Условия и положения",
"confirmConditions": "Вы должны принять условия и положения",
"twoPasswordNotMatch": "Пароли не совпадают",
"fillFields": "Заполните это поле",
"passwordLength": "Пароль должен содержать не менее 6 символов",
"loginLength": "Логин должен содержать не менее 3 символов",
"emailError": "Неправильная почта",
"alreadyHaveAccount": "Уже есть аккаунт?",
"submit": "Отправить",
"enterEmail": "Введите ваш адрес электронной почты",
"resetPassword": "Сбросить пароль",
"changeEmail": "Изменить почту",
"changeLogin": "Изменить логин",
"changePassword": "Изменить пароль",
"titleResetPassword": "Сбросить пароль по почте",
"accuracy": "Точность",
"correctness": "Правильность",
"time": "Время",
"totalChars": "Всего символов",
"typos": "Ошибки",
"lang": "Язык",
"action": "Действие",
"dateOfPlay": "Дата игры",
"remove": "Удалить",
"easy": "Легкий",
"normal": "Нормальный",
"hard": "Сложный",
"custom": "Пользовательский",
"page": "Страница",
"of": "из",
"next": "Следующая",
"prev": "Предыдущая",
"home": "Главная",
"overview": "Статистика",
"security": "Безопастность",
"signOut": "Выйти с учетной записи",
"noData": "Нет данных",
"signOutMessage": "Вы вышли из учетной записи",
"emailMessage": "Почта изменена",
"loginMessage": "Логин изменен",
"passwordMessage": "Пароль изменен",
"verifyMessage": "Письмо с подтверждением отправлено на почту",
"resetPasswordMessage": "Письмо с сбросом пароля отправлено на почту",
"changeKeyboard": "Поменяйте расскладку клавиатуры",
"addText": "Добавить текст",
"customText": "Введите свой текст",
"enterText": "Введите текст",
"cancel": "Отмена",
"writeHere": "Напишите свой текст здесь..."
}
119 changes: 105 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading