Merge branch 'dev' into dev-ds

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 Eaves from '@/components/floor-plan/modal/roofShape/passivity/Eaves'
-import Gable from '@/components/floor-plan/modal/roofShape/passivity/gable'
+import Gable from '@/components/floor-plan/modal/roofShape/passivity/Gable'
-import Shed from '@/components/floor-plan/modal/roofShape/passivity/shed'
+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: 1, name: getMessage('eaves') },
-    { id: 2, name: 'ケラバ' },
+    { id: 2, name: getMessage('gable') },
-    { id: 3, name: '漂流' },
+    { id: 3, name: getMessage('windage') },
   ]
   return (
     <WithDraggable isShow={true} pos={{ x: 50, y: -950 }}>
       <div className={`modal-pop-wrap xxm`}>
         <div className="modal-head">
-          <h1 className="title">屋根形状の設定</h1>
+          <h1 className="title">{getMessage('plan.menu.roof.cover.roof.shape.passivity.setting')}</h1>
           <button className="modal-close" onClick={() => setShowRoofShapePassivitySettingModal(false)}>
             닫기
           </button>
@@ -29,19 +31,19 @@ export default function RoofShapePassivitySetting({ setShowRoofShapePassivitySet
             ))}
           </div>
           <div className="modal-bottom-border-bx">
-            <div className="setting-tit">設定</div>
+            <div className="setting-tit">{getMessage('setting')}</div>
             <div className="discrimination-box">
               {buttonAct === 1 && <Eaves />}
               {buttonAct === 2 && <Gable />}
               {buttonAct === 3 && <Shed />}
             </div>
             <div className="grid-btn-wrap">
-              <button className="btn-frame sub-tab mr5">一変戦に戻る</button>
+              <button className="btn-frame sub-tab mr5">{getMessage('common.setting.rollback')}</button>
-              <button className="btn-frame sub-tab act">適用</button>
+              <button className="btn-frame sub-tab act">{getMessage('apply')}</button>
             </div>
           </div>
           <div className="grid-btn-wrap">
-            <button className="btn-frame modal act">設定完了</button>
+            <button className="btn-frame modal act">{getMessage('common.setting.finish')}</button>
           </div>
         </div>
       </div>

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 (
     <>
       <div className="outline-form mb10">
         <span className="mr10" style={{ width: '63px' }}>
-          傾斜
+          {getMessage('slope')}
         </span>
         <div className="input-grid mr5">
           <input type="text" className="input-origin block" defaultValue={100} />
         </div>
-        <span className="thin">寸法</span>
+        <span className="thin">寸</span>
       </div>
       <div className="outline-form mb10">
         <span className="mr10" style={{ width: '63px' }}>
-          軒の
+          {getMessage('eaves.offset')}
         </span>
         <div className="input-grid mr5">
           <input type="text" className="input-origin block" defaultValue={100} />
@@ -21,7 +24,7 @@ export default function Eaves() {
       </div>
       <div className="outline-form mb10">
         <span className="mr10" style={{ width: '63px' }}>
-          ケラバ 出幅
+          {getMessage('gable.offset')}
         </span>
         <div className="input-grid mr5">
           <input type="text" className="input-origin block" defaultValue={100} />
@@ -30,7 +33,7 @@ export default function Eaves() {
       </div>
       <div className="outline-form mb10">
         <span className="mr10" style={{ width: '63px' }}>
-          片流幅
+          {getMessage('shed.width')}
         </span>
         <div className="input-grid mr5">
           <input type="text" className="input-origin block" defaultValue={100} />

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 (
+    <>
+      <div className="outline-form mb10">
+        <span className="mr10" style={{ width: '63px' }}>
+          {getMessage('slope')}
+        </span>
+        <div className="input-grid mr5">
+          <input type="text" className="input-origin block" defaultValue={100} />
+        </div>
+        <span className="thin">寸</span>
+      </div>
+      <div className="outline-form mb10">
+        <span className="mr10" style={{ width: '63px' }}>
+          {getMessage('gable.offset')}
+        </span>
+        <div className="input-grid mr5">
+          <input type="text" className="input-origin block" defaultValue={100} />
+        </div>
+        <span className="thin">mm</span>
+      </div>
+    </>
+  )
+}

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 (
+    <>
+      <div className="outline-form mb10">
+        <span className="mr10" style={{ width: '63px' }}>
+          {getMessage('shed.width')}
+        </span>
+        <div className="input-grid mr5">
+          <input type="text" className="input-origin block" defaultValue={100} />
+        </div>
+        <span className="thin">mm</span>
+      </div>
+    </>
+  )
+}

src/components/floor-plan/modal/roofShape/passivity/gable.jsx

@@ -1,42 +0,0 @@
-export default function Gable() {
-  return (
-    <>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          傾斜
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">寸法</span>
-      </div>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          軒の
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">mm</span>
-      </div>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          ケラバ 出幅
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">mm</span>
-      </div>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          片流幅
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">mm</span>
-      </div>
-    </>
-  )
-}

src/components/floor-plan/modal/roofShape/passivity/shed.js

@@ -1,42 +0,0 @@
-export default function Shed() {
-  return (
-    <>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          傾斜
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">寸法</span>
-      </div>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          軒の
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">mm</span>
-      </div>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          ケラバ 出幅
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">mm</span>
-      </div>
-      <div className="outline-form mb10">
-        <span className="mr10" style={{ width: '63px' }}>
-          片流幅
-        </span>
-        <div className="input-grid mr5">
-          <input type="text" className="input-origin block" defaultValue={100} />
-        </div>
-        <span className="thin">mm</span>
-      </div>
-    </>
-  )
-}

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": "漂流の出幅"
 }

src/locales/ko.json

@@ -340,5 +340,6 @@
   "jerkinhead.width": "반절처 폭",
   "jerkinhead.slope": "반절처 경사",
   "shed.width": "한쪽흐름 폭",
+  "windage": "편류",
   "windage.width": "편류의 출폭"
 }