From 93cb38006b20212090eb3d508ca03d18fcc03118 Mon Sep 17 00:00:00 2001 From: Ilya Y <75578537+ilya-bkv@users.noreply.github.com> Date: Mon, 30 Oct 2023 14:20:33 +0300 Subject: [PATCH] Fix/i18n fix (#286) i18n fix --- public/locales/en/translation.json | 12 ++++++++++-- public/locales/ru/translation.json | 12 ++++++++++-- src/components/Feed/Sidebar/Sidebar.tsx | 4 ++-- src/components/Nav/Header/Header.tsx | 22 +++++++++++----------- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index e0305bd7..0b6965b4 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -90,6 +90,7 @@ "Create gallery": "Create gallery", "Create post": "Create post", "Create video": "Create video", + "Culture": "Culture", "Date of Birth": "Date of Birth", "Decline": "Decline", "Delete": "Delete", @@ -121,6 +122,7 @@ "Enter your new password": "Enter your new password", "Error": "Error", "Everything is ok, please give us your email address": "It's okay, just enter your email address to receive a password reset link.", + "Experience": "Experience", "FAQ": "Tips and suggestions", "Favorite": "Favorites", "Favorite topics": "Favorite topics", @@ -169,6 +171,7 @@ "Independant magazine with an open horizontal cooperation about culture, science and society": "Independant magazine with an open horizontal cooperation about culture, science and society", "Insert footnote": "Insert footnote", "Insert video link": "Insert video link", + "Interview": "Interview", "Introduce": "Introduction", "Invalid email": "Check if your email is correct", "Invalid image URL": "Invalid image URL", @@ -229,6 +232,7 @@ "Our regular contributor": "Our regular contributor", "Paragraphs": "Абзацев", "Participating": "Participating", + "Participation": "Participation", "Partners": "Partners", "Password": "Password", "Password again": "Password again", @@ -247,6 +251,8 @@ "Please enter password": "Please enter a password", "Please enter password again": "Please enter password again", "Please, confirm email": "Please confirm email", + "Podcasts": "Podcasts", + "Poetry": "Poetry", "Popular": "Popular", "Popular authors": "Popular authors", "Principles": "Community principles", @@ -266,6 +272,7 @@ "Remove link": "Remove link", "Reply": "Reply", "Report": "Complain", + "Reports": "Reports", "Required": "Required", "Resend code": "Send confirmation", "Restore password": "Restore password", @@ -289,11 +296,13 @@ "Show table of contents": "Show table of contents", "Slug": "Slug", "Social networks": "Social networks", + "Society": "Society", "Something went wrong, check email and password": "Something went wrong. Check your email and password", "Something went wrong, please try again": "Something went wrong, please try again", "Song lyrics": "Song lyrics...", "Song title": "Song title", "Sorry, this address is already taken, please choose another one.": "Sorry, this address is already taken, please choose another one", + "Special Projects": "Special Projects", "Special projects": "Special projects", "Specify the source and the name of the author": "Specify the source and the name of the author", "Start conversation": "Start a conversation", @@ -316,6 +325,7 @@ "Terms of use": "Site rules", "Text checking": "Text checking", "Thank you": "Thank you", + "Theory": "Theory", "There are unsaved changes in your profile settings. Are you sure you want to leave the page without saving?": "There are unsaved changes in your profile settings. Are you sure you want to leave the page without saving?", "There are unsaved changes in your publishing settings. Are you sure you want to leave the page without saving?": "There are unsaved changes in your publishing settings. Are you sure you want to leave the page without saving?", "This comment has not yet been rated": "This comment has not yet been rated", @@ -379,7 +389,6 @@ "You've reached a non-existed page": "You've reached a non-existed page", "Your email": "Your email", "Your name will appear on your profile page and as your signature in publications, comments and responses.": "Your name will appear on your profile page and as your signature in publications, comments and responses", - "accomplices": "accomplices", "actions": "actions", "add link": "add link", "all topics": "all topics", @@ -403,7 +412,6 @@ "feed": "feed", "follower": "follower", "followersWithCount": "{count} {count, plural, one {follower} other {followers}}", - "general feed": "general tape", "header 1": "header 1", "header 2": "header 2", "header 3": "header 3", diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index b7b19cfb..eaaeb3c2 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -3,7 +3,6 @@ "A short introduction to keep the reader interested": "Добавьте вступление, чтобы заинтересовать читателя", "About": "О себе", "About the project": "О проекте", - "Accomplices": "Соучастники", "Add a few topics so that the reader knows what your content is about and can find it on pages of topics that interest them. Topics can be swapped, the first topic becomes the title": "Добавьте несколько тем, чтобы читатель знал, о чем ваш материал, и мог найти его на страницах интересных ему тем. Темы можно менять местами, первая тема становится заглавной", "Add a link or click plus to embed media": "Добавьте ссылку или нажмите плюс для вставки медиа", "Add an embed widget": "Добавить embed-виджет", @@ -94,6 +93,7 @@ "Create gallery": "Создать галерею", "Create post": "Создать публикацию", "Create video": "Создать видео", + "Culture": "Культура", "Date of Birth": "Дата рождения", "Decline": "Отмена", "Delete": "Удалить", @@ -126,6 +126,7 @@ "Enter your new password": "Введите новый пароль", "Error": "Ошибка", "Everything is ok, please give us your email address": "Ничего страшного, просто укажите свою почту, чтобы получить ссылку для сброса пароля.", + "Experience": "Личный опыт", "FAQ": "Советы и предложения", "Favorite": "Избранное", "Favorite topics": "Избранные темы", @@ -177,6 +178,7 @@ "Independant magazine with an open horizontal cooperation about culture, science and society": "Независимый журнал с открытой горизонтальной редакцией о культуре, науке и обществе", "Insert footnote": "Вставить сноску", "Insert video link": "Вставить ссылку на видео", + "Interview": "Интервью", "Introduce": "Представление", "Invalid email": "Проверьте правильность ввода почты", "Invalid image URL": "Некорректная ссылка на изображение", @@ -240,6 +242,7 @@ "Our regular contributor": "Наш постоянный автор", "Paragraphs": "Абзацев", "Participating": "Участвовать", + "Participation": "Соучастие", "Partners": "Партнёры", "Password": "Пароль", "Password again": "Пароль ещё раз", @@ -258,6 +261,8 @@ "Please enter password": "Пожалуйста, введите пароль", "Please enter password again": "Пожалуйста, введите пароль ещё рез", "Please, confirm email": "Пожалуйста, подтвердите электронную почту", + "Podcasts": "Подкасты", + "Poetry": "Поэзия", "Popular": "Популярное", "Popular authors": "Популярные авторы", "Preview": "Предпросмотр", @@ -282,6 +287,7 @@ "Remove link": "Убрать ссылку", "Reply": "Ответить", "Report": "Пожаловаться", + "Reports": "Репортажи", "Required": "Поле обязательно для заполнения", "Resend code": "Выслать подтверждение", "Restore password": "Восстановить пароль", @@ -307,11 +313,13 @@ "Show table of contents": "Показать главление", "Slug": "Постоянная ссылка", "Social networks": "Социальные сети", + "Society": "Общество", "Something went wrong, check email and password": "Что-то пошло не так. Проверьте адрес электронной почты и пароль", "Something went wrong, please try again": "Что-то пошло не так, попробуйте еще раз", "Song lyrics": "Текст песни...", "Song title": "Название песни", "Sorry, this address is already taken, please choose another one.": "Увы, этот адрес уже занят, выберите другой", + "Special Projects": "Спецпроекты", "Special projects": "Спецпроекты", "Specify the source and the name of the author": "Укажите источник и имя автора", "Start conversation": "Начать беседу", @@ -335,6 +343,7 @@ "Terms of use": "Правила сайта", "Text checking": "Проверка текста", "Thank you": "Благодарности", + "Theory": "Теории", "There are unsaved changes in your profile settings. Are you sure you want to leave the page without saving?": "В настройках вашего профиля есть несохраненные изменения. Уверены, что хотите покинуть страницу без сохранения?", "There are unsaved changes in your publishing settings. Are you sure you want to leave the page without saving?": "В настройках публикации есть несохраненные изменения. Уверены, что хотите покинуть страницу без сохранения?", "This comment has not yet been rated": "Этот комментарий еще пока никто не оценил", @@ -426,7 +435,6 @@ "feed": "лента", "follower": "подписчик", "followersWithCount": "{count} {count, plural, one {подписчик} few {подписчика} other {подписчиков}}", - "general feed": "Общая лента", "header 1": "заголовок 1", "header 2": "заголовок 2", "header 3": "заголовок 3", diff --git a/src/components/Feed/Sidebar/Sidebar.tsx b/src/components/Feed/Sidebar/Sidebar.tsx index 1ae62261..a62441b1 100644 --- a/src/components/Feed/Sidebar/Sidebar.tsx +++ b/src/components/Feed/Sidebar/Sidebar.tsx @@ -38,7 +38,7 @@ export const Sidebar = () => { > - {t('general feed')} + {t('All')} @@ -64,7 +64,7 @@ export const Sidebar = () => { > - {t('Accomplices')} + {t('Participation')} diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx index 00a9b056..7dbe5026 100644 --- a/src/components/Nav/Header/Header.tsx +++ b/src/components/Nav/Header/Header.tsx @@ -406,31 +406,31 @@ export const Header = (props: Props) => { {t('Art')}
  • - Подкасты + {t('Podcasts')}
  • - Спецпроекты + {t('Special Projects')}
  • - #Интервью + #{t('Interview')}
  • - #Репортажи + #{t('Reports')}
  • - #Личный опыт + #{t('Experience')}
  • - #Общество + #{t('Society')}
  • - #Культура + #{t('Culture')}
  • - #Теории + #{t('Theory')}
  • - #Поэзия + #{t('Poetry')}
  • @@ -479,7 +479,7 @@ export const Header = (props: Props) => { - {t('general feed')} + {t('All')}
    • @@ -496,7 +496,7 @@ export const Header = (props: Props) => { - {t('Accomplices')} + {t('Participation')}