From 6b35b79dea997d0ab070b4f58da0303196918e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eckhart=20W=C3=B6rner?= Date: Wed, 27 Mar 2024 18:00:56 +0100 Subject: [PATCH 01/57] Add confirmation message for account verification removal Closes #361 --- .../verify-account/VerifyAccount.tsx | 24 ++++++++++--------- src/locales/de/translation.json | 1 + src/locales/en/translation.json | 1 + src/locales/es/translation.json | 1 + 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/components/verify-account/VerifyAccount.tsx b/src/components/verify-account/VerifyAccount.tsx index 6d214d3a..f1eb423c 100644 --- a/src/components/verify-account/VerifyAccount.tsx +++ b/src/components/verify-account/VerifyAccount.tsx @@ -109,17 +109,19 @@ const VerifyAccount: React.FC = ({ }, [dispatchWithLoading, refreshToken, setIssues]) const onUnlinkUser = useCallback(() => { - dispatchWithLoading(unlinkUser(), undefined, (err) => - setIssues([ - { - key: 'unlink', - message: err.message, - type: 'error', - field: 'verify', - }, - ]) - ) - }, [dispatchWithLoading, setIssues]) + if (confirm(t('account.linking.unlinkWarning'))) { + dispatchWithLoading(unlinkUser(), undefined, (err) => + setIssues([ + { + key: 'unlink', + message: err.message, + type: 'error', + field: 'verify', + }, + ]) + ) + } + }, [dispatchWithLoading, setIssues, t]) const onAbort = useCallback(() => { if (currentUser.verificationAgent) { diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json index f49cd37c..364f752d 100644 --- a/src/locales/de/translation.json +++ b/src/locales/de/translation.json @@ -6,6 +6,7 @@ "title": "Ingress Account-Verknüpfung", "change": "Verknüpften Account ändern", "unlink": "Verknüpfung aufheben", + "unlinkWarning": "Da das Ingress Community Forum eingestellt wird, wirst du deinen Account ab dem 1. April 2024 nicht mehr mit deinem Bannergress-Profil verknüpfen können. Trotzdem fortfahren?", "link": "Ingress-Account verknüpfen", "none": "Kein Account mit deinem Bannergress-Profil verknüpft", "linked": "Verknüpfter Account: ", diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index df853d16..a0d22be0 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -6,6 +6,7 @@ "title": "Ingress account linking", "change": "Change Linked Account", "unlink": "Unlink Account", + "unlinkWarning": "Due to the shutdown of the Ingress Community Forum, you won't be able to link your account after April 1st, 2004. Continue anyway?", "link": "Link Ingress Account", "none": "No account linked to your Bannergress profile", "linked": "Account linked: ", diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json index c742ebd1..48e98dbb 100644 --- a/src/locales/es/translation.json +++ b/src/locales/es/translation.json @@ -6,6 +6,7 @@ "title": "Vincular cuenta de Ingress", "change": "Cambiar cuenta asociada", "unlink": "Desvincular cuenta", + "unlinkWarning": "Due to the shutdown of the Ingress Community Forum, you won't be able to link your account after April 1st, 2004. Continue anyway?", "link": "Vincular cuenta de Ingress", "none": "No tienes cuenta de Ingress asociada a la de Bannergress", "linked": "Cuenta asociada: ", From 9466a2c96cf8ff88da74ffa82538da427a30d555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eckhart=20W=C3=B6rner?= Date: Wed, 27 Mar 2024 18:08:37 +0100 Subject: [PATCH 02/57] Fix translation keys Closes #356 --- src/components/banner-info-card/BannerInfoCard.tsx | 2 +- src/components/verify-account/VerifyAccount.tsx | 2 +- src/locales/es/translation.json | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/banner-info-card/BannerInfoCard.tsx b/src/components/banner-info-card/BannerInfoCard.tsx index 8cf29942..f20e60e4 100644 --- a/src/components/banner-info-card/BannerInfoCard.tsx +++ b/src/components/banner-info-card/BannerInfoCard.tsx @@ -282,7 +282,7 @@ const getInGameTime = (banner: Banner, t: TFunction) => {
{totalTimeInMS === 0 ? ( - {t('banners.missingData')} + {t('missingData')} ) : ( diff --git a/src/components/verify-account/VerifyAccount.tsx b/src/components/verify-account/VerifyAccount.tsx index f1eb423c..a4a94ea8 100644 --- a/src/components/verify-account/VerifyAccount.tsx +++ b/src/components/verify-account/VerifyAccount.tsx @@ -266,7 +266,7 @@ const VerifyAccount: React.FC = ({ {t('buttons.back')}
diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json index 48e98dbb..5cd3ad4e 100644 --- a/src/locales/es/translation.json +++ b/src/locales/es/translation.json @@ -284,6 +284,7 @@ "missing_other": "faltan {{count}}", "markedOffline": "Misión marcada como no disponible", "viewOnIntel": "Ver misión en el Intel de Ingress", + "viewInScanner": "View in Scanner", "inBanner": "Misiones en el banner", "placeholder": "Misión de relleno {{index}}", "notFound": "No se han encontrado misiones", From 3bc8dbf4848fc6fbd73a5c16e0bc0daebfba625a Mon Sep 17 00:00:00 2001 From: Julien Fiegehenn Date: Wed, 27 Mar 2024 18:16:34 +0000 Subject: [PATCH 03/57] Include link to new open source repo #336 --- src/locales/de/translation.json | 2 +- src/locales/en/translation.json | 2 +- src/locales/es/translation.json | 2 +- src/pages/help/AllQuestions.tsx | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/locales/de/translation.json b/src/locales/de/translation.json index 364f752d..e8b3dfa7 100644 --- a/src/locales/de/translation.json +++ b/src/locales/de/translation.json @@ -244,7 +244,7 @@ "title": "Häufig gefragt", "question1": { "title": "Was ist bannergress.com?", - "answer": "

Nach dem Verlust unserer beliebten Ingress-Fansite haben sich einige Agents zusammengetan, um dieses Projekt auf die Beine zu stellen.

  • alle einbinden
  • Open Source werden (bald)
  • dauerhafte Bibliothek für Banner sein
  • nie aufhören, weiterzuentwickeln
" + "answer": "

Nach dem Verlust unserer beliebten Ingress-Fansite haben sich einige Agents zusammengetan, um dieses Projekt auf die Beine zu stellen. Das Ziel dieses Projektes ist es:

  • alle einzubinden
  • Open Source zu sein
  • die dauerhafte Bibliothek für Banner sein
  • nie aufzuhören, weiterzuentwickeln
" }, "question2": { "title": "Wie bekomme ich Ingress-Missionen nach bannergress.com? (Teil 1: Installation)", diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json index a0d22be0..e11820d2 100644 --- a/src/locales/en/translation.json +++ b/src/locales/en/translation.json @@ -245,7 +245,7 @@ "title": "Frequently Asked", "question1": { "title": "What is bannergress.com?", - "answer": "

After the horrific loss of our favorite Ingress fan page, some agents came together to start this project.

  • get everyone involved
  • be open source (soon™)
  • be the long-term solution for finding banners
  • never stop developing
" + "answer": "

After the horrific loss of our favorite Ingress fan page, some agents came together to start this project. The aim of the project is to:

  • get everyone involved
  • be open source
  • be the long-term solution for finding banners
  • never stop developing
" }, "question2": { "title": "How do I get Ingress missions to bannergress.com? (Part 1: setup)", diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json index 5cd3ad4e..9ea2f45c 100644 --- a/src/locales/es/translation.json +++ b/src/locales/es/translation.json @@ -220,7 +220,7 @@ "title": "Preguntas frecuentes", "question1": { "title": "What is bannergress.com?", - "answer": "

After the horrific loss of our favorite Ingress fan page, some agents came together to start this project.

  • get everyone involved
  • be open source (soon™)
  • be the long-term solution for finding banners
  • never stop developing
" + "answer": "

After the horrific loss of our favorite Ingress fan page, some agents came together to start this project. The aim of the project is to:

  • get everyone involved
  • be open source
  • be the long-term solution for finding banners
  • never stop developing
" }, "question2": { "title": "How do I get Ingress missions to bannergress.com? (Part 1: setup)", diff --git a/src/pages/help/AllQuestions.tsx b/src/pages/help/AllQuestions.tsx index bdf93c90..4ddb0d8c 100644 --- a/src/pages/help/AllQuestions.tsx +++ b/src/pages/help/AllQuestions.tsx @@ -20,6 +20,7 @@ export const AllQuestions: React.FC = () => { , ul: