From 62ef25c048e6b9aebc1b02b95c0a7be4a0472a20 Mon Sep 17 00:00:00 2001
From: minsik <pro.mskim0215@gmail.com>
Date: Mon, 4 Nov 2024 17:36:18 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EB=A1=9C=20=EB=B0=8F=20=EA=B0=80?=
 =?UTF-8?q?=EB=8C=80=20=EC=84=A4=EC=A0=95=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circuitTrestle/CircuitTrestleSetting.jsx  |  6 ++++-
 .../step/PowerConditionalSelect.jsx           |  6 ++---
 .../modal/circuitTrestle/step/StepUp.jsx      | 26 +++++++++----------
 .../step/type/PassivityCircuitAllocation.jsx  |  4 +--
 src/locales/ja.json                           |  9 +++++++
 src/locales/ko.json                           |  9 +++++++
 6 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
index 36082642..a71036c6 100644
--- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
@@ -50,7 +50,11 @@ export default function CircuitTrestleSetting({ id }) {
                 Next
               </button>
             )}
-            {tabNum === 3 && <button className="btn-frame modal act">保存 (仮割り当て)</button>}
+            {tabNum === 3 && (
+              <button className="btn-frame modal act">
+                {`${getMessage('modal.common.save')} (${getMessage('modal.circuit.trestle.setting.alloc.trestle')})`}
+              </button>
+            )}
           </div>
         </div>
       </div>
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
index 9eadeb7f..927f973b 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/PowerConditionalSelect.jsx
@@ -114,7 +114,7 @@ export default function PowerConditionalSelect({ setTabNum }) {
             </div>
           </div>
           <div className="circuit-right-wrap mb10">
-            <button className="btn-frame self mr5">追加</button>
+            <button className="btn-frame self mr5">{getMessage('modal.common.add')}</button>
           </div>
           <div className="circuit-data-form">
             <span className="normal-font">
@@ -132,12 +132,12 @@ export default function PowerConditionalSelect({ setTabNum }) {
       <div className="slope-wrap">
         <div className="d-check-box pop mb15">
           <input type="checkbox" id="ch03" />
-          <label htmlFor="ch03">同一傾斜同一方面の面積の場合、同じ面として回路を分ける。</label>
+          <label htmlFor="ch03"> {getMessage('modal.circuit.trestle.setting.power.conditional.select.check1')}</label>
         </div>
         <div className="d-check-box pop">
           <input type="checkbox" id="ch04" />
           <label className="red" htmlFor="ch04">
-            MAX接続（過積）で回路を分ける。
+            {getMessage('modal.circuit.trestle.setting.power.conditional.select.check2')}
           </label>
         </div>
       </div>
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
index 6a11ed71..bfb8422c 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
@@ -18,8 +18,8 @@ export default function StepUp({}) {
                   <table>
                     <thead>
                       <tr>
-                        <th>シリアル枚数</th>
-                        <th>総回路数</th>
+                        <th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.serial.amount')}</th>
+                        <th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.total.amount')}</th>
                       </tr>
                     </thead>
                     <tbody>
@@ -49,14 +49,14 @@ export default function StepUp({}) {
               </div>
               <div className="circuit-table-flx-wrap">
                 <div className="circuit-table-flx-box">
-                  <div className="bold-font mb10">接続する</div>
+                  <div className="bold-font mb10">{getMessage('modal.circuit.trestle.setting.step.up.allocation.connected')}</div>
                   <div className="roof-module-table mb10">
                     <table>
                       <thead>
                         <tr>
-                          <th style={{ width: '140px' }}>名称</th>
-                          <th>回路数</th>
-                          <th>昇圧回路数</th>
+                          <th style={{ width: '140px' }}>{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}</th>
+                          <th>{getMessage('modal.circuit.trestle.setting.power.conditional.select.circuit.amount')}</th>
+                          <th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}</th>
                         </tr>
                       </thead>
                       <tbody>
@@ -80,7 +80,7 @@ export default function StepUp({}) {
                   </div>
                   <div className="bottom-wrap">
                     <div className="circuit-right-wrap mb10">
-                      <button className="btn-frame self mr5">追加</button>
+                      <button className="btn-frame self mr5">{getMessage('modal.common.add')}</button>
                     </div>
                     <div className="circuit-data-form">
                       <span className="normal-font">
@@ -90,13 +90,13 @@ export default function StepUp({}) {
                   </div>
                 </div>
                 <div className="circuit-table-flx-box">
-                  <div className="bold-font mb10">昇圧オプション</div>
+                  <div className="bold-font mb10">{getMessage('modal.circuit.trestle.setting.step.up.allocation.option')}</div>
                   <div className="roof-module-table mb10">
                     <table>
                       <thead>
                         <tr>
-                          <th>名称</th>
-                          <th>昇圧回路数</th>
+                          <th>{getMessage('modal.circuit.trestle.setting.power.conditional.select.name')}</th>
+                          <th>{getMessage('modal.circuit.trestle.setting.step.up.allocation.circuit.amount')}</th>
                         </tr>
                       </thead>
                       <tbody>
@@ -113,7 +113,7 @@ export default function StepUp({}) {
                   </div>
                   <div className="bottom-wrap">
                     <div className="circuit-right-wrap mb10">
-                      <button className="btn-frame self mr5">追加</button>
+                      <button className="btn-frame self mr5">{getMessage('modal.common.add')}</button>
                     </div>
                     <div className="circuit-data-form">
                       <span className="normal-font">
@@ -124,7 +124,7 @@ export default function StepUp({}) {
                 </div>
               </div>
               <div className="circuit-count-input">
-                <span className="normal-font">綿調道区分</span>
+                <span className="normal-font">{getMessage('modal.module.basic.setting.module.cotton.classification')}</span>
                 <div className="input-grid mr5" style={{ width: '40px' }}>
                   <input type="text" className="input-origin block" />
                 </div>
@@ -395,7 +395,7 @@ export default function StepUp({}) {
         <div className="slope-wrap">
           <div className="outline-form">
             <span className="mr10" style={{ width: 'auto' }}>
-              モニターの選択
+              {getMessage('modal.circuit.trestle.setting.step.up.allocation.select.monitor')}
             </span>
             <div className="grid-select mr10">
               <QSelectBox title={'電力検出ユニット (モニター付き)'} option={SelectOption01} />
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
index 5233d992..67bb2195 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -4,13 +4,13 @@ export default function PassivityCircuitAllocation() {
   const { getMessage } = useMessage()
   const moduleData = {
     header: [
-      { name: getMessage('屋根面'), prop: 'roofShape' },
+      { name: getMessage('modal.panel.batch.statistic.roof.shape'), prop: 'roofShape' },
       {
         name: getMessage('Q.TRON M-G2'),
         prop: 'moduleName',
       },
       {
-        name: getMessage('発電量 (kW)'),
+        name: `${getMessage('modal.panel.batch.statistic.power.generation.amount')}(kW)`,
         prop: 'powerGeneration',
       },
     ],
diff --git a/src/locales/ja.json b/src/locales/ja.json
index e4605537..390b3fe7 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -123,6 +123,7 @@
   "modal.module.basic.setting.auto.placement": "設定値に自動配置",
   "plan.menu.module.circuit.setting.circuit.trestle.setting": "回路と架台の設定",
   "modal.circuit.trestle.setting": "回路と架台設定",
+  "modal.circuit.trestle.setting.alloc.trestle": "仮割り当て",
   "modal.circuit.trestle.setting.power.conditional.select": "パワーコンディショナーを選択",
   "modal.circuit.trestle.setting.power.conditional.select.name": "名称",
   "modal.circuit.trestle.setting.power.conditional.select.rated.output": "定格出力",
@@ -130,6 +131,8 @@
   "modal.circuit.trestle.setting.power.conditional.select.max.connection": "最大接続枚数",
   "modal.circuit.trestle.setting.power.conditional.select.max.overload": "過積最大枚数",
   "modal.circuit.trestle.setting.power.conditional.select.output.current": "出力電流",
+  "modal.circuit.trestle.setting.power.conditional.select.check1": "同一傾斜同一方面の面積の場合、同じ面として回路を分ける。",
+  "modal.circuit.trestle.setting.power.conditional.select.check2": "MAX接続（過積）で回路を分ける。",
   "modal.circuit.trestle.setting.circuit.allocation": "回路割り当て",
   "modal.circuit.trestle.setting.circuit.allocation.auto": "自動回路割り当て",
   "modal.circuit.trestle.setting.circuit.allocation.passivity": "手動回路割当",
@@ -140,6 +143,12 @@
   "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "すべての回路番号の初期化",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "番号確定",
   "modal.circuit.trestle.setting.step.up.allocation": "昇圧設定",
+  "modal.circuit.trestle.setting.step.up.allocation.serial.amount": "シリアル枚数",
+  "modal.circuit.trestle.setting.step.up.allocation.total.amount": "総回路数",
+  "modal.circuit.trestle.setting.step.up.allocation.connected": "接続する",
+  "modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "昇圧回路数",
+  "modal.circuit.trestle.setting.step.up.allocation.option": "昇圧オプション",
+  "modal.circuit.trestle.setting.step.up.allocation.select.monitor": "モニターの選択",
   "plan.menu.module.circuit.setting.plan.orientation": "図面方位の適用",
   "plan.menu.estimate": "見積",
   "plan.menu.estimate.roof.alloc": "屋根面の割り当て",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 03443a0b..5f3fd48d 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -127,6 +127,7 @@
   "modal.module.basic.setting.auto.placement": "설정값으로 자동 배치",
   "plan.menu.module.circuit.setting.circuit.trestle.setting": "회로 및 가대 설정",
   "modal.circuit.trestle.setting": "회로 및 가대설정",
+  "modal.circuit.trestle.setting.alloc.trestle": "가대할당",
   "modal.circuit.trestle.setting.power.conditional.select": "파워컨디셔너 선택",
   "modal.circuit.trestle.setting.power.conditional.select.name": "명칭",
   "modal.circuit.trestle.setting.power.conditional.select.rated.output": "정격출력",
@@ -134,6 +135,8 @@
   "modal.circuit.trestle.setting.power.conditional.select.max.connection": "최대접속매수",
   "modal.circuit.trestle.setting.power.conditional.select.max.overload": "과적최대매수",
   "modal.circuit.trestle.setting.power.conditional.select.output.current": "출력전류",
+  "modal.circuit.trestle.setting.power.conditional.select.check1": "동일경사 동일 방면의 면적인 경우, 같은 면으로서 회로를 나눈다.",
+  "modal.circuit.trestle.setting.power.conditional.select.check2": "MAX 접속(과적)으로 회로를 나눈다.",
   "modal.circuit.trestle.setting.circuit.allocation": "회로 할당",
   "modal.circuit.trestle.setting.circuit.allocation.auto": "자동 회로 할당",
   "modal.circuit.trestle.setting.circuit.allocation.passivity": "수동 회로 할당",
@@ -144,6 +147,12 @@
   "modal.circuit.trestle.setting.circuit.allocation.passivity.all.power.conditional.reset": "모든 회로번호 초기화",
   "modal.circuit.trestle.setting.circuit.allocation.passivity.circuit.num.fix": "번호 확정",
   "modal.circuit.trestle.setting.step.up.allocation": "승압 설정",
+  "modal.circuit.trestle.setting.step.up.allocation.serial.amount": "직렬매수",
+  "modal.circuit.trestle.setting.step.up.allocation.total.amount": "총 회로수",
+  "modal.circuit.trestle.setting.step.up.allocation.connected": "연결함",
+  "modal.circuit.trestle.setting.step.up.allocation.circuit.amount": "승압회로수",
+  "modal.circuit.trestle.setting.step.up.allocation.option": "승압옵션",
+  "modal.circuit.trestle.setting.step.up.allocation.select.monitor": "모니터 선택",
   "plan.menu.module.circuit.setting.plan.orientation": "도면 방위 적용",
   "plan.menu.estimate": "견적서",
   "plan.menu.estimate.roof.alloc": "지붕면 할당",