diff --git a/src/models/SignupForm.ts b/src/models/SignupForm.ts index 750f751..47667a2 100644 --- a/src/models/SignupForm.ts +++ b/src/models/SignupForm.ts @@ -5,7 +5,8 @@ import { Question } from "@components/SignupQuestionsWidget"; export interface SignupForm { id?: number; - title: string; + title_fi: string; + title_en: string; visible: boolean; start_time: string; end_time: string; diff --git a/src/pages/admin/AdminCommonPage.tsx b/src/pages/admin/AdminCommonPage.tsx index cadfa76..6671c1b 100644 --- a/src/pages/admin/AdminCommonPage.tsx +++ b/src/pages/admin/AdminCommonPage.tsx @@ -54,13 +54,13 @@ class AdminCommonPage extends React.Component + <>
- + ); } } diff --git a/src/pages/admin/AdminSignupPage.tsx b/src/pages/admin/AdminSignupPage.tsx index 8fca13d..7051cbb 100644 --- a/src/pages/admin/AdminSignupPage.tsx +++ b/src/pages/admin/AdminSignupPage.tsx @@ -90,7 +90,7 @@ class AdminSignupPage extends React.Component {signupForms.map(signupForm => ( - {signupForm.title} + {signupForm.title_fi} {formatRelative(new Date(signupForm.start_time), new Date())} {formatRelative(new Date(signupForm.end_time), new Date())} diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx index eecbd7e..009ccd4 100644 --- a/src/pages/admin/EventCreatePage.tsx +++ b/src/pages/admin/EventCreatePage.tsx @@ -203,7 +203,7 @@ class EventCreatePage extends React.Component form.id), - enumNames: signupForm.map(form => form.title), + enumNames: signupForm.map(form => form.title_fi), }, uniqueItems: true, }, diff --git a/src/views/EventPage/EventPageView.tsx b/src/views/EventPage/EventPageView.tsx index fe4cb4b..c0187e1 100644 --- a/src/views/EventPage/EventPageView.tsx +++ b/src/views/EventPage/EventPageView.tsx @@ -36,7 +36,7 @@ class EventPageView extends React.Component { {event.signupForm.map(sf => ( ) diff --git a/src/views/SignUpPage/FormUtils.tsx b/src/views/SignUpPage/FormUtils.tsx index 43c126b..e555ed2 100644 --- a/src/views/SignUpPage/FormUtils.tsx +++ b/src/views/SignUpPage/FormUtils.tsx @@ -119,7 +119,7 @@ export const buildFormSchema = (signUpForm: SignupForm) => { }); const schema = { - title: signUpForm.id ? signUpForm.title : "Loading...", + title: signUpForm.id ? signUpForm.title_fi : "Loading...", type: "object", required: requiredIds, properties: schemaProps, diff --git a/src/views/SignUpPage/SignUpPageView.tsx b/src/views/SignUpPage/SignUpPageView.tsx index 92ea3e1..e6055bc 100644 --- a/src/views/SignUpPage/SignUpPageView.tsx +++ b/src/views/SignUpPage/SignUpPageView.tsx @@ -52,7 +52,7 @@ const SignUpPageView: React.FC = ({ return ( <>

- {signUpForm.title} + {signUpForm.title_fi}