Merge pull request #235 from pyconjp/UpdateTopAndNOCPage

謝罪文の掲載
pyconjp · Oct 29, 2023 · 12cf586 · 12cf586
2 parents 99177c1 + 2835395
commit 12cf586
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 34 deletions.
diff --git a/src/components/sections/Hero.tsx b/src/components/sections/Hero.tsx
@@ -30,20 +30,20 @@ export default function HeroSection() {
                             <div className="flex sm:flex-row flex-col">
                                 <h2 suppressHydrationWarning className="text-tertiary-900 font-bold text-2xl">{t("VENUE")}</h2>
                                 <a
-                                  href="https://www.toc.co.jp/saiji/ariake/access/"
-                                  target="_blank"
-                                  rel="noopener noreferrer"
-                                  suppressHydrationWarning
-                                  className="hover:opacity-70 text-lg text-secondary-600 font-bold underline underline-offset-8"
+                                    href="https://www.toc.co.jp/saiji/ariake/access/"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    suppressHydrationWarning
+                                    className="hover:opacity-70 text-lg text-secondary-600 font-bold underline underline-offset-8"
                                 >
                                     <div className="flex flex-row sm:mx-[16px]">
                                         <p suppressHydrationWarning>{t("VENUE_INFO")}</p>
                                         <Image
-                                          src={"/linkout_b.svg"}
-                                          alt={""}
-                                          width={20}
-                                          height={20}
-                                          className="object-contain ml-[5px]"
+                                            src={"/linkout_b.svg"}
+                                            alt={""}
+                                            width={20}
+                                            height={20}
+                                            className="object-contain ml-[5px]"
                                         />
                                     </div>
                                 </a>
@@ -70,20 +70,20 @@ export default function HeroSection() {
                             <div className="flex sm:flex-row flex-col">
                                 <h2 suppressHydrationWarning className="text-tertiary-900 font-bold text-2xl">{t("VENUE_SPRINT")}</h2>
                                 <a
-                                  href="https://hennge.com/jp/about/map/"
-                                  target="_blank"
-                                  rel="noopener noreferrer"
-                                  suppressHydrationWarning
-                                  className="hover:opacity-70 text-lg text-secondary-600 font-bold underline underline-offset-8"
+                                    href="https://hennge.com/jp/about/map/"
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                    suppressHydrationWarning
+                                    className="hover:opacity-70 text-lg text-secondary-600 font-bold underline underline-offset-8"
                                 >
                                     <div className="flex flex-row sm:mx-[16px]">
                                         <p suppressHydrationWarning>{t("VENUE_INFO")}</p>
                                         <Image
-                                          src={"/linkout_b.svg"}
-                                          alt={""}
-                                          width={20}
-                                          height={20}
-                                          className="object-contain ml-[5px]"
+                                            src={"/linkout_b.svg"}
+                                            alt={""}
+                                            width={20}
+                                            height={20}
+                                            className="object-contain ml-[5px]"
                                         />
                                     </div>
                                 </a>
@@ -101,12 +101,9 @@ export default function HeroSection() {
                     </div>
                 </div>
 
-                <a href="https://pretix.eu/pyconjp/2023-apac/"
-                    className="bg-alt-black hover:bg-secondary-700 rounded text-center text-alt-white w-full py-[14px]"
-                ><span>{t("TICKET_INFO")}</span></a>
                 <div className='mt-8 bg-primary-50 w-10/12 p-6 rounded border-alt-black border-2'>
-                  <div className='text-lg font-bold text-primary-600'>{t('REGISTRATION_FLOW.TITLE', {ns: 'ATTENTION'})}</div>
-                  <div className='mt-2 whitespace-pre-line'>{t('REGISTRATION_FLOW.DESCRIPTION', {ns: 'ATTENTION'})}</div>
+                    <div className='text-lg font-bold text-primary-600'>{t('APOLOGIZE.TITLE', { ns: 'ATTENTION' })}</div>
+                    <div className='mt-2 whitespace-pre-line'>{t('APOLOGIZE.DESCRIPTION', { ns: 'ATTENTION' })}</div>
                 </div>
             </div>
         </section>

diff --git a/src/lang/en.ts b/src/lang/en.ts
@@ -227,9 +227,9 @@ const En: Lang = {
       "This is a support in which PyCon JP pays all or part of transportation expenses mainly for distant people.",
   },
   ATTENTION: {
-    REGISTRATION_FLOW: {
-      TITLE: "Registration flow",
-      DESCRIPTION:"Attendees, patrons and speakers need to present their Pretix QR Code at reception. You can either print the QR Code or display it on your smartphone.",
+    APOLOGIZE: {
+      TITLE: "",
+      DESCRIPTION: "",
     }
   }
 };

diff --git a/src/lang/ja.ts b/src/lang/ja.ts
@@ -225,10 +225,9 @@ const Ja: Lang = {
       "主に遠方者を対象に、交通費の全額または一部をPyCon JPが負担する制度です。",
   },
   ATTENTION: {
-    REGISTRATION_FLOW: {
-      TITLE: "当日の入場方法",
-      DESCRIPTION:"一般参加者、パトロン、スピーカーの方はPretixで購入した後に送付されるQRコードを入場受付スタッフにお見せください。\n" +
-        "見せる方法は、QRコードを印刷したもの及び、スマートフォンで表示させるものどちらでも可能です。",
+    APOLOGIZE: {
+      TITLE: "お詫び",
+      DESCRIPTION: "NOC コンテンツの一部につきまして、プライバシーの配慮に欠けた内容が含まれておりました。\n当該コンテンツについて公開停止措置を行いました。\n      ご不快に感じられた参加者の方々に深くお詫びすると共に\n会場WiFi利用者の皆様に重ねてお詫び申し上げます。",
     }
   }
 };

diff --git a/src/pages/noc.tsx b/src/pages/noc.tsx
@@ -32,7 +32,7 @@ export const RealtimeMonitorComponent = () => {
       <SectionTitle title={'Real-time Monitor'} subTitle={t("NOC.REALTIMEMONITOR")} />
       <div className={"my-12 lg:w-8/12 w-10/12 mx-auto"}>
         <div className='font-bold text-center'>
-          機材障害により公開中断中
+          公開停止
         </div>
       </div>
     </>

diff --git a/src/types/lang.ts b/src/types/lang.ts
@@ -182,7 +182,7 @@ export type Lang = {
     DISTANT_DESCRIPTION: string;
   };
   ATTENTION: {
-    REGISTRATION_FLOW: {
+    APOLOGIZE: {
       TITLE: string;
       DESCRIPTION: string;
     }