fix: fix review selection with multiple languages (#521)

common-voice · Nov 2, 2021 · 05c9fa9 · 05c9fa9
1 parent 96afece
commit 05c9fa9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/web/src/components/language-info.tsx b/web/src/components/language-info.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { Localized } from '@fluent/react';
 
-import { useLocaleUrl, getReviewUrl } from '../urls';
+import { useLocaleUrl, useReviewUrl } from '../urls';
 
 type Props = {
   total: number;
@@ -22,7 +22,7 @@ const LanguageInfo = (props: Props) => {
   const rejectedSentences = rejected;
 
   const localizedAddUrl = useLocaleUrl('/add');
-  const localizedReviewUrl = getReviewUrl(language);
+  const localizedReviewUrl = useReviewUrl(language);
 
   return (
     <section>

diff --git a/web/src/components/review.tsx b/web/src/components/review.tsx
@@ -71,7 +71,7 @@ export default function Review() {
 
   const onSelectLanguage = (language: string) => {
     setLanguage(language);
-    history.push(getReviewUrl(language));
+    history.push(getReviewUrl(match.params.locale, language));
   };
 
   const onReviewed = (reviewedState: ReviewedState) => {

diff --git a/web/src/urls.ts b/web/src/urls.ts
@@ -2,14 +2,19 @@ import { useRouteMatch } from 'react-router-dom';
 
 type LocaleMatch = { locale: string };
 
-export const getReviewUrl = (language: string | undefined) => {
+export const useReviewUrl = (language: string | undefined) => {
   const match = useRouteMatch<LocaleMatch>();
   const locale = match?.params?.locale;
   const prefix = locale ? `/${locale}` : '';
   const languageToReview = language || '';
   return `${prefix}/review/${languageToReview}`;
 };
 
+export const getReviewUrl = (locale: string, language: string | undefined) => {
+  const languageToReview = language || '';
+  return `/${locale}/review/${languageToReview}`;
+};
+
 export const useLocaleUrl = (path: string) => {
   const match = useRouteMatch<LocaleMatch>();
   const locale = match?.params?.locale;