Revert "Merge branch 'i18n' into 'master'"

This reverts merge request !51

src/views/EventPage/EventPageView.tsx

@@ -4,11 +4,11 @@ import styled from "styled-components";
 import colors from "@theme/colors";
 import Event from "@models/Event";
 import Button from "@components/Button";
-import { Link, TextSection, ChangeLanguageButton } from "@components/index";
+import { Link, TextSection } from "@components/index";
 import noop from "@utils/noop";
+
 import MarkdownStyles from "@views/common/MarkdownStyles";
 import LoadingView from "@views/common/LoadingView";
-import i18nNext, { useTranslation } from "../../i18n";
 
 interface EventPageViewProps {
   event?: Event;
@@ -33,6 +33,7 @@ const StyledTextSection = styled(TextSection)`
       line-height: 0.4rem;
     }
   }
+
 `;
 
 const SignupButtons = styled.div`
@@ -45,69 +46,49 @@ const Content = styled(MarkdownStyles)`
   margin-top: 1.5rem;
 `;
 
-const LngButton = styled(ChangeLanguageButton)`
-  align-self: flex-end;
-  margin-right: 1rem;
-`;
-
 const EventPageView: React.FC<EventPageViewProps> = ({ event }) => {
-  const { t } = useTranslation();
   if (!event) return <LoadingView />;
-  const { language } = i18nNext.i18n;
-  const isFi = language === "fi";
-  const {
-    title, description, content, location, startDate, endDate,
-  } = {
-    title: isFi ? event.title_fi : event.title_en,
-    description: isFi ? event.description_fi : event.description_en,
-    content: isFi ? event.content_fi : event.content_en,
-    location: isFi ? event.location_fi : event.location_en,
-    startDate: new Date(event.start_time).toLocaleString(isFi ? "fi-FI" : "en-GB"),
-    endDate: new Date(event.end_time).toLocaleString(isFi ? "fi-FI" : "en-GB"),
-  };
-
+  const date_start = new Date(event.start_time).toLocaleString("fi-FI");
+  const date_end = new Date(event.end_time).toLocaleString("fi-FI");
   return (
-    <>
-      <LngButton />
-      <StyledTextSection>
-        <h1>
-          {title}
-          <p>
-            {description}
-          </p>
-          <Image
-            src={event.image || event.tags[0].icon}
-            alt={title}
-            objectFit="scale-down"
-            layout="responsive"
-            width={16}
-            height={9}
-          />
-        </h1>
-        <div>
-          <Content source={content} escapeHtml={false} />
-          <p>
-            {`${t("Paikka")}: ${location}`}
-          </p>
-          <p>
-            <time>{`${t("Alkaa")}: ${startDate}`}</time>
-          </p>
-          <p>
-            <time>{`${t("Päättyy")}: ${endDate}`}</time>
-          </p>
-          {/* We may have multiple signup forms. Generate own Button for each one */}
-          <SignupButtons>
-            {event.signupForm.map((sf) => (
-              <Link key={sf.id} to={`/signup/${sf.id}`}>
-                <Button data-e2e="signup-button" buttonStyle="filled" onClick={noop}>
-                  {isFi ? sf.title_fi : sf.title_en}
-                </Button>
-              </Link>
-            ))}
-          </SignupButtons>
-        </div>
-      </StyledTextSection>
-    </>
+    <StyledTextSection>
+      <h1>
+        {event.title_fi}
+        <p>
+          {event.description_fi}
+        </p>
+        <Image
+          src={event.image || event.tags[0].icon}
+          alt={event.title_fi}
+          objectFit="scale-down"
+          layout="responsive"
+          width={16}
+          height={9}
+        />
+      </h1>
+      <div>
+        <Content source={event.content_fi} escapeHtml={false} />
+        <p>
+          Paikka: {event.location_fi}
+        </p>
+        <p>
+          <time>Alkaa: {date_start}</time>
+        </p>
+        <p>
+          <time>Päättyy: {date_end}</time>
+        </p>
+        {/* We may have multiple signup forms. Generate own Button for each one */}
+        <SignupButtons>
+          {event.signupForm.map((sf) => (
+            <Link key={sf.id} to={`/signup/${sf.id}`}>
+              <Button buttonStyle="filled" onClick={noop}>
+                {sf.title_fi}
+              </Button>
+            </Link>
+          ))}
+        </SignupButtons>
+      </div>
+    </StyledTextSection>
   );
 };
 export default EventPageView;