From 533153dbdf910b62f3d457d3e5d115579879422d Mon Sep 17 00:00:00 2001
From: Suwon Chae <sw.chae@naverlabs.com>
Date: Tue, 26 Mar 2019 14:56:43 +0900
Subject: [PATCH] message: Extract to message file

---
 app/views/common/showSubtasksCheckbox.scala.html      | 2 +-
 app/views/common/twoColumnModeCheckboxArea.scala.html | 2 +-
 conf/messages                                         | 1 +
 conf/messages.ko-KR                                   | 7 ++++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/views/common/showSubtasksCheckbox.scala.html b/app/views/common/showSubtasksCheckbox.scala.html
index 3c6cf2753..b1ae34578 100644
--- a/app/views/common/showSubtasksCheckbox.scala.html
+++ b/app/views/common/showSubtasksCheckbox.scala.html
@@ -6,7 +6,7 @@
 **@
 @(requireLeftMargin: Boolean = true)
 
-<div class="show-subtasks mr10" id="two-column-mode-checkbox" title='@Messages("common.two.column.mode")' data-content='@Messages("common.show.subtasks.desc")'>
+<div class="show-subtasks mr10" id="two-column-mode-checkbox" data-toggle="popover"  data-trigger="hover" data-placement="top" title='@Messages("common.show.subtasks")' data-content='@Messages("common.show.subtasks.desc")'>
     <label class="checkbox">
         <div class="show-subtasks-button-border">
             <input id="toggle-show-subtasks" type="checkbox"><span class="show-subtasks-text">@Messages("common.show.subtasks")</span>
diff --git a/app/views/common/twoColumnModeCheckboxArea.scala.html b/app/views/common/twoColumnModeCheckboxArea.scala.html
index a95ed6e18..27e6233e2 100644
--- a/app/views/common/twoColumnModeCheckboxArea.scala.html
+++ b/app/views/common/twoColumnModeCheckboxArea.scala.html
@@ -9,7 +9,7 @@
 <div class="two-column-icon mr10 hide-in-mobile" id="two-column-mode-checkbox" title='@Messages("common.two.column.mode")' data-content='@Messages("common.two.column.mode.desc")'>
     <label class="checkbox">
         <div class="two-column-icon-border">
-            <input id="two-column-mode" type="checkbox"><span class="two-column-mode-text">Column View</span>
+            <input id="two-column-mode" type="checkbox"><span class="two-column-mode-text">@Messages("common.two.column.view")</span>
         </div>
     </label>
 </div>
diff --git a/conf/messages b/conf/messages
index fde433439..e1204db11 100644
--- a/conf/messages
+++ b/conf/messages
@@ -208,6 +208,7 @@ common.time.seconds = {0} seconds ago
 common.time.today = Today
 common.two.column.mode = Two Column Mode
 common.two.column.mode.desc = Splits list and body into columns respectively
+common.two.column.view = Column View
 emails.click.link = To check email, please click this link.
 emails.main.email = Primary email address
 emails.main.email.descr = Your primary email address will be used for sending you notifications or password resets.
diff --git a/conf/messages.ko-KR b/conf/messages.ko-KR
index 69852f189..069a89225 100644
--- a/conf/messages.ko-KR
+++ b/conf/messages.ko-KR
@@ -189,8 +189,8 @@ common.order.dueDate = 기한순
 common.order.name = 이름순
 common.order.recent = 생성일자순
 common.order.updatedDate = 변경순
-common.show.subtasks = 자식이슈 표시하기
-common.show.subtasks.desc = 자식이슈를 항상 펼쳐진 상태로 표시합니다
+common.show.subtasks = 자식이슈 펼쳐보기
+common.show.subtasks.desc = 자식이슈(Subtask)를 항상 펼쳐진 상태로 표시합니다
 common.time.after = {0}일 후
 common.time.before = {0}일 전
 common.time.day = {0}일 전
@@ -206,8 +206,9 @@ common.time.overday = {0}일 지남
 common.time.second = {0}초 전
 common.time.seconds = {0}초 전
 common.time.today = 오늘
-common.two.column.mode = Two Column Mode
+common.two.column.mode = 투 컬럼 모드
 common.two.column.mode.desc = 리스트와 본문을 각각 컬럼으로 분할해서 보여줍니다
+common.two.column.view = 2단 보기
 emails.click.link = 이메일을 확인하려면 다음 링크를 클릭하세요.
 emails.main.email = 대표 이메일
 emails.main.email.descr = 대표 이메일로 설정한 이메일로 알림을 받거나 비밀번호 변경 요청을 받을 수 있습니다.