2.24.2

Merge pull request #1663 from syuilo/l10n_master
New Crowdin translations
2018-05-30 05:02:56 +09:00 · 2018-05-30 05:02:17 +09:00 · 2018-05-30 05:00:58 +09:00 · 2018-05-30 04:51:38 +09:00 · 2018-05-30 04:51:36 +09:00 · 2018-05-30 04:51:34 +09:00
21 changed files with 217 additions and 31 deletions
--- a/locales/de.yml
+++ b/locales/de.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "もっと"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/locales/en.yml
+++ b/locales/en.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "No notes"
  load-more: "More"
 mobile/views/components/ui.nav.vue:
-  home: "Home"
+  timeline: "Timeline"
  notifications: "Notifications"
  messaging: "Messages"
  search: "Search"
  drive: "Drive"
  favorites: "Favorites"
+  user-lists: "Lists"
  widgets: "Widgets"
  game: "Games"
  darkmode: "Dark mode"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "More"
 mobile/views/pages/favorites.vue:
  title: "Favorites"
+mobile/views/pages/user-lists.vue:
+  title: "Lists"
+  enter-list-name: "Enter list name"
 mobile/views/pages/drive.vue:
  drive: "Drive"
  more: "Load more"
--- a/locales/es.yml
+++ b/locales/es.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "もっと"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/locales/fr.yml
+++ b/locales/fr.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "Pas de notes"
  load-more: "Afficher plus"
 mobile/views/components/ui.nav.vue:
-  home: "Accueil"
+  timeline: "タイムライン"
  notifications: "Notifications"
  messaging: "Messages"
  search: "Rechercher"
  drive: "Drive"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "Afficher plus"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "Drive"
  more: "もっと見る"
--- a/locales/it.yml
+++ b/locales/it.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "もっと"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/locales/ja.yml
+++ b/locales/ja.yml
@ -838,12 +838,13 @@ mobile/views/components/timeline.vue:
  load-more: "もっと"

 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -863,6 +864,10 @@ mobile/views/components/users-list.vue:
 mobile/views/pages/favorites.vue:
  title: "お気に入り"

+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
+
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/locales/ko.yml
+++ b/locales/ko.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "もっと"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/locales/pl.yml
+++ b/locales/pl.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "Brak wpisów"
  load-more: "Więcej"
 mobile/views/components/ui.nav.vue:
-  home: "Strona główna"
+  timeline: "タイムライン"
  notifications: "Powiadomienia"
  messaging: "Wiadomości"
  search: "Szukaj"
  drive: "Dysk"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "Więcej"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "Dysk"
  more: "もっと見る"
--- a/locales/pt.yml
+++ b/locales/pt.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "もっと"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/locales/ru.yml
+++ b/locales/ru.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "もっと"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/locales/zh.yml
+++ b/locales/zh.yml
@ -709,12 +709,13 @@ mobile/views/components/timeline.vue:
  empty: "投稿がありません"
  load-more: "もっと"
 mobile/views/components/ui.nav.vue:
-  home: "ホーム"
+  timeline: "タイムライン"
  notifications: "通知"
  messaging: "メッセージ"
  search: "検索"
  drive: "ドライブ"
  favorites: "お気に入り"
+  user-lists: "リスト"
  widgets: "ウィジェット"
  game: "ゲーム"
  darkmode: "ダークモード"
@ -730,6 +731,9 @@ mobile/views/components/users-list.vue:
  load-more: "もっと"
 mobile/views/pages/favorites.vue:
  title: "お気に入り"
+mobile/views/pages/user-lists.vue:
+  title: "リスト"
+  enter-list-name: "リスト名を入力してください"
 mobile/views/pages/drive.vue:
  drive: "ドライブ"
  more: "もっと見る"
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.24.0",
-	"clientVersion": "1.0.6017",
+	"version": "2.24.2",
+	"clientVersion": "1.0.6035",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
--- a/src/client/app/common/views/components/analog-clock.vue
+++ b/src/client/app/common/views/components/analog-clock.vue
@ -1,12 +1,10 @@
 <template>
 <svg class="mk-analog-clock" viewBox="0 0 10 10" preserveAspectRatio="none">
-	<line v-for="angle, i in graduations"
-		:x1="5 + (Math.sin(angle) * (5 - graduationsPadding))"
-		:y1="5 - (Math.cos(angle) * (5 - graduationsPadding))"
-		:x2="5 + (Math.sin(angle) * ((5 - graduationsPadding) - (i % 5 == 0 ? longGraduationLength : shortGraduationLength)))"
-		:y2="5 - (Math.cos(angle) * ((5 - graduationsPadding) - (i % 5 == 0 ? longGraduationLength : shortGraduationLength)))"
-		:stroke="i % 5 == 0 ? longGraduationColor : shortGraduationColor"
-		stroke-width="0.05"/>
+	<circle v-for="angle, i in graduations"
+		:cx="5 + (Math.sin(angle) * (5 - graduationsPadding))"
+		:cy="5 - (Math.cos(angle) * (5 - graduationsPadding))"
+		:r="i % 5 == 0 ? 0.125 : 0.05"
+		:fill="i % 5 == 0 ? majorGraduationColor : minorGraduationColor"/>

 	<line
 		:x1="5 - (Math.sin(sAngle) * (sHandLengthRatio * handsTailLength))"
@ -43,14 +41,13 @@ export default Vue.extend({
 			default: false
 		}
 	},
+
 	data() {
 		return {
 			now: new Date(),
 			clock: null,

 			graduationsPadding: 0.5,
-			longGraduationLength: 0.3,
-			shortGraduationLength: 0.15,
 			handsPadding: 1,
 			handsTailLength: 0.7,
 			hHandLengthRatio: 0.75,
@ -58,11 +55,12 @@ export default Vue.extend({
 			sHandLengthRatio: 1
 		};
 	},
+
 	computed: {
-		longGraduationColor(): string {
+		majorGraduationColor(): string {
 			return this.dark ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.3)';
 		},
-		shortGraduationColor(): string {
+		minorGraduationColor(): string {
 			return this.dark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
 		},

@ -106,12 +104,15 @@ export default Vue.extend({
 			return angles;
 		}
 	},
+
 	mounted() {
 		this.clock = setInterval(this.tick, 1000);
 	},
+
 	beforeDestroy() {
 		clearInterval(this.clock);
 	},
+
 	methods: {
 		tick() {
 			this.now = new Date();
--- a/src/client/app/common/views/widgets/memo.vue
+++ b/src/client/app/common/views/widgets/memo.vue
@ -73,6 +73,7 @@ root(isDark)
 			background isDark ? #282c37 : #fff
 			border none
 			border-bottom solid 1px isDark ? #1c2023 : #eee
+			border-radius 0

 		> button
 			display block
--- a/src/client/app/desktop/views/components/drive.file.vue
+++ b/src/client/app/desktop/views/components/drive.file.vue
@ -62,7 +62,7 @@ export default Vue.extend({

 		onContextmenu(e) {
 			this.isContextmenuShowing = true;
-			contextmenu(e, [{
+			contextmenu((this as any).os)(e, [{
 				type: 'item',
 				text: '%i18n:@contextmenu.rename%',
 				icon: '%fa:i-cursor%',
--- a/src/client/app/desktop/views/components/drive.folder.vue
+++ b/src/client/app/desktop/views/components/drive.folder.vue
@ -52,7 +52,7 @@ export default Vue.extend({

 		onContextmenu(e) {
 			this.isContextmenuShowing = true;
-			contextmenu(e, [{
+			contextmenu((this as any).os)(e, [{
 				type: 'item',
 				text: '%i18n:@contextmenu.move-to-this-folder%',
 				icon: '%fa:arrow-right%',
--- a/src/client/app/desktop/views/components/drive.vue
+++ b/src/client/app/desktop/views/components/drive.vue
@ -136,7 +136,7 @@ export default Vue.extend({
 	},
 	methods: {
 		onContextmenu(e) {
-			contextmenu(e, [{
+			contextmenu((this as any).os)(e, [{
 				type: 'item',
 				text: '%i18n:@contextmenu.create-folder%',
 				icon: '%fa:R folder%',
--- a/src/client/app/mobile/script.ts
+++ b/src/client/app/mobile/script.ts
@ -37,6 +37,8 @@ import MkSearch from './views/pages/search.vue';
 import MkFollowers from './views/pages/followers.vue';
 import MkFollowing from './views/pages/following.vue';
 import MkFavorites from './views/pages/favorites.vue';
+import MkUserLists from './views/pages/user-lists.vue';
+import MkUserList from './views/pages/user-list.vue';
 import MkSettings from './views/pages/settings.vue';
 import MkOthello from './views/pages/othello.vue';

@ -74,6 +76,8 @@ init((launch) => {
 			{ path: '/i/settings', name: 'settings', component: MkSettings },
 			{ path: '/i/notifications', name: 'notifications', component: MkNotifications },
 			{ path: '/i/favorites', name: 'favorites', component: MkFavorites },
+			{ path: '/i/lists', name: 'user-lists', component: MkUserLists },
+			{ path: '/i/lists/:list', name: 'user-list', component: MkUserList },
 			{ path: '/i/widgets', name: 'widgets', component: MkWidgets },
 			{ path: '/i/messaging', name: 'messaging', component: MkMessaging },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
--- a/src/client/app/mobile/views/components/ui.nav.vue
+++ b/src/client/app/mobile/views/components/ui.nav.vue
@ -15,14 +15,15 @@
 			</router-link>
 			<div class="links">
 				<ul>
-					<li><router-link to="/" :data-active="$route.name == 'index'">%fa:home%%i18n:@home%%fa:angle-right%</router-link></li>
+					<li><router-link to="/" :data-active="$route.name == 'index'">%fa:home%%i18n:@timeline%%fa:angle-right%</router-link></li>
 					<li><router-link to="/i/notifications" :data-active="$route.name == 'notifications'">%fa:R bell%%i18n:@notifications%<template v-if="hasUnreadNotification">%fa:circle%</template>%fa:angle-right%</router-link></li>
 					<li><router-link to="/i/messaging" :data-active="$route.name == 'messaging'">%fa:R comments%%i18n:@messaging%<template v-if="hasUnreadMessagingMessage">%fa:circle%</template>%fa:angle-right%</router-link></li>
 					<li><router-link to="/othello" :data-active="$route.name == 'othello'">%fa:gamepad%%i18n:@game%<template v-if="hasGameInvitation">%fa:circle%</template>%fa:angle-right%</router-link></li>
 				</ul>
 				<ul>
-					<li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'">%fa:quidditch%%i18n:@widgets%%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/widgets" :data-active="$route.name == 'widgets'">%fa:R calendar-alt%%i18n:@widgets%%fa:angle-right%</router-link></li>
 					<li><router-link to="/i/favorites" :data-active="$route.name == 'favorites'">%fa:star%%i18n:@favorites%%fa:angle-right%</router-link></li>
+					<li><router-link to="/i/lists" :data-active="$route.name == 'user-lists'">%fa:list%%i18n:@user-lists%%fa:angle-right%</router-link></li>
 					<li><router-link to="/i/drive" :data-active="$route.name == 'drive'">%fa:cloud%%i18n:@drive%%fa:angle-right%</router-link></li>
 				</ul>
 				<ul>
@ -157,7 +158,10 @@ root(isDark)
 		&:first-child
 			margin-top 0

-		li
+		&:last-child
+			margin-bottom 0
+
+		> li
 			display block
 			font-size 1em
 			line-height 1em
@ -199,7 +203,7 @@ root(isDark)
 					opacity 0.5

 	.about
-		margin 0
+		margin 0 0 8px 0
 		padding 1em 0
 		text-align center
 		font-size 0.8em
--- a/src/client/app/mobile/views/pages/user-list.vue
+++ b/src/client/app/mobile/views/pages/user-list.vue
@ -0,0 +1,63 @@
+<template>
+<mk-ui>
+	<span slot="header" v-if="!fetching">%fa:list%{{ list.title }}</span>
+
+	<main v-if="!fetching">
+		<ul>
+			<li v-for="user in list.users" :key="user.id"><router-link :to="user | userPage">{{ user | userName }}</router-link></li>
+		</ul>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import Progress from '../../../common/scripts/loading';
+
+export default Vue.extend({
+	data() {
+		return {
+			fetching: true,
+			list: null
+		};
+	},
+	watch: {
+		$route: 'fetch'
+	},
+	created() {
+		this.fetch();
+	},
+	methods: {
+		fetch() {
+			Progress.start();
+			this.fetching = true;
+
+			(this as any).api('users/lists/show', {
+				listId: this.$route.params.list
+			}).then(list => {
+				this.list = list;
+				this.fetching = false;
+
+				Progress.done();
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+main
+	width 100%
+	max-width 680px
+	margin 0 auto
+	padding 8px
+
+	@media (min-width 500px)
+		padding 16px
+
+	@media (min-width 600px)
+		padding 32px
+
+</style>
--- a/src/client/app/mobile/views/pages/user-lists.vue
+++ b/src/client/app/mobile/views/pages/user-lists.vue
@ -0,0 +1,68 @@
+<template>
+<mk-ui>
+	<span slot="header">%fa:list%%i18n:@title%</span>
+	<template slot="func"><button @click="fn">%fa:plus%</button></template>
+
+	<main>
+		<ul>
+			<li v-for="list in lists" :key="list.id"><router-link :to="`/i/lists/${list.id}`">{{ list.title }}</router-link></li>
+		</ul>
+	</main>
+</mk-ui>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import Progress from '../../../common/scripts/loading';
+
+export default Vue.extend({
+	data() {
+		return {
+			fetching: true,
+			lists: []
+		};
+	},
+	mounted() {
+		document.title = 'Misskey | %i18n:@title%';
+
+		Progress.start();
+
+		(this as any).api('users/lists/list').then(lists => {
+			this.fetching = false;
+			this.lists = lists;
+
+			Progress.done();
+		});
+	},
+	methods: {
+		fn() {
+			(this as any).apis.input({
+				title: '%i18n:@enter-list-name%',
+			}).then(async title => {
+				const list = await (this as any).api('users/lists/create', {
+					title
+				});
+
+				this.$router.push('/i/lists/' + list.id);
+			});
+		}
+	}
+});
+</script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+main
+	width 100%
+	max-width 680px
+	margin 0 auto
+	padding 8px
+
+	@media (min-width 500px)
+		padding 16px
+
+	@media (min-width 600px)
+		padding 32px
+
+</style>
Author	SHA1	Message	Date
syuilo	dd94392317	2.24.2	2018-05-30 05:02:56 +09:00
syuilo	baa2845916	Merge pull request #1663 from syuilo/l10n_master New Crowdin translations	2018-05-30 05:02:17 +09:00
syuilo	97ae4ea13e	New translations ja.yml (English)	2018-05-30 05:00:58 +09:00
syuilo	d1c5f0c70f	New translations ja.yml (Portuguese)	2018-05-30 04:51:38 +09:00
syuilo	95bff3005f	New translations ja.yml (Korean)	2018-05-30 04:51:36 +09:00
syuilo	c0b06496b1	New translations ja.yml (Polish)	2018-05-30 04:51:34 +09:00
syuilo	2105e1f259	New translations ja.yml (Chinese Simplified)	2018-05-30 04:51:32 +09:00
syuilo	e546414c2f	New translations ja.yml (Italian)	2018-05-30 04:51:30 +09:00
syuilo	1f4660a930	New translations ja.yml (Russian)	2018-05-30 04:51:28 +09:00
syuilo	a2165c2e01	New translations ja.yml (English)	2018-05-30 04:51:26 +09:00
syuilo	1af920739f	New translations ja.yml (Spanish)	2018-05-30 04:51:24 +09:00
syuilo	868e8228f0	New translations ja.yml (German)	2018-05-30 04:51:22 +09:00
syuilo	2bbc74560d	New translations ja.yml (French)	2018-05-30 04:51:20 +09:00
syuilo	5d2caa456d	🎨	2018-05-30 04:46:50 +09:00
syuilo	9069a99a15	wip	2018-05-30 04:45:27 +09:00
syuilo	fa56a44d85	🎨	2018-05-30 04:07:23 +09:00
syuilo	248acaee75	2.24.1	2018-05-30 00:16:03 +09:00
syuilo	ef75f12abe	Fix bug	2018-05-30 00:15:32 +09:00