From 54b007f1ac4c7f564cf677b87a2efe2474723788 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 7 Sep 2017 18:15:53 +0900
Subject: [PATCH] =?UTF-8?q?#768=E3=81=A8=E3=81=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en.yml                   |  4 ++-
 locales/ja.yml                   |  5 ++--
 src/web/app/mobile/tags/user.tag | 47 ++++++++++++++++++++++++++++++--
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/locales/en.yml b/locales/en.yml
index 3b87ea758d..0af748aa69 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -488,14 +488,16 @@ mobile:
       follows-you: "Follows you"
       following: "Following"
       followers: "Followers"
+      posts: "Posts"
       overview: "Overview"
-      posts: "Timeline"
+      timeline: "Timeline"
       media: "Media"
 
     mk-user-overview:
       recent-posts: "Recent posts"
       images: "Images"
       activity: "Activity"
+      keywords: "Keywords"
       followers-you-know: "Followers you know"
       last-used-at: "Latest used at"
 
diff --git a/locales/ja.yml b/locales/ja.yml
index 13d451b6d8..15f9e9db90 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -488,15 +488,16 @@ mobile:
       follows-you: "フォローされています"
       following: "フォロー"
       followers: "フォロワー"
+      posts: "投稿"
       overview: "概要"
-      posts: "タイムライン"
-      posts-count: "ポスト"
+      timeline: "タイムライン"
       media: "メディア"
 
     mk-user-overview:
       recent-posts: "最近の投稿"
       images: "画像"
       activity: "アクティビティ"
+      keywords: "キーワード"
       followers-you-know: "知り合いのフォロワー"
       last-used-at: "最終ログイン"
 
diff --git a/src/web/app/mobile/tags/user.tag b/src/web/app/mobile/tags/user.tag
index ea431dcc53..06d4da9d3f 100644
--- a/src/web/app/mobile/tags/user.tag
+++ b/src/web/app/mobile/tags/user.tag
@@ -26,7 +26,7 @@
 				<div class="status">
 				  <a>
 				    <b>{ user.posts_count }</b>
-						<i>%i18n:mobile.tags.mk-user.posts-count%</i>
+						<i>%i18n:mobile.tags.mk-user.posts%</i>
 					</a>
 					<a href="{ user.username }/following">
 						<b>{ user.following_count }</b>
@@ -40,7 +40,7 @@
 			</div>
 			<nav>
 				<a data-is-active={ page == 'overview' } onclick={ go.bind(null, 'overview') }>%i18n:mobile.tags.mk-user.overview%</a>
-				<a data-is-active={ page == 'posts' } onclick={ go.bind(null, 'posts') }>%i18n:mobile.tags.mk-user.posts%</a>
+				<a data-is-active={ page == 'posts' } onclick={ go.bind(null, 'posts') }>%i18n:mobile.tags.mk-user.timeline%</a>
 				<a data-is-active={ page == 'media' } onclick={ go.bind(null, 'media') }>%i18n:mobile.tags.mk-user.media%</a>
 			</nav>
 		</header>
@@ -143,7 +143,7 @@
 							> a
 								color #657786
 
-								&:first-child
+								&:not(:last-child)
 									margin-right 16px
 
 								> b
@@ -234,6 +234,12 @@
 			<mk-user-overview-activity-chart user={ user }/>
 		</div>
 	</section>
+	<section class="keywords">
+		<h2><i class="fa fa-comment-o"></i>%i18n:mobile.tags.mk-user-overview.keywords%</h2>
+		<div>
+			<mk-user-overview-keywords user={ user }/>
+		</div>
+	</section>
 	<section class="followers-you-know" if={ SIGNIN && I.id !== user.id }>
 		<h2><i class="fa fa-users"></i>%i18n:mobile.tags.mk-user-overview.followers-you-know%</h2>
 		<div>
@@ -539,6 +545,41 @@
 	</script>
 </mk-user-overview-activity-chart>
 
+
+<mk-user-overview-keywords>
+	<div if={ user.keywords != null && user.keywords.length > 1 }>
+		<virtual each={ keyword in user.keywords }>
+			<a>{ keyword }</a>
+		</virtual>
+	</div>
+	<p class="empty" if={ !initializing && users.length == 0 }>%i18n:mobile.tags.mk-user-overview-followers-you-know.no-users%</p>
+	<style>
+		:scope
+			display block
+
+			> div
+				padding 4px
+
+				> a
+					display inline-block
+					margin 4px
+					color #555
+
+			> .empty
+				margin 0
+				padding 16px
+				text-align center
+				color #aaa
+
+				> i
+					margin-right 4px
+
+	</style>
+	<script>
+		this.user = this.opts.user;
+	</script>
+</mk-user-overview-keywords>
+
 <mk-user-overview-followers-you-know>
 	<p class="initializing" if={ initializing }><i class="fa fa-spinner fa-pulse fa-fw"></i>%i18n:mobile.tags.mk-user-overview-followers-you-know.loading%<mk-ellipsis/></p>
 	<div if={ !initializing && users.length > 0 }>