From 55608b4fa33ebb1cc5ec68d4771feccc59f41d17 Mon Sep 17 00:00:00 2001 From: minsik Date: Mon, 7 Oct 2024 18:08:24 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EC=A7=80=EB=B6=95=ED=98=95=EC=83=81=20?= =?UTF-8?q?=EC=88=98=EB=8F=99=EC=84=A4=EC=A0=95=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=88=98=EC=A0=95=20-=20=EC=A7=80?= =?UTF-8?q?=EB=B6=95=ED=98=95=EC=83=81=20=EC=88=98=EB=8F=99=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roofShape/RoofShapePassivitySetting.jsx | 24 ++++++----- .../passivity/{eaves.jsx => Eaves.jsx} | 13 +++--- .../modal/roofShape/passivity/Gable.jsx | 27 ++++++++++++ .../modal/roofShape/passivity/Shed.js | 18 ++++++++ .../modal/roofShape/passivity/gable.jsx | 42 ------------------- .../modal/roofShape/passivity/shed.js | 42 ------------------- src/locales/ja.json | 2 + src/locales/ko.json | 1 + 8 files changed, 69 insertions(+), 100 deletions(-) rename src/components/floor-plan/modal/roofShape/passivity/{eaves.jsx => Eaves.jsx} (81%) create mode 100644 src/components/floor-plan/modal/roofShape/passivity/Gable.jsx create mode 100644 src/components/floor-plan/modal/roofShape/passivity/Shed.js delete mode 100644 src/components/floor-plan/modal/roofShape/passivity/gable.jsx delete mode 100644 src/components/floor-plan/modal/roofShape/passivity/shed.js diff --git a/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx b/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx index 2bd4988a..ccab2321 100644 --- a/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx +++ b/src/components/floor-plan/modal/roofShape/RoofShapePassivitySetting.jsx @@ -1,21 +1,23 @@ import { useState } from 'react' import WithDraggable from '@/components/common/draggable/WithDraggable' -import Eaves from '@/components/floor-plan/modal/roofShape/passivity/eaves' -import Gable from '@/components/floor-plan/modal/roofShape/passivity/gable' -import Shed from '@/components/floor-plan/modal/roofShape/passivity/shed' +import Eaves from '@/components/floor-plan/modal/roofShape/passivity/Eaves' +import Gable from '@/components/floor-plan/modal/roofShape/passivity/Gable' +import Shed from '@/components/floor-plan/modal/roofShape/passivity/Shed' +import { useMessage } from '@/hooks/useMessage' export default function RoofShapePassivitySetting({ setShowRoofShapePassivitySettingModal }) { + const { getMessage } = useMessage() const [buttonAct, setButtonAct] = useState(1) const buttons = [ - { id: 1, name: '軒' }, - { id: 2, name: 'ケラバ' }, - { id: 3, name: '漂流' }, + { id: 1, name: getMessage('eaves') }, + { id: 2, name: getMessage('gable') }, + { id: 3, name: getMessage('windage') }, ] return (
-

屋根形状の設定

+

{getMessage('plan.menu.roof.cover.roof.shape.passivity.setting')}

@@ -29,19 +31,19 @@ export default function RoofShapePassivitySetting({ setShowRoofShapePassivitySet ))}
-
設定
+
{getMessage('setting')}
{buttonAct === 1 && } {buttonAct === 2 && } {buttonAct === 3 && }
- - + +
- +
diff --git a/src/components/floor-plan/modal/roofShape/passivity/eaves.jsx b/src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx similarity index 81% rename from src/components/floor-plan/modal/roofShape/passivity/eaves.jsx rename to src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx index 99286117..963cfa63 100644 --- a/src/components/floor-plan/modal/roofShape/passivity/eaves.jsx +++ b/src/components/floor-plan/modal/roofShape/passivity/Eaves.jsx @@ -1,18 +1,21 @@ +import { useMessage } from '@/hooks/useMessage' + export default function Eaves() { + const { getMessage } = useMessage() return ( <>
- 傾斜 + {getMessage('slope')}
- 寸法 +
- 軒の + {getMessage('eaves.offset')}
@@ -21,7 +24,7 @@ export default function Eaves() {
- ケラバ 出幅 + {getMessage('gable.offset')}
@@ -30,7 +33,7 @@ export default function Eaves() {
- 片流幅 + {getMessage('shed.width')}
diff --git a/src/components/floor-plan/modal/roofShape/passivity/Gable.jsx b/src/components/floor-plan/modal/roofShape/passivity/Gable.jsx new file mode 100644 index 00000000..e2eb6342 --- /dev/null +++ b/src/components/floor-plan/modal/roofShape/passivity/Gable.jsx @@ -0,0 +1,27 @@ +import { useMessage } from '@/hooks/useMessage' + +export default function Gable() { + const { getMessage } = useMessage() + return ( + <> +
+ + {getMessage('slope')} + +
+ +
+ +
+
+ + {getMessage('gable.offset')} + +
+ +
+ mm +
+ + ) +} diff --git a/src/components/floor-plan/modal/roofShape/passivity/Shed.js b/src/components/floor-plan/modal/roofShape/passivity/Shed.js new file mode 100644 index 00000000..dfdee92c --- /dev/null +++ b/src/components/floor-plan/modal/roofShape/passivity/Shed.js @@ -0,0 +1,18 @@ +import { useMessage } from '@/hooks/useMessage' + +export default function Shed() { + const { getMessage } = useMessage() + return ( + <> +
+ + {getMessage('shed.width')} + +
+ +
+ mm +
+ + ) +} diff --git a/src/components/floor-plan/modal/roofShape/passivity/gable.jsx b/src/components/floor-plan/modal/roofShape/passivity/gable.jsx deleted file mode 100644 index 848d5d73..00000000 --- a/src/components/floor-plan/modal/roofShape/passivity/gable.jsx +++ /dev/null @@ -1,42 +0,0 @@ -export default function Gable() { - return ( - <> -
- - 傾斜 - -
- -
- 寸法 -
-
- - 軒の - -
- -
- mm -
-
- - ケラバ 出幅 - -
- -
- mm -
-
- - 片流幅 - -
- -
- mm -
- - ) -} diff --git a/src/components/floor-plan/modal/roofShape/passivity/shed.js b/src/components/floor-plan/modal/roofShape/passivity/shed.js deleted file mode 100644 index 8e767772..00000000 --- a/src/components/floor-plan/modal/roofShape/passivity/shed.js +++ /dev/null @@ -1,42 +0,0 @@ -export default function Shed() { - return ( - <> -
- - 傾斜 - -
- -
- 寸法 -
-
- - 軒の - -
- -
- mm -
-
- - ケラバ 出幅 - -
- -
- mm -
-
- - 片流幅 - -
- -
- mm -
- - ) -} diff --git a/src/locales/ja.json b/src/locales/ja.json index 9dd89a42..5250a0fa 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -39,6 +39,7 @@ "plan.menu.roof.cover": "지붕덮개", "plan.menu.roof.cover.outline.drawing": "外壁線を描", "plan.menu.roof.cover.roof.shape.setting": "屋根形状設定", + "plan.menu.roof.cover.roof.shape.passivity.setting": "屋根形状設定", "plan.menu.roof.cover.roof.shape.edit": "지붕형상 편집", "plan.menu.roof.cover.auxiliary.line.drawing": "補助線を描", "plan.menu.roof.cover.roof.surface.alloc": "지붕면 할당", @@ -333,5 +334,6 @@ "jerkinhead.width": "半折先幅", "jerkinhead.slope": "半折先傾斜", "shed.width": "片流幅", + "windage": "漂流", "windage.width": "漂流の出幅" } diff --git a/src/locales/ko.json b/src/locales/ko.json index b5e6b5c2..d29df3d0 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -340,5 +340,6 @@ "jerkinhead.width": "반절처 폭", "jerkinhead.slope": "반절처 경사", "shed.width": "한쪽흐름 폭", + "windage": "편류", "windage.width": "편류의 출폭" }