From 3f9ede7aedd9db8a1330a8169a8af392e0a591a2 Mon Sep 17 00:00:00 2001 From: "oura.a" Date: Wed, 5 Jul 2023 04:12:40 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20197:=20[=E5=82=99=E5=BF=98]=20?= =?UTF-8?q?=E5=AE=9F=E8=A3=85=E4=B8=8A=E3=80=81=E5=8F=96=E3=82=8A=E8=BE=BC?= =?UTF-8?q?=E3=81=BF=E3=82=92=E3=80=8Cimport=E3=80=8D=E3=81=AE=E8=8B=B1?= =?UTF-8?q?=E5=8D=98=E8=AA=9E=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8B=E7=AE=87=E6=89=80=E3=82=92=E3=80=8Cactivate=E3=80=8D?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task2003: [備忘] 実装上、取り込みを「import」の英単語を使っている箇所を「activate」に変更する](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/2003) ライセンス取り込み部分の文言・内部の変数等を「import」→「activate」に変更 ## レビューポイント 過不足がないか。 ## UIの変更 「カードライセンス取り込みボタン」の文言が変更 ## 動作確認状況 ローカルで確認 ## 補足 なし --- ...Popup.tsx => cardLicenseActivatePopup.tsx} | 12 +++++------ .../src/pages/LicensePage/licenseSummary.tsx | 20 +++++++++---------- dictation_client/src/translation/de.json | 2 +- dictation_client/src/translation/en.json | 2 +- dictation_client/src/translation/es.json | 2 +- dictation_client/src/translation/fr.json | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) rename dictation_client/src/pages/LicensePage/{cardLicenseImportPopup.tsx => cardLicenseActivatePopup.tsx} (87%) diff --git a/dictation_client/src/pages/LicensePage/cardLicenseImportPopup.tsx b/dictation_client/src/pages/LicensePage/cardLicenseActivatePopup.tsx similarity index 87% rename from dictation_client/src/pages/LicensePage/cardLicenseImportPopup.tsx rename to dictation_client/src/pages/LicensePage/cardLicenseActivatePopup.tsx index d2f64da..71a1d6d 100644 --- a/dictation_client/src/pages/LicensePage/cardLicenseImportPopup.tsx +++ b/dictation_client/src/pages/LicensePage/cardLicenseActivatePopup.tsx @@ -2,13 +2,13 @@ import React, { useCallback } from "react"; import styles from "styles/app.module.scss"; import close from "../../assets/images/close.svg"; -interface CardLicenseImportPopupProps { +interface CardLicenseActivatePopupProps { onClose: () => void; } -export const CardLicenseImportPopup: React.FC = ( - props -) => { +export const CardLicenseActivatePopup: React.FC< + CardLicenseActivatePopupProps +> = (props) => { const { onClose } = props; // ポップアップを閉じる処理 @@ -21,7 +21,7 @@ export const CardLicenseImportPopup: React.FC = (

- Import License Key + Activate License Key @@ -45,7 +45,7 @@ export const CardLicenseImportPopup: React.FC = ( diff --git a/dictation_client/src/pages/LicensePage/licenseSummary.tsx b/dictation_client/src/pages/LicensePage/licenseSummary.tsx index 5075497..9d0d129 100644 --- a/dictation_client/src/pages/LicensePage/licenseSummary.tsx +++ b/dictation_client/src/pages/LicensePage/licenseSummary.tsx @@ -17,7 +17,7 @@ import key from "../../assets/images/key.svg"; import lock from "../../assets/images/lock.svg"; import lockOpen from "../../assets/images/lock_open.svg"; import { LicenseOrderPopup } from "./licenseOrderPopup"; -import { CardLicenseImportPopup } from "./cardLicenseImportPopup"; +import { CardLicenseActivatePopup } from "./cardLicenseActivatePopup"; const LicenseSummary: React.FC = (): JSX.Element => { const dispatch: AppDispatch = useDispatch(); @@ -25,16 +25,16 @@ const LicenseSummary: React.FC = (): JSX.Element => { // popup制御関係 const [islicenseOrderPopupOpen, setIslicenseOrderPopupOpen] = useState(false); - const [isCardLicenseImportPopupOpen, setIsCardLicenseImportPopupOpen] = + const [isCardLicenseActivatePopupOpen, setIsCardLicenseActivatePopupOpen] = useState(false); const onlicenseOrderOpen = useCallback(() => { setIslicenseOrderPopupOpen(true); }, [setIslicenseOrderPopupOpen]); - const onCardLicenseImportOpen = useCallback(() => { - setIsCardLicenseImportPopupOpen(true); - }, [setIsCardLicenseImportPopupOpen]); + const onCardLicenseActivateOpen = useCallback(() => { + setIsCardLicenseActivatePopupOpen(true); + }, [setIsCardLicenseActivatePopupOpen]); // apiからの値取得関係 const licenseSummaryInfo = useSelector(selecLicenseSummaryInfo); @@ -53,10 +53,10 @@ const LicenseSummary: React.FC = (): JSX.Element => { }} /> )} - {isCardLicenseImportPopupOpen && ( - { - setIsCardLicenseImportPopupOpen(false); + setIsCardLicenseActivatePopupOpen(false); }} /> )} @@ -108,12 +108,12 @@ const LicenseSummary: React.FC = (): JSX.Element => { {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events,jsx-a11y/no-static-element-interactions */} {t( getTranslationID( - "LicenseSummaryPage.label.importLicenseKey" + "LicenseSummaryPage.label.activateLicenseKey" ) )} diff --git a/dictation_client/src/translation/de.json b/dictation_client/src/translation/de.json index 6ad8b69..fd41e6a 100644 --- a/dictation_client/src/translation/de.json +++ b/dictation_client/src/translation/de.json @@ -141,7 +141,7 @@ "subTitle": "(de)EFGI Legal", "orderLicense": "(de)Order License", "orderHistory": "(de)Order History", - "importLicenseKey": "(de)Import License Key", + "activateLicenseKey": "(de)Activate License Key", "totalLicense": "(de)Total license", "allocatedLicense": "(de)Allocated license", "reusableLicense": "(de)Reusable license", diff --git a/dictation_client/src/translation/en.json b/dictation_client/src/translation/en.json index d53683f..4f76dd7 100644 --- a/dictation_client/src/translation/en.json +++ b/dictation_client/src/translation/en.json @@ -141,7 +141,7 @@ "subTitle": "EFGI Legal", "orderLicense": "Order License", "orderHistory": "Order History", - "importLicenseKey": "Import License Key", + "activateLicenseKey": "Activate License Key", "totalLicense": "Total license", "allocatedLicense": "Allocated license", "reusableLicense": "Reusable license", diff --git a/dictation_client/src/translation/es.json b/dictation_client/src/translation/es.json index a90c49d..d31f6e1 100644 --- a/dictation_client/src/translation/es.json +++ b/dictation_client/src/translation/es.json @@ -141,7 +141,7 @@ "subTitle": "(es)EFGI Legal", "orderLicense": "(es)Order License", "orderHistory": "(es)Order History", - "importLicenseKey": "(es)Import License Key", + "activateLicenseKey": "(es)Activate License Key", "totalLicense": "(es)Total license", "allocatedLicense": "(es)Allocated license", "reusableLicense": "(es)Reusable license", diff --git a/dictation_client/src/translation/fr.json b/dictation_client/src/translation/fr.json index a35744f..b4f2b68 100644 --- a/dictation_client/src/translation/fr.json +++ b/dictation_client/src/translation/fr.json @@ -141,7 +141,7 @@ "subTitle": "(fr)EFGI Legal", "orderLicense": "(fr)Order License", "orderHistory": "(fr)Order History", - "importLicenseKey": "(fr)Import License Key", + "activateLicenseKey": "(fr)Activate License Key", "totalLicense": "(fr)Total license", "allocatedLicense": "(fr)Allocated license", "reusableLicense": "(fr)Reusable license",