From fc8d48436af061481ef2617be2ea57f05d8d9f30 Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 6 Jun 2024 12:27:49 +0300 Subject: [PATCH] topic-profile-fixed --- package.json | 6 +- public/locales/en/translation.json | 77 ++++++++++--------- public/locales/ru/translation.json | 73 +++++++++--------- src/components/Article/FullArticle.tsx | 2 +- .../Author/AuthorBadge/AuthorBadge.tsx | 2 +- src/components/Topic/Full.tsx | 2 +- .../Topic/TopicBadge/TopicBadge.tsx | 2 +- src/components/Views/Topic.tsx | 25 +++--- tests/basic-routes.spec.ts | 2 +- 9 files changed, 95 insertions(+), 96 deletions(-) diff --git a/package.json b/package.json index 8af2d8bc..8a919b87 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,5 @@ "y-prosemirror": "1.2.5", "yjs": "13.6.15" }, - "trustedDependencies": [ - "@biomejs/biome" - ] -} \ No newline at end of file + "trustedDependencies": ["@biomejs/biome"] +} diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index e3431ece..048d886c 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -15,8 +15,8 @@ "Add image": "Add image", "Add images": "Add images", "Add intro": "Add intro", - "add link": "add link", "Add link": "Add link", + "add link": "add link", "Add rule": "Add rule", "Add signature": "Add signature", "Add subtitle": "Add subtitle", @@ -30,8 +30,8 @@ "All articles": "All articles", "All authors": "All authors", "All posts": "All posts", - "all topics": "all topics", "All topics": "All topics", + "all topics": "all topics", "Almost done! Check your email.": "Almost done! Just checking your email.", "and some more authors": "{restUsersCount, plural, =0 {} one { and one more user} other { and more {restUsersCount} users}}", "Are you sure you want to delete this comment?": "Are you sure you want to delete this comment?", @@ -42,11 +42,10 @@ "Artist": "Artist", "Artworks": "Artworks", "Audio": "Audio", - "author": "author", "Author": "Author", - "authors": "authors", + "author": "author", "Authors": "Authors", - "some authors": "{count} {count, plural, one {author} other {authors}}", + "authors": "authors", "Autotypograph": "Autotypograph", "Back": "Back", "Back to editor": "Back to editor", @@ -54,12 +53,12 @@ "back to menu": "back to menu", "Be the first to rate": "Be the first to rate", "Become an author": "Become an author", - "bold": "bold", "Block rules": "За что можно получить бан", "Bold": "Bold", + "bold": "bold", "Bookmarked": "Saved", - "bookmarks": "bookmarks", "Bookmarks": "Bookmarks", + "bookmarks": "bookmarks", "Bullet list": "Bullet list", "By alphabet": "By alphabet", "By authors": "By authors", @@ -76,8 +75,8 @@ "Can make any changes, accept or reject suggestions, and share access with others": "Can make any changes, accept or reject suggestions, and share access with others", "Can offer edits and comments, but cannot edit the post or share access with others": "Can offer edits and comments, but cannot edit the post or share access with others", "Can write and edit text directly, and accept or reject suggestions from others": "Can write and edit text directly, and accept or reject suggestions from others", - "cancel": "cancel", "Cancel": "Cancel", + "cancel": "cancel", "Cancel changes": "Cancel changes", "Change password": "Change password", "Characters": "Знаков", @@ -89,8 +88,8 @@ "Co-author": "Co-author", "Collaborate": "Help Edit", "Collaborators": "Collaborators", - "collections": "collections", "Collections": "Collections", + "collections": "collections", "Come up with a subtitle for your story": "Come up with a subtitle for your story", "Come up with a title for your story": "Come up with a title for your story", "Coming soon": "Coming soon", @@ -98,7 +97,6 @@ "Commentator": "Commentator", "Commenting": "Commenting", "Comments": "Comments", - "some comments": "{count, plural, =0 {{count} comments} one {{count} comment} few {{count} comments} other {{count} comments}}", "Common feed": "All", "Communities": "Communities", "community": "community", @@ -127,8 +125,8 @@ "Create post": "Create post", "Create video": "Create video", "Crop image": "Crop image", - "Current discussions": "Актуальные дискуссии", "Culture": "Culture", + "Current discussions": "Актуальные дискуссии", "Current password": "Current password", "Date of Birth": "Date of Birth", "Decline": "Decline", @@ -151,8 +149,8 @@ "Dogma": "Dogma", "dogma keywords": "Discours.io, dogma, editorial principles, code of ethics, journalism, community", "Draft successfully deleted": "Draft successfully deleted", - "drafts": "drafts", "Drafts": "Drafts", + "drafts": "drafts", "Drag the image to this area": "Drag the image to this area", "Each image must be no larger than 5 MB.": "Each image must be no larger than 5 MB.", "earlier": "earlier", @@ -162,8 +160,8 @@ "Editor": "Editor", "Email": "Mail", "email not confirmed": "email not confirmed", - "enter": "enter", "Enter": "Enter", + "enter": "enter", "Enter a new password": "Enter a new password", "Enter footnote text": "Enter footnote text", "Enter image description": "Enter image description", @@ -178,8 +176,8 @@ "FAQ": "Tips and suggestions", "Favorite": "Favorites", "Favorite topics": "Favorite topics", - "feed": "feed", "Feed": "Feed", + "feed": "feed", "Feed settings": "Feed settings", "Feedback": "Feedback", "Fill email": "Fill email", @@ -190,8 +188,6 @@ "Follow the topic": "Follow the topic", "follower": "follower", "Followers": "Followers", - "some followings": "{count, plural, =0 {no followings} one {{count} following} few {{count} followings} other {{count} followings}}", - "some followers": "{count, plural, =0 {no followers} one {{count} follower} other {{count} followers}}", "Following": "Following", "Following...": "Following...", "Forgot password?": "Forgot password?", @@ -201,16 +197,16 @@ "Gallery": "Gallery", "Gallery name": "Gallery name", "Get to know the most intelligent people of our time, edit and discuss the articles, share your expertise, rate and decide what to publish in the magazine": "Get to know the most intelligent people of our time, edit and discuss the articles, share your expertise, rate and decide what to publish in the magazine", - "Go to main page": "Go to main page", "Go to discussions": "Перейти к обсуждениям", + "Go to main page": "Go to main page", "Group Chat": "Group Chat", "Groups": "Groups", - "header 1": "header 1", "Header 1": "Header 1", - "header 2": "header 2", + "header 1": "header 1", "Header 2": "Header 2", - "header 3": "header 3", + "header 2": "header 2", "Header 3": "Header 3", + "header 3": "header 3", "Headers": "Headers", "Help": "Помощь", "Help to edit": "Help to edit", @@ -256,8 +252,11 @@ "Invite to collab": "Invite to Collab", "It does not look like url": "It doesn't look like a link", "It's OK. Just enter your email to receive a link to change your password": "It's OK. Just enter your email to receive a link to change your password", - "italic": "italic", "Italic": "Italic", + "italic": "italic", + "Join": "Join", + "Join discussions": "Присоединяйтесь к дискуссиям", + "Join discussions text": "Дискурс — свободная платформа для осмысленного общения.
Здесь появятся ваши реплики, чтобы в любой момент вернуться к диалогу.", "Join our maillist": "To receive the best postings, just enter your email", "Join our team of authors": "Join our team of authors", "Join our team of authors text": "Каждый месяц на Дискурсе публикуются десятки новых авторов. Станьте одним из них — предложите свой материал в журнал и присоединитесь к горизонтальной редакции", @@ -265,9 +264,6 @@ "Join the global community of authors!": "Join the global community of authors from all over the world!", "journal": "journal", "jpg, .png, max. 10 mb.": "jpg, .png, макс. 10 мб.", - "Join": "Join", - "Join discussions": "Присоединяйтесь к дискуссиям", - "Join discussions text": "Дискурс — свободная платформа для осмысленного общения.
Здесь появятся ваши реплики, чтобы в любой момент вернуться к диалогу.", "Just start typing...": "Just start typing...", "keywords": "Discours.io, Discours magazine, Discours, culture, science, art, society, independent journalism, literature, music, cinema, video, photography", "Knowledge base": "Knowledge base", @@ -279,8 +275,8 @@ "Link sent, check your email": "Link sent, check your email", "List of authors of the open editorial community": "List of authors of the open editorial community", "Lists": "Lists", - "literature": "literature", "Literature": "Literature", + "literature": "literature", "Load more": "Show more", "Loading": "Loading", "Login and security": "Login and security", @@ -299,10 +295,10 @@ "Most read": "Readable", "Move down": "Move down", "Move up": "Move up", - "music": "music", "Music": "Music", - "my feed": "my ribbon", + "music": "music", "My feed": "My feed", + "my feed": "my ribbon", "My subscriptions": "Subscriptions", "Name": "Name", "New literary work": "New literary work", @@ -322,8 +318,8 @@ "Ordered list": "Ordered list", "Our regular contributor": "Our regular contributor", "Paragraphs": "Абзацев", - "Participate in the Discours: share information, join the editorial team": "Участвуйте в Дискурсе: делитесь информацией, присоединяйтесь к редакции", "Participate in discussions": "Участвуйте в дискуссиях", + "Participate in the Discours: share information, join the editorial team": "Участвуйте в Дискурсе: делитесь информацией, присоединяйтесь к редакции", "Participating": "Participating", "Participation": "Participation", "Partners": "Partners", @@ -362,7 +358,6 @@ "Profile": "Profile", "Profile settings": "Profile settings", "Publications": "Publications", - "PublicationsWithCount": "{count, plural, =0 {no publications} one {{count} publication} other {{count} publications}}", "Publish Album": "Publish Album", "Publish Settings": "Publish Settings", "Published": "Published", @@ -404,7 +399,6 @@ "Share": "Share", "Share publication": "Share publication", "shout": "post", - "some shouts": "{count} {count, plural, one {post} other {posts}}", "Show": "Show", "Show lyrics": "Show lyrics", "Show more": "Show more", @@ -415,16 +409,24 @@ "slug is used by another user": "Slug is already taken by another user", "Social networks": "Social networks", "Society": "Society", + "some authors": "{count} {count, plural, one {author} other {authors}}", + "some comments": "{count, plural, =0 {{count} comments} one {{count} comment} few {{count} comments} other {{count} comments}}", + "some followers": "{count, plural, =0 {no followers} one {{count} follower} other {{count} followers}}", + "some followings": "{count, plural, =0 {no followings} one {{count} following} few {{count} followings} other {{count} followings}}", "Some new comments to your publication": "{commentsCount, plural, one {New comment} other {{commentsCount} comments}} to your publication", "Some new replies to your comment": "{commentsCount, plural, one {New reply} other {{commentsCount} replays}} to your publication", + "some posts": "{count, plural, =0 {no publications} one {{count} publication} other {{count} publications}}", + "some shouts": "{count} {count, plural, one {post} other {posts}}", + "some topics": "{count} {count, plural, one {topic} other {topics}}", + "some views": "{count} {count, plural, one {view} other {views}}", "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", "Soon": "Скоро", "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", + "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", "Start dialog": "Start dialog", @@ -438,11 +440,11 @@ "subscriber_rp": "subscriber", "subscribers": "subscribers", "subscribing...": "subscribing...", - "subscription": "subscription", "Subscription": "Subscription", + "subscription": "subscription", "subscription_rp": "subscription", - "subscriptions": "subscriptions", "Subscriptions": "Subscriptions", + "subscriptions": "subscriptions", "Substrate": "Substrate", "Success": "Success", "Successfully authorized": "Authorization successful", @@ -450,8 +452,8 @@ "Support Discours": "Support Discours", "Support the project": "Support the project", "Support us": "Support us", - "terms of use": "terms of use", "Terms of use": "Site rules", + "terms of use": "terms of use", "terms of use keywords": "Discours.io, site rules, terms of use", "Text checking": "Text checking", "Thank you": "Thank you", @@ -491,8 +493,8 @@ "Top viewed": "Most viewed", "Topic is supported by": "Topic is supported by", "topicKeywords": "{topic}, Discours.io, articles, journalism, research", - "topics": "topics", "Topics": "Topics", + "topics": "topics", "Topics which supported by author": "Topics which supported by author", "try": "попробуйте", "Try to find another way": "Try to find another way", @@ -511,12 +513,11 @@ "Userpic": "Userpic", "Users": "Users", "verified": "verified", - "video": "video", "Video": "Video", + "video": "video", "Video format not supported": "Video format not supported", "view": "view", "Views": "Views", - "viewsWithCount": "{count} {count, plural, one {view} other {views}}", "We are working on collaborative editing of articles and in the near future you will have an amazing opportunity - to create together with your colleagues": "We are working on collaborative editing of articles and in the near future you will have an amazing opportunity - to create together with your colleagues", "We can't find you, check email or": "We can't find you, check email or", "We couldn't find anything for your request": "We couldn’t find anything for your request", @@ -553,4 +554,4 @@ "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" -} \ No newline at end of file +} diff --git a/public/locales/ru/translation.json b/public/locales/ru/translation.json index 292830d3..de53ce0d 100644 --- a/public/locales/ru/translation.json +++ b/public/locales/ru/translation.json @@ -16,8 +16,8 @@ "Add image": "Добавить изображение", "Add images": "Добавить изображения", "Add intro": "Добавить вступление", - "add link": "добавить ссылку", "Add link": "Добавить ссылку", + "add link": "добавить ссылку", "Add rule": "Добавить разделитель", "Add signature": "Добавить подпись", "Add subtitle": "Добавить подзаголовок", @@ -28,13 +28,13 @@ "Alignment center": "По центру", "Alignment left": "По левому краю", "Alignment right": "По правому краю", + "All": "Все", "All articles": "Все материалы", "All authors": "Все авторы", "All posts": "Все публикации", "All posts rating": "Рейтинг всех постов", - "all topics": "все темы", "All topics": "Все темы", - "All": "Все", + "all topics": "все темы", "Almost done! Check your email.": "Почти готово! Осталось подтвердить вашу почту.", "and some more authors": "{restUsersCount, plural, =0 {} one { и ещё 1 пользователя} few { и ещё {restUsersCount} пользователей} other { и ещё {restUsersCount} пользователей}}", "Are you sure you want to delete this comment?": "Уверены, что хотите удалить этот комментарий?", @@ -46,11 +46,10 @@ "Artist...": "Исполнитель...", "Artworks": "Артворки", "Audio": "Аудио", - "author": "автор", "Author": "Автор", - "authors": "авторы", + "author": "автор", "Authors": "Авторы", - "some authors": "{count} {count, plural, one {автор} few {автора} other {авторов}}", + "authors": "авторы", "Autotypograph": "Автотипограф", "Back": "Назад", "Back to editor": "Вернуться в редактор", @@ -58,12 +57,12 @@ "back to menu": "назад в меню", "Be the first to rate": "Оцените первым", "Become an author": "Стать автором", - "bold": "жирный", "Block rules": "За что можно получить бан", "Bold": "Жирный", + "bold": "жирный", "Bookmarked": "Сохранено", - "bookmarks": "закладки", "Bookmarks": "Закладки", + "bookmarks": "закладки", "Bullet list": "Маркированный список", "By alphabet": "По алфавиту", "By authors": "По авторам", @@ -80,8 +79,8 @@ "Can make any changes, accept or reject suggestions, and share access with others": "Может вносить любые изменения, принимать и отклонять предложения, а также делиться доступом с другими", "Can offer edits and comments, but cannot edit the post or share access with others": "Может предлагать правки и комментарии, но не может изменять пост и делиться доступом с другими", "Can write and edit text directly, and accept or reject suggestions from others": "Может писать и редактировать текст напрямую, а также принимать или отклонять предложения других", - "cancel": "отменить", "Cancel": "Отмена", + "cancel": "отменить", "Cancel changes": "Отменить изменения", "Change password": "Сменить пароль", "Characters": "Знаков", @@ -93,8 +92,8 @@ "Co-author": "Соавтор", "Collaborate": "Помочь редактировать", "Collaborators": "Соавторы", - "collections": "коллекции", "Collections": "Коллекции", + "collections": "коллекции", "Come up with a subtitle for your story": "Придумайте подзаголовок вашей истории", "Come up with a title for your story": "Придумайте заголовок вашей истории", "Coming soon": "Уже скоро", @@ -103,7 +102,6 @@ "Commentator": "Комментатор", "Commenting": "Комментирование", "Comments": "Комментарии", - "some comments": "{count, plural, =0 {{count} комментариев} one {{count} комментарий} few {{count} комментария} other {{count} комментариев}}", "Common feed": "Общая лента", "Communities": "Сообщества", "community": "сообщество", @@ -158,8 +156,8 @@ "Dogma": "Догма", "dogma keywords": "Discours.io, догма, редакционные принципы, этический кодекс, журналистика, сообщество", "Draft successfully deleted": "Черновик успешно удален", - "drafts": "черновики", "Drafts": "Черновики", + "drafts": "черновики", "Drag the image to this area": "Перетащите изображение в эту область", "Each image must be no larger than 5 MB.": "Каждое изображение должно быть размером не больше 5 мб.", "earlier": "ранее", @@ -169,8 +167,8 @@ "Editor": "Редактор", "Email": "Почта", "email not confirmed": "email не подтвержден", - "enter": "войти", "Enter": "Войти", + "enter": "войти", "Enter a new password": "Введите новый пароль", "Enter footnote text": "Введите текст сноски", "Enter image description": "Введите описание изображения", @@ -185,8 +183,8 @@ "FAQ": "Советы и предложения", "Favorite": "Избранное", "Favorite topics": "Избранные темы", - "feed": "лента", "Feed": "Лента", + "feed": "лента", "Feed settings": "Настроить ленту", "Feedback": "Обратная связь", "Fill email": "Введите почту", @@ -197,7 +195,6 @@ "Follow the topic": "Подписаться на тему", "follower": "подписчик", "Followers": "Подписчики", - "some followers": "{count, plural, =0 {нет подписчиков} one {{count} подписчик} few {{count} подписчика} other {{count} подписчиков}}", "Following": "Вы подписаны", "Following...": "Подписываем...", "Forgot password?": "Забыли пароль?", @@ -209,17 +206,17 @@ "Genre...": "Жанр...", "Get notifications": "Получать уведомления", "Get to know the most intelligent people of our time, edit and discuss the articles, share your expertise, rate and decide what to publish in the magazine": "Познакомитесь с выдающимися людьми нашего времени, участвуйте в редактировании и обсуждении статей, выступайте экспертом, оценивайте материалы других авторов со всего мира и определяйте, какие статьи будут опубликованы в журнале", - "Go to main page": "Перейти на главную", "Go to discussions": "Перейти к обсуждениям", + "Go to main page": "Перейти на главную", "Group Chat": "Общий чат", "Groups": "Группы", "Header": "Заголовок", - "header 1": "заголовок 1", "Header 1": "Заголовок 1", - "header 2": "заголовок 2", + "header 1": "заголовок 1", "Header 2": "Заголовок 2", - "header 3": "заголовок 3", + "header 2": "заголовок 2", "Header 3": "Заголовок 3", + "header 3": "заголовок 3", "Headers": "Заголовки", "Help": "Помощь", "Help to edit": "Помочь редактировать", @@ -266,16 +263,16 @@ "Invite to collab": "Пригласить к участию", "It does not look like url": "Это не похоже на ссылку", "It's OK. Just enter your email to receive a link to change your password": "Ничего страшного. Просто укажите свою почту, чтобы получить ссылку для смены пароля", - "italic": "курсив", "Italic": "Курсив", + "italic": "курсив", + "Join": "Присоединиться", + "Join discussions": "Присоединяйтесь к дискуссиям", + "Join discussions text": "Дискурс — свободная платформа для осмысленного общения.
Здесь появятся ваши реплики, чтобы в любой момент вернуться к диалогу.", "Join our maillist": "Чтобы получать рассылку лучших публикаций, просто укажите свою почту", "Join our team of authors": "Станьте автором", "Join our team of authors text": "Каждый месяц на Дискурсе публикуются десятки новых авторов.
Станьте одним из них — предложите свой материал в журнал и присоединитесь к горизонтальной редакции", "Join the community": "Присоединиться к сообществу", "Join the global community of authors!": "Присоединятесь к глобальному сообществу авторов со всего мира!", - "Join": "Присоединиться", - "Join discussions": "Присоединяйтесь к дискуссиям", - "Join discussions text": "Дискурс — свободная платформа для осмысленного общения.
Здесь появятся ваши реплики, чтобы в любой момент вернуться к диалогу.", "journal": "журнал", "jpg, .png, max. 10 mb.": "jpg, .png, макс. 10 мб.", "Just start typing...": "Просто начните печатать...", @@ -290,8 +287,8 @@ "Link sent, check your email": "Ссылка отправлена, проверьте почту", "List of authors of the open editorial community": "Список авторов сообщества открытой редакции", "Lists": "Списки", - "literature": "литература", "Literature": "Литература", + "literature": "литература", "Load more": "Показать ещё", "Loading": "Загрузка", "Login and security": "Вход и безопасность", @@ -310,10 +307,10 @@ "Most read": "Читаемое", "Move down": "Переместить вниз", "Move up": "Переместить вверх", - "music": "музыка", "Music": "Музыка", - "my feed": "моя лента", + "music": "музыка", "My feed": "Моя лента", + "my feed": "моя лента", "My subscriptions": "Подписки", "Name": "Имя", "New literary work": "Новое произведение", @@ -335,8 +332,8 @@ "Ordered list": "Нумерованный список", "Our regular contributor": "Наш постоянный автор", "Paragraphs": "Абзацев", - "Participate in the Discours: share information, join the editorial team": "Participate in the Discours: share information, join the editorial team", "Participate in discussions": "Участвуйте в дискуссиях", + "Participate in the Discours: share information, join the editorial team": "Participate in the Discours: share information, join the editorial team", "Participating": "Участвовать", "Participation": "Соучастие", "Partners": "Партнёры", @@ -379,7 +376,6 @@ "Profile successfully saved": "Профиль успешно сохранён", "Publication settings": "Настройки публикации", "Publications": "Публикации", - "PublicationsWithCount": "{count, plural, =0 {нет публикаций} one {{count} публикация} few {{count} публикации} other {{count} публикаций}}", "Publish": "Опубликовать", "Publish Album": "Опубликовать альбом", "Publish Settings": "Настройки публикации", @@ -426,7 +422,6 @@ "Short opening": "Расскажите вашу историю...", "shout": "пост", "shout not found": "публикация не найдена", - "some shouts": "{count} {count, plural, one {публикация} few {публикации} other {публикаций}}", "Show": "Показать", "Show lyrics": "Текст песни", "Show more": "Читать дальше", @@ -439,16 +434,24 @@ "slug is used by another user": "Имя уже занято другим пользователем", "Social networks": "Социальные сети", "Society": "Общество", + "some authors": "{count} {count, plural, one {автор} few {автора} other {авторов}}", + "some comments": "{count, plural, =0 {{count} комментариев} one {{count} комментарий} few {{count} комментария} other {{count} комментариев}}", + "some followers": "{count, plural, =0 {нет подписчиков} one {{count} подписчик} few {{count} подписчика} other {{count} подписчиков}}", + "some followings": "{count, plural, =0 {нет подписок} one {{count} подписка} few {{count} подписки} other {{count} подписок}}", "Some new comments to your publication": "{commentsCount, plural, one {Новый комментарий} few {{commentsCount} новых комментария} other {{commentsCount} новых комментариев}} к вашей публикации", "Some new replies to your comment": "{commentsCount, plural, one {Новый ответ} few {{commentsCount} новых ответа} other {{commentsCount} новых ответов}} на ваш комментарий к публикации", + "some posts": "{count, plural, =0 {нет публикаций} one {{count} публикация} few {{count} публикации} other {{count} публикаций}}", + "some shouts": "{count} {count, plural, one {публикация} few {публикации} other {публикаций}}", + "some topics": "{count} {count, plural, one {тема} few {тем} other {тем}}", + "some views": "{count} {count, plural, one {просмотр} few {просмотрa} other {просмотров}}", "Something went wrong, check email and password": "Что-то пошло не так. Проверьте адрес электронной почты и пароль", "Something went wrong, please try again": "Что-то пошло не так, попробуйте еще раз", "Song lyrics": "Текст песни...", "Song title": "Название песни", "Soon": "Скоро", "Sorry, this address is already taken, please choose another one.": "Увы, этот адрес уже занят, выберите другой", - "Special projects": "Спецпроекты", "Special Projects": "Спецпроекты", + "Special projects": "Спецпроекты", "Specify the source and the name of the author": "Укажите источник и имя автора", "squib": "Подверстка", "Start conversation": "Начать беседу", @@ -466,7 +469,6 @@ "subscribing...": "Подписка...", "Subscription": "Подписка", "Subscriptions": "Подписки", - "some followings": "{count, plural, =0 {нет подписок} one {{count} подписка} few {{count} подписки} other {{count} подписок}}", "Substrate": "Подложка", "Success": "Успешно", "Successfully authorized": "Авторизация успешна", @@ -474,8 +476,8 @@ "Support Discours": "Поддержите Дискурс", "Support the project": "Поддержать проект", "Support us": "Помочь журналу", - "terms of use": "правилами пользования сайтом", "Terms of use": "Правила сайта", + "terms of use": "правилами пользования сайтом", "terms of use keywords": "Discours.io, правила сайта, terms of use", "Text checking": "Проверка текста", "Thank you": "Благодарности", @@ -515,8 +517,8 @@ "Top viewed": "Самое читаемое", "Topic is supported by": "Тему поддерживают", "topicKeywords": "{topic}, Discours.io, статьи, журналистика, исследования", - "topics": "темы", "Topics": "Темы", + "topics": "темы", "Topics which supported by author": "Автор поддерживает темы", "try": "попробуйте", "Try to find another way": "Попробуйте найти по-другому", @@ -535,12 +537,11 @@ "Userpic": "Аватар", "Users": "Пользователи", "verified": "уже подтверждён", - "video": "видео", "Video": "Видео", + "video": "видео", "Video format not supported": "Тип видео не поддерживается", "view": "просмотр", "Views": "Просмотры", - "viewsWithCount": "{count} {count, plural, one {просмотр} few {просмотрa} other {просмотров}}", "We are working on collaborative editing of articles and in the near future you will have an amazing opportunity - to create together with your colleagues": "Мы работаем над коллаборативным редактированием статей и в ближайшем времени у вас появиться удивительная возможность - творить вместе с коллегами", "We can't find you, check email or": "Не можем вас найти, проверьте адрес электронной почты или", "We couldn't find anything for your request": "Мы не смогли ничего найти по вашему запросу", @@ -579,4 +580,4 @@ "You've successfully logged out": "Вы успешно вышли из аккаунта", "Your email": "Ваш email", "Your name will appear on your profile page and as your signature in publications, comments and responses.": "Ваше имя появится на странице вашего профиля и как ваша подпись в публикациях, комментариях и откликах" -} \ No newline at end of file +} diff --git a/src/components/Article/FullArticle.tsx b/src/components/Article/FullArticle.tsx index 3cea62c2..6f7c1047 100644 --- a/src/components/Article/FullArticle.tsx +++ b/src/components/Article/FullArticle.tsx @@ -487,7 +487,7 @@ export const FullArticle = (props: Props) => {
- {t('viewsWithCount', { count: props.article.stat?.viewed })} + {t('some views', { count: props.article.stat?.viewed })}
diff --git a/src/components/Author/AuthorBadge/AuthorBadge.tsx b/src/components/Author/AuthorBadge/AuthorBadge.tsx index 8f0191e5..0b1948e4 100644 --- a/src/components/Author/AuthorBadge/AuthorBadge.tsx +++ b/src/components/Author/AuthorBadge/AuthorBadge.tsx @@ -118,7 +118,7 @@ export const AuthorBadge = (props: Props) => {
0}> -
{t('PublicationsWithCount', { count: props.author.stat?.shouts ?? 0 })}
+
{t('some posts', { count: props.author.stat?.shouts ?? 0 })}
 0}>
{t('some comments', { count: props.author.stat?.comments ?? 0 })}
diff --git a/src/components/Topic/Full.tsx b/src/components/Topic/Full.tsx index 34a9d4d4..87c2d540 100644 --- a/src/components/Topic/Full.tsx +++ b/src/components/Topic/Full.tsx @@ -49,7 +49,7 @@ export const FullTopic = (props: Props) => {
- {t('PublicationsWithCount', { + {t('some posts', { count: props.topic?.stat.shouts ?? 0, })}
diff --git a/src/components/Topic/TopicBadge/TopicBadge.tsx b/src/components/Topic/TopicBadge/TopicBadge.tsx index a07dca47..f6429ce3 100644 --- a/src/components/Topic/TopicBadge/TopicBadge.tsx +++ b/src/components/Topic/TopicBadge/TopicBadge.tsx @@ -80,7 +80,7 @@ export const TopicBadge = (props: Props) => { when={props.topic.body} fallback={
- {t('PublicationsWithCount', { count: props.topic?.stat?.shouts ?? 0 })} + {t('some posts', { count: props.topic?.stat?.shouts ?? 0 })}
} > diff --git a/src/components/Views/Topic.tsx b/src/components/Views/Topic.tsx index 0a56b036..a8dff6f7 100644 --- a/src/components/Views/Topic.tsx +++ b/src/components/Views/Topic.tsx @@ -51,23 +51,28 @@ export const TopicView = (props: Props) => { const [topic, setTopic] = createSignal() createEffect( - on([() => props.topicSlug, topic, topicEntities], ([slug, t, ttt]) => { + on([() => props.topicSlug, topic, topicEntities], async ([slug, t, ttt]) => { if (slug && !t && ttt) { - console.debug(`${ttt.length} topics preloaded`) const current = ttt[slug] console.debug(current) setTopic(current) - loadTopicFollowers() - loadTopicAuthors() - loadRandom() + await loadTopicFollowers() + await loadTopicAuthors() + await loadRandom() } }), ) const [followers, setFollowers] = createSignal(props.followers || []) const loadTopicFollowers = async () => { - const result = await apiClient.getTopicFollowers({ slug: props.topicSlug }) - setFollowers(result) + const flwrs = await apiClient.getTopicFollowers({ slug: props.topicSlug }) + setFollowers(flwrs) + } + const [topicAuthors, setTopicAuthors] = createSignal([]) + const loadTopicAuthors = async () => { + const by: AuthorsBy = { topic: props.topicSlug } + const authors = await apiClient.loadAuthorsBy({ by, limit: 10, offset: 0 }) + setTopicAuthors(authors) } const loadFavoriteTopArticles = async (topic: string) => { @@ -94,12 +99,6 @@ export const TopicView = (props: Props) => { setReactedTopMonthArticles(result) } - const [topicAuthors, setTopicAuthors] = createSignal([]) - const loadTopicAuthors = async () => { - const by: AuthorsBy = { topic: props.topicSlug } - const result = await apiClient.loadAuthorsBy({ by }) - setTopicAuthors(result) - } const loadRandom = () => { loadFavoriteTopArticles(topic()?.slug) diff --git a/tests/basic-routes.spec.ts b/tests/basic-routes.spec.ts index da1b2652..b904fbef 100644 --- a/tests/basic-routes.spec.ts +++ b/tests/basic-routes.spec.ts @@ -1,6 +1,6 @@ import { expect, test } from '@playwright/test' -const baseHost = process.env.BASE_HOST || 'https://localhost:3000'; +const baseHost = process.env.BASE_HOST || 'https://localhost:3000' const pagesTitles = { '/': /Дискурс/,