Fixed the merge conflicts - part 2

codeforboston · Nov 6, 2023 · dcd75c0 · dcd75c0
1 parent 01b2953
commit dcd75c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/frontend/front/src/pages/Public/Libs/i18n.js b/frontend/front/src/pages/Public/Libs/i18n.js
@@ -1,6 +1,5 @@
 import i18next from "i18next";
 import { initReactI18next } from "react-i18next";
-import LanguageDetector from "i18next-browser-languagedetector";
 import enTranslations from "../locales/en.json";
 import ptTranslations from "../locales/pt-BR.json";
 import esTranslations from "../locales/es-419.json";
@@ -11,7 +10,6 @@ const userLangPref = localStorage.getItem("langPref") || "en-us";
 // configuration for i18next library
 i18next
   .use(initReactI18next) // passes i18next down to react-i18next
-  // .use(LanguageDetector)
   .init({
     // debug: false, // change to true to debug i18next
     fallbackLng: ["en", "es"], // fallback language

diff --git a/frontend/front/src/pages/Public/Pages/SurveyPage.js b/frontend/front/src/pages/Public/Pages/SurveyPage.js
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Alert, Box, Container, Snackbar, Stack } from "@mui/material";
 import TitleHero from "../Components/Typography/TitleHero";
@@ -8,7 +8,6 @@ import {
   RECAPTCHA_ACTION_PUBLIC_SURVEY,
   useGetReCAPTCHAToken,
 } from "../../../components/ReCaptcha";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
 import {
   useCreateHomeMutation,
   useCreateSurveyVisitMutation,