From f1d976521dbe62b198176774da51102979366596 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 24 Mar 2025 10:55:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#=20932=20-=20pcs=20=ED=95=9C=EA=B5=AD?= =?UTF-8?q?=EC=96=B4=20=EA=B8=B0=EC=9E=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../floor-plan/modal/circuitTrestle/step/StepUp.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx index d776476b..0e8ad7b6 100644 --- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx +++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx @@ -573,7 +573,7 @@ export default function StepUp(props) { value={seletedMainOption} sourceKey="code" targetKey="code" - showKey="name" + showKey={`${globalLocale === 'ja' ? 'nameJp' : 'name'}`} onChange={(e) => setSeletedMainOption(e)} /> )} @@ -586,7 +586,7 @@ export default function StepUp(props) { value={seletedSubOption} sourceKey="code" targetKey="code" - showKey="name" + showKey={`${globalLocale === 'ja' ? 'nameJp' : 'name'}`} onChange={(e) => setSeletedSubOption(e)} /> )} From 1ba9853a3229e90769ca4cfa5389744acba459f9 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Mon, 24 Mar 2025 11:06:35 +0900 Subject: [PATCH 2/2] =?UTF-8?q?#935=20=EC=A0=84=EB=B0=98/=EA=B8=80?= =?UTF-8?q?=EC=9E=90=ED=91=9C=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/module/useTrestle.js | 6 ++++-- src/locales/ja.json | 5 +++-- src/locales/ko.json | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js index 48ad5913..be795814 100644 --- a/src/hooks/module/useTrestle.js +++ b/src/hooks/module/useTrestle.js @@ -10,6 +10,7 @@ import { useSwal } from '@/hooks/useSwal' import { useContext } from 'react' import { QcastContext } from '@/app/QcastProvider' import { useCircuitTrestle } from '@/hooks/useCirCuitTrestle' +import { useMessage } from '@/hooks/useMessage' // 모듈간 같은 행, 열의 마진이 10 이하인 경우는 같은 행, 열로 간주 const MODULE_MARGIN = 10 @@ -26,6 +27,7 @@ export const useTrestle = () => { const { getSelectedPcsItemList } = useCircuitTrestle() const { resetCircuits } = useCircuitTrestle() + const { getMessage } = useMessage() const apply = () => { const notAllocationModules = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE && !obj.circuit) @@ -131,9 +133,9 @@ export const useTrestle = () => { surface.isChidory = isChidory if (plvrYn === 'N' && isChidory) { - swalFire({ text: '치조불가공법입니다.', icon: 'error' }) + swalFire({ text: getMessage('chidory.can.not.install'), icon: 'error' }) clear() - throw new Error('치조불가공법입니다.') + throw new Error(getMessage('chidory.can.not.install')) } surface.set({ isChidory: isChidory }) diff --git a/src/locales/ja.json b/src/locales/ja.json index abc9b5cf..3bbc5344 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -128,7 +128,7 @@ "modal.module.basic.setting.pitch.module.row.margin": "上下間隔", "modal.module.basic.setting.pitch.module.column.amount": "列数", "modal.module.basic.setting.pitch.module.column.margin": "左右間隔", - "modal.module.basic.setting.prev": "移転", + "modal.module.basic.setting.prev": "前に戻る", "modal.module.basic.setting.passivity.placement": "手動配置", "modal.module.basic.setting.auto.placement": "設定値に自動配置", "plan.menu.module.circuit.setting.circuit.trestle.setting": "回路設定", @@ -1040,5 +1040,6 @@ "modal.placement.initial.setting.plan.drawing.only.number": "(※数字は[半角]入力のみ可能です。)", "wall.line.not.found": "外壁がありません", "roof.line.not.found": "屋根形状がありません", - "roof.material.can.not.delete": "割り当てられた配置面があります。" + "roof.material.can.not.delete": "割り当てられた配置面があります。", + "chidory.can.not.install" : "千鳥配置できない工法です。" } diff --git a/src/locales/ko.json b/src/locales/ko.json index 3ea284e2..f7dca490 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1040,5 +1040,6 @@ "modal.placement.initial.setting.plan.drawing.only.number": "(※ 숫자는 [반각]입력만 가능합니다.)", "wall.line.not.found": "외벽선이 없습니다.", "roof.line.not.found": "지붕형상이 없습니다.", - "roof.material.can.not.delete": "할당된 배치면이 있습니다." + "roof.material.can.not.delete": "할당된 배치면이 있습니다.", + "chidory.can.not.install" : "치조 불가 공법입니다." }