Revert "fix miscellaneous translations + build warnings (codeforboston#1934)"

This reverts commit 4cbe155.

Author: nesanders

components/HearingsScheduled/HearingsScheduled.tsx

@@ -3,7 +3,7 @@ import { Container, Carousel, Spinner } from "react-bootstrap"
 import styled from "styled-components"
 import { Col, Row } from "../bootstrap"
 import { useCalendarEvents } from "./calendarEvents"
-import { useTranslation } from "next-i18next"
+import { useTranslation } from "react-i18next"
 
 export type EventData = {
   index: number

components/Legislative/Legislative.tsx

@@ -1,6 +1,6 @@
 import { Container } from "react-bootstrap"
 import { TestimonyCardList } from "components/LearnTestimonyComponents/TestimonyCardComponents"
-import { useTranslation } from "next-i18next"
+import { useTranslation } from "react-i18next"
 
 const LegislativeContent = [
   {

components/Policies/PolicyPage.tsx

@@ -1,42 +1,63 @@
 import { PolicyContent } from "./PolicyContent"
 import { Button, Stack, Container, Image, Row, Col } from "react-bootstrap"
+import { ButtonHTMLAttributes, useEffect, useState } from "react"
 import style from "./PolicyPage.module.css"
 import Router from "next/router"
 import classNames from "classnames"
-import { useTranslation } from "next-i18next"
 
-const policies = ["privacy-policy", "copyright", "code-of-conduct"] as const
+const policies = ["copyright", "privacy-policy", "code-of-conduct"] as const
 export type Policy = (typeof policies)[number]
 
 export default function PolicyPage({
   policy = "privacy-policy"
 }: {
   policy?: Policy
 }) {
-  const { t } = useTranslation("policies")
+  const handleOnClick = (p: Policy) => {
+    Router.push(`/policies/${p}`)
+  }
+
   return (
     <Container fluid className={style.policyContent}>
-      <h1>{t("title")}</h1>
+      <h1>Policies</h1>
       <Stack direction="horizontal">
-        {policies.map(p => (
-          <Button
-            className={`${style[policy === p ? "currentTab" : "tab"]}`}
-            id={p}
-            key={p}
-            onClick={() => Router.push(`/policies/${p}`)}
-          >
-            {t(`tabs.${p}`)}
-          </Button>
-        ))}
+        <Button
+          className={`${
+            style[policy === "privacy-policy" ? "currentTab" : "tab"]
+          }`}
+          id="privacy-policy"
+          onClick={e => handleOnClick("privacy-policy")}
+        >
+          Privacy <br /> Policy
+        </Button>
+        <Button
+          className={`${style[policy === "copyright" ? "currentTab" : "tab"]}`}
+          id="copyright"
+          onClick={e => handleOnClick("copyright")}
+        >
+          Terms of Service <br />
+        </Button>
+
+        <Button
+          className={`${
+            style[policy === "code-of-conduct" ? "currentTab" : "tab"]
+          }`}
+          id="code-of-conduct"
+          onClick={e => handleOnClick("code-of-conduct")}
+        >
+          Code of <br /> Conduct
+        </Button>
       </Stack>
 
       <PolicyContent policy={policy} />
 
       <div className={style.sharedValues}>
-        <p className={style.subHeading}>{t("values.heading")}</p>
+        <p className={style.subHeading}>Our Shared Values</p>
         <hr className={style.bottomBorder}></hr>
-        <p className={style.text1}>{t("values.description1")}</p>
-        <p className={style.text2}>{t("values.description2")}</p>
+        <p className={style.text1}>
+          How we interact with each other determines what we can accomplish
+        </p>
+        <p className={style.text2}>On this website, we ask you to act with:</p>
       </div>
 
       <Container fluid>
@@ -50,19 +71,19 @@ export default function PolicyPage({
         >
           <Col xs={12} className={style.blueBox}>
             <Image src="/handShake.jpg" alt="" className={style.symbol}></Image>
-            <p className={style.values}>{t("values.humility")}</p>
+            <p className={style.values}>Humility</p>
           </Col>
           <Col xs={12} className={style.blueBox}>
             <Image
               src="/compassion.png"
               alt=""
               className={style.symbol}
             ></Image>
-            <p className={style.values}>{t("values.compassion")}</p>
+            <p className={style.values}>Compassion</p>
           </Col>
           <Col xs={12} className={style.blueBox}>
             <Image src="/lightBulb.png" alt="" className={style.symbol}></Image>
-            <p className={style.values}>{t("values.curiosity")}</p>
+            <p className={style.values}>Curiosity</p>
           </Col>
         </Row>
       </Container>

components/PriorityBillsCard/PriorityBillsCard.tsx

@@ -82,3 +82,7 @@ const Position = (stance: string) => {
     </div>
   )
 }
+
+const EditBtnStyle = styled.p`
+  color: #8999d6;
+`

components/TestimonyCard/ReportModal.tsx

@@ -95,10 +95,8 @@ export function ReportModal({
             />
           </FloatingLabel>
           <div className="text-muted">
-            {t("character_count", {
-              count: additionalInformation.length,
-              limit: ADDITIONAL_INFO_MAX_LENGTH_CHARS
-            })}
+            {additionalInformation.length}/{ADDITIONAL_INFO_MAX_LENGTH_CHARS}{" "}
+            characters
           </div>
         </Modal.Body>
         <Modal.Footer>

components/bill/Status.tsx

@@ -5,7 +5,6 @@ import { Button, Modal } from "../bootstrap"
 import { StyledBillTitle, StyledModalTitle } from "./HistoryModal"
 import { HistoryTable } from "./HistoryTable"
 import { BillProps } from "./types"
-import { useTranslation } from "next-i18next"
 
 const StyledButton = styled(Button)`
   border-radius: 3rem 0 0 3rem;
@@ -18,7 +17,6 @@ const StyledButton = styled(Button)`
 export const CourtContext = createContext(1)
 
 export const Status = ({ bill }: BillProps) => {
-  const { t } = useTranslation("common")
   const [showBillHistory, setShowBillHistory] = useState(false)
 
   const handleShowBillHistory = () => setShowBillHistory(true)
@@ -38,7 +36,7 @@ export const Status = ({ bill }: BillProps) => {
         </StyledButton>
         <Modal show={showBillHistory} onHide={handleCloseBillHistory} size="lg">
           <Modal.Header closeButton onClick={handleCloseBillHistory}>
-            <StyledModalTitle>{t("bill.status_and_history")}</StyledModalTitle>
+            <StyledModalTitle>Status & History</StyledModalTitle>
           </Modal.Header>
           <StyledBillTitle>
             {bill.id + " - " + bill.content.Title}

components/bill/TestimonyCounts.tsx

@@ -63,9 +63,7 @@ export const TestimonyCounts = ({
 
   return (
     <Stack className={`align-self-center mx-auto`}>
-      <CountTotal className={`ms-2`}>
-        {t("counts.total", { count: total })}
-      </CountTotal>
+      <CountTotal className={`ms-2`}>{total} Total Testimonies</CountTotal>
       <CountDirection className={`me-1 ms-4 my-1`}>
         <Col className={`px-2`}>
           <CountCategory>{t("counts.endorsements.title")}</CountCategory>

components/buttons.tsx

@@ -310,7 +310,6 @@ export const CopyButton = ({
   tooltipDurationMs?: number
   format?: string
 }) => {
-  const { t } = useTranslation("common")
   const [show, setShow] = useState(false)
   const target = useRef(null)
   const closeTimeout = useRef<any>()
@@ -335,7 +334,7 @@ export const CopyButton = ({
         </Button>
       </CopyToClipboard>
       <Overlay target={target} show={show} placement="top">
-        {props => <Tooltip {...props}>{t("copiedToClipboard")}</Tooltip>}
+        {props => <Tooltip {...props}>Copied to Clipboard!</Tooltip>}
       </Overlay>
     </>
   )

components/dashboard/ResourcesCard.tsx

@@ -9,19 +9,19 @@ export function ResourcesCard({}: Props) {
     <Container>
       <Wrapper>
         <LanguagesContainer>
-          <span>{t("languages")}</span>
+          <span>Languages</span>
 
           <Languages>
-            <span>{t("spanish")} </span> | <span> {t("english")}</span>
+            <span>Spanish </span> | <span> English</span>
           </Languages>
         </LanguagesContainer>
 
         <PrivacyContainer>
           <span>
-            <Links href="#">{t("privacyPolicy")}</Links>
+            <Links href="#">Privacy Policy</Links>
           </span>
           <span>
-            <Links href="#">{t("termsAndConditions")} </Links>
+            <Links href="#">Terms and Conditions </Links>
           </span>
         </PrivacyContainer>
         <SocialContainer>

components/db/testimony/useEditTestimony.ts

@@ -263,7 +263,7 @@ function useSaveDraft(
           })
         }
       },
-      [billId, dispatch, draftLoading, draftRef, uid, court, draft, publication]
+      [billId, dispatch, draftLoading, draftRef, uid, court]
     ),
     { onError: error => dispatch({ type: "error", error }) }
   )