2.37.3

✌️
Merge pull request #1704 from syuilo/l10n_master
2018-06-11 14:16:46 +09:00 · 2018-06-11 14:16:21 +09:00 · 2018-06-11 14:11:33 +09:00 · 2018-06-11 14:10:47 +09:00 · 2018-06-11 14:06:23 +09:00 · 2018-06-11 13:51:15 +09:00
13 changed files with 21 additions and 6 deletions
--- a/locales/de.yml
+++ b/locales/de.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "Serverinformationen"
  toggle: "Sicht umschalten"
--- a/locales/en.yml
+++ b/locales/en.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "Toggle views"
 common/views/widgets/hashtags.vue:
  title: "Hashtags"
+  count: "{} users mentioned"
 common/views/widgets/server.vue:
  title: "Server info"
  toggle: "Toggle views"
--- a/locales/es.yml
+++ b/locales/es.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
--- a/locales/fr.yml
+++ b/locales/fr.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "Info sur le serveur"
  toggle: "Afficher les vues"
--- a/locales/it.yml
+++ b/locales/it.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
--- a/locales/ko.yml
+++ b/locales/ko.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
--- a/locales/pl.yml
+++ b/locales/pl.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "Przełącz widok"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "Informacje o serwerze"
  toggle: "Przełącz widok"
--- a/locales/pt.yml
+++ b/locales/pt.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
--- a/locales/ru.yml
+++ b/locales/ru.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
--- a/locales/zh.yml
+++ b/locales/zh.yml
@ -227,6 +227,7 @@ common/views/widgets/posts-monitor.vue:
  toggle: "表示を切り替え"
 common/views/widgets/hashtags.vue:
  title: "ハッシュタグ"
+  count: "{}人が投稿"
 common/views/widgets/server.vue:
  title: "サーバー情報"
  toggle: "表示を切り替え"
--- a/package.json
+++ b/package.json
@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.37.2",
-	"clientVersion": "1.0.6437",
+	"version": "2.37.3",
+	"clientVersion": "1.0.6453",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
--- a/src/client/app/common/views/widgets/hashtags.vue
+++ b/src/client/app/common/views/widgets/hashtags.vue
@ -8,7 +8,7 @@
 			<div v-else>
 				<div v-for="stat in stats" :key="stat.tag">
 					<div class="tag">
-						<router-link :to="`/tags/${ stat.tag }`">#{{ stat.tag }}</router-link>
+						<router-link :to="`/tags/${ stat.tag }`" :title="stat.tag">#{{ stat.tag }}</router-link>
 						<p>{{ '%i18n:@count%'.replace('{}', stat.usersCount) }}</p>
 					</div>
 					<x-chart class="chart" :src="stat.chart"/>
@ -41,7 +41,7 @@ export default define({
 	},
 	mounted() {
 		this.fetch();
-		this.clock = setInterval(this.fetch, 1000 * 60 * 10);
+		this.clock = setInterval(this.fetch, 1000 * 60);
 	},
 	beforeDestroy() {
 		clearInterval(this.clock);
@ -84,10 +84,16 @@ root(isDark)

 				> .tag
 					flex 1
+					overflow hidden
 					font-size 14px
 					color isDark ? #9baec8 : #65727b

 					> a
+						display block
+						width 100%
+						white-space nowrap
+						overflow hidden
+						text-overflow ellipsis
 						color inherit

 					> p
--- a/src/server/api/endpoints/hashtags/trend.ts
+++ b/src/server/api/endpoints/hashtags/trend.ts
@ -3,7 +3,7 @@ import Note from '../../../../models/note';
 /**
 * Get trends of hashtags
 */
-module.exports = (params, user) => new Promise(async (res, rej) => {
+module.exports = () => new Promise(async (res, rej) => {
 	const data = await Note.aggregate([{
 		$match: {
 			createdAt: {
@ -58,7 +58,6 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	const interval = 1000 * 60 * 10;

 	for (let i = 0; i < range; i++) {
-
 		countPromises.push(Promise.all(hots.map(tag => Note.distinct('userId', {
 			tags: tag,
 			createdAt: {
Author	SHA1	Message	Date
syuilo	91db24fcfc	2.37.3	2018-06-11 14:16:46 +09:00
syuilo	bb53db905f	✌️	2018-06-11 14:16:21 +09:00
syuilo	0e9a1efe46	Merge pull request #1704 from syuilo/l10n_master New Crowdin translations	2018-06-11 14:11:33 +09:00
syuilo	289cd3e200	New translations ja.yml (English)	2018-06-11 14:10:47 +09:00
syuilo	e0f847e539	✌️	2018-06-11 14:06:23 +09:00
syuilo	c2842b486e	New translations ja.yml (Portuguese)	2018-06-11 13:51:15 +09:00
syuilo	7235ade42f	New translations ja.yml (Korean)	2018-06-11 13:51:13 +09:00
syuilo	850be2df1d	New translations ja.yml (Polish)	2018-06-11 13:51:11 +09:00
syuilo	d504501440	New translations ja.yml (Chinese Simplified)	2018-06-11 13:51:09 +09:00
syuilo	208392f12c	New translations ja.yml (Italian)	2018-06-11 13:51:07 +09:00
syuilo	0fe036c640	New translations ja.yml (Russian)	2018-06-11 13:51:05 +09:00
syuilo	a40c41f0b0	New translations ja.yml (English)	2018-06-11 13:51:03 +09:00
syuilo	4affa5b710	New translations ja.yml (Spanish)	2018-06-11 13:51:01 +09:00
syuilo	4eb574d991	New translations ja.yml (German)	2018-06-11 13:50:59 +09:00
syuilo	2c1577ea24	New translations ja.yml (French)	2018-06-11 13:50:56 +09:00
syuilo	b87e7e50b6	Clean up	2018-06-11 13:49:53 +09:00