Commit f105fc64 by Kang Donghun

Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web'

#50854 言語表示修正

See merge request !103
parents 068dcd1f a7fdd1b2
......@@ -122,5 +122,6 @@
"close":"Close",
"dateError": "Set the start date before the end date.",
"onlyRfid":"RFID or barcode is set.\nPlease scan the code.",
"errorOccured": "Communication error."
"errorOccured": "Communication error.",
"selectData": "Choice"
}
\ No newline at end of file
......@@ -120,5 +120,6 @@
"close":"閉じる",
"dateError": "開始日は終了日の前に設定してください。",
"onlyRfid":"RFID又はバーコードが設定されています。\n該当コードを読み込んでください。",
"errorOccured": "通信エラーです。"
"errorOccured": "通信エラーです。",
"selectData": "選択"
}
\ No newline at end of file
......@@ -119,5 +119,6 @@
"close":"Close",
"dateError": "시작일은 종료일 이전에 설정하십시오.",
"onlyRfid":"RFID또는 바코드가 설정되어있습니다.\n해당코드를 스캔해주십시오.",
"errorOccured": "통신 오류입니다."
"errorOccured": "통신 오류입니다.",
"selectData": "선택"
}
\ No newline at end of file
......@@ -60,7 +60,7 @@
<div class="form-group p-2 mb-0">
<label class="lang" lang="startDate"></label>
<div class="input-group date" id="datetimepicker1" data-target-input="nearest">
<input type="text" name="start" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker1" placeholder="選択" id="searchStartDate">
<input type="text" name="start" class="form-control form-control-sm datetimepicker-input lang" data-target="#datetimepicker1" lang="selectData" placeholder="" id="searchStartDate">
<div class="input-group-append" data-target="#datetimepicker1" data-toggle="datetimepicker">
<div class="input-group-text py-1 px-2">
<img src="../common/img/icon_calendar.svg" type="image" alt="" class="calendar-icon lang" lang="calendar">
......@@ -71,7 +71,7 @@
<div class="form-group p-2 mb-0">
<label class="lang" lang="endDate"></label>
<div class="input-group date" id="datetimepicker2" data-target-input="nearest">
<input type="text" name="end" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" placeholder="選択" id="searchEndDate">
<input type="text" name="end" class="form-control form-control-sm datetimepicker-input lang" data-target="#datetimepicker2" lang="selectData" placeholder="" id="searchEndDate">
<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
<div class="input-group-text py-1 px-2">
<img src="../common/img/icon_calendar.svg" type="image" alt="" class="calendar-icon lang" lang="calendar">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment