diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a2d6e0b03..f9ce55c124 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,13 @@ npm i -g ts-node npm run migrate ``` +11.20.2 (2019/06/10) +-------------------- +### ๐Fixes +* Redisใซใในใฏใผใใ่จญๅฎใใฆใใๅ ดๅๆฅ็ถใงใใชใๅ้กใไฟฎๆญฃ +* i18n +* ใชใฉ + 11.20.1 (2019/06/07) -------------------- ### ๐Fixes diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml index f589827e72..6e4882aa1f 100644 --- a/locales/ko-KR.yml +++ b/locales/ko-KR.yml @@ -4,7 +4,7 @@ meta: common: misskey: "์ฐํฉ์ฐ์ฃผ์ โญ" about-title: "์ฐํฉ์ฐ์ฃผ์ โญ." - about: "Misskey๋ฅผ ์ฐพ์์ฃผ์ ์ ๊ฐ์ฌํฉ๋๋ค. Misskey๋ ์ง๊ตฌ์์ ํ์ด๋ <b>๋ถ์ฐ ๋ง์ดํฌ๋ก ๋ธ๋ก๊ทธ SNS </b> ์ ๋๋ค. Fediverse(๋ค์ํ SNS๋ก ๊ตฌ์ฑ๋๋ ์ฐ์ฃผ)์ ์กด์ฌํ๋ ๋ค๋ฅธ SNS์ ์ํธ ์ฐ๊ฒฐ๋์ด ์์ต๋๋ค. ์ ์ ๋์์ ๋ฒ์กํจ์์ ๋ฒ์ด๋ ์๋ก์ด ์ธํฐ๋ท์ ๋ค์ด๋ธ ํด ๋ณด์ง ์๊ฒ ์ต๋๊น." + about: "Misskey๋ฅผ ๋ฐ๊ฒฌํด์ฃผ์ ์ ๊ฐ์ฌํฉ๋๋ค! Misskey๋ ์ง๊ตฌ์์ ํ์ด๋ <b>๋ถ์ฐ ๋ง์ดํฌ๋ก ๋ธ๋ก๊ทธ SNS</b> ์ ๋๋ค. Fediverse (๋ค์ํ SNS๊ฐ ํจ๊ปํ๋ ์ฐ์ฃผ) ์์ ์กด์ฌํ๊ณ ์์ด์, ๋ค๋ฅธ SNS์ ์๋ก ์ฐ๊ฒฐ๋์ด ์์ต๋๋ค. ๋ฒ์กํ ๋์์์ ๋ฒ์ด๋ ์๋ก์ด ์ธํฐ๋ท์ ๋น ์ ธ๋ณด์ง ์์ผ์๊ฒ ์ด์?" intro: title: "Misskey๋?" about: "Misskey๋ ์คํ์์ค <b>๋ถ์ฐํ ๋ง์ดํฌ๋ก๋ธ๋ก๊ทธ SNS</b>์ ๋๋ค. ๋ค์ํ๊ณ ํญ๋๊ฒ ์ปค์คํฐ๋ง์ด์งํ ์ ์๋ UI, ๊ธ์ ๋ํ ๋ฆฌ์ก์ , ํ์ผ์ ๊ด๋ฆฌํ ์ ์๋ ๋๋ผ์ด๋ธ ๋ฑ์ ์ ์ง์ ์ธ ๊ธฐ๋ฅ์ ๊ฐ์ถ๊ณ ์์ต๋๋ค. ๋ํ์ฌ Fediverse๋ผ๊ณ ๋ถ๋ฅด๋ ๋คํธ์ํฌ์ ์ฐ๊ฒฐํ ์ ์์ด ๋ค๋ฅธ SNS์๋ ์ฃผ๊ณ ๋ฐ์ ์ ์์ต๋๋ค. ์๋ฅผ ๋ค์๋ฉด, ๋น์ ์ด ๋ฌด์ธ๊ฐ๋ฅผ ๊ฒ์ํ๋ฉด, ํด๋น ๊ฒ์๋ฌผ์ Misskey ๋ฟ๋ง ์๋๋ผ ๋ค๋ฅธ SNS์๋ ์ ํด์ง๋๋ค. ์ด์ง ์ด๋ค ํ์ฑ์์ ๋ค๋ฅธ ํ์ฑ์ผ๋ก ์ ํ๋ฅผ ๋ฐ์ ํ๊ณ ์๋ ๋ชจ์ต์ ์์ํด์ฃผ์ธ์." diff --git a/package.json b/package.json index 75d2abd868..bc1ee7beb3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo <i@syuilo.com>", - "version": "11.20.1", + "version": "11.20.2", "codename": "daybreak", "repository": { "type": "git", diff --git a/src/client/app/auth/views/form.vue b/src/client/app/auth/views/form.vue index b640a40560..064dbf3887 100644 --- a/src/client/app/auth/views/form.vue +++ b/src/client/app/auth/views/form.vue @@ -1,7 +1,7 @@ <template> <div class="form"> <header> - <h1 v-html="$t('share-access', { name: app.name })"></h1> + <h1 v-html="$t('share-access', { name })"></h1> <img :src="app.iconUrl"/> </header> <div class="app"> @@ -34,6 +34,11 @@ export default Vue.extend({ i18n: i18n('auth/views/form.vue'), props: ['session'], computed: { + name(): string { + const el = document.createElement('div'); + el.textContent = this.app.name + return el.innerHTML; + }, app(): any { return this.session.app; } diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index b66da49d7f..1aea2f1cb4 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -19,7 +19,7 @@ <span class="emoji" v-if="emoji.isCustomEmoji"><img :src="emoji.url" :alt="emoji.emoji"/></span> <span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span> <span class="emoji" v-else>{{ emoji.emoji }}</span> - <span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span> + <span class="name">{{ beforeQ }}<b>{{ q }}</b>{{ afterQ }}</span> <span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span> </li> </ol> @@ -89,6 +89,14 @@ export default Vue.extend({ }, computed: { + beforeQ(): string { + return this.emoji.name.split(this.q)[0]; + }, + + afterQ(): string { + return this.emoji.name.split(this.q)[1] || ''; + }, + items(): HTMLCollection { return (this.$refs.suggests as Element).children; }, diff --git a/src/client/app/common/views/components/menu.vue b/src/client/app/common/views/components/menu.vue index a2124c992d..68fa0f5e62 100644 --- a/src/client/app/common/views/components/menu.vue +++ b/src/client/app/common/views/components/menu.vue @@ -1,7 +1,7 @@ <template> <div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ isMobile: $root.isMobile }"> <div class="backdrop" ref="backdrop" @click="close"></div> - <div class="popover" :class="{ hukidasi }" ref="popover"> + <div class="popover" :class="{ bubble }" ref="popover"> <template v-for="item, i in items"> <div v-if="item === null"></div> <button v-if="item" @click="clicked(item.action)" :tabindex="i"> @@ -28,7 +28,7 @@ export default Vue.extend({ }, data() { return { - hukidasi: !this.$root.isMobile + bubble: !this.$root.isMobile }; }, mounted() { @@ -56,12 +56,12 @@ export default Vue.extend({ if (left + width - window.pageXOffset > window.innerWidth) { left = window.innerWidth - width + window.pageXOffset; - this.hukidasi = false; + this.bubble = false; } if (top + height - window.pageYOffset > window.innerHeight) { top = window.innerHeight - height + window.pageYOffset; - this.hukidasi = false; + this.bubble = false; } if (top < 0) { @@ -150,7 +150,7 @@ export default Vue.extend({ $balloon-size = 16px - &.hukidasi + &.bubble margin-top $balloon-size transform-origin center -($balloon-size) diff --git a/src/client/app/desktop/views/components/calendar.vue b/src/client/app/desktop/views/components/calendar.vue index 2b4aed4423..cdeac51638 100644 --- a/src/client/app/desktop/views/components/calendar.vue +++ b/src/client/app/desktop/views/components/calendar.vue @@ -11,7 +11,7 @@ <div class="weekday" v-for="(day, i) in Array(7).fill(0)" :data-today="year == today.getFullYear() && month == today.getMonth() + 1 && today.getDay() == i" - :data-is-donichi="i == 0 || i == 6" + :data-is-weekend="i == 0 || i == 6" >{{ weekdayText[i] }}</div> </template> <div v-for="n in paddingDays"></div> @@ -19,7 +19,7 @@ :data-today="isToday(i + 1)" :data-selected="isSelected(i + 1)" :data-is-out-of-range="isOutOfRange(i + 1)" - :data-is-donichi="isDonichi(i + 1)" + :data-is-weekend="isWeekend(i + 1)" @click="go(i + 1)" :title="isOutOfRange(i + 1) ? null : $t('go')" > @@ -96,7 +96,7 @@ export default Vue.extend({ (this.start ? test < (this.start as any).getTime() : false); }, - isDonichi(day) { + isWeekend(day) { const weekday = (new Date(this.year, this.month - 1, day)).getDay(); return weekday == 0 || weekday == 6; }, @@ -199,14 +199,14 @@ export default Vue.extend({ &.weekday color var(--calendarWeek) - &[data-is-donichi] + &[data-is-weekend] color var(--calendarSaturdayOrSunday) &[data-today] box-shadow 0 0 0 var(--lineWidth) var(--calendarWeek) inset border-radius 6px - &[data-is-donichi] + &[data-is-weekend] box-shadow 0 0 0 var(--lineWidth) var(--calendarSaturdayOrSunday) inset &.day @@ -222,7 +222,7 @@ export default Vue.extend({ &:active > div background var(--faceClearButtonActive) - &[data-is-donichi] + &[data-is-weekend] color var(--calendarSaturdayOrSunday) &[data-is-out-of-range] diff --git a/src/db/postgre.ts b/src/db/postgre.ts index 8e2d585e99..f0f1e7eec0 100644 --- a/src/db/postgre.ts +++ b/src/db/postgre.ts @@ -102,7 +102,7 @@ export function initDb(justBorrow = false, sync = false, log = false) { host: config.redis.host, port: config.redis.port, options:{ - auth_pass: config.redis.pass, + password: config.redis.pass, prefix: config.redis.prefix, db: config.redis.db || 0 } diff --git a/src/db/redis.ts b/src/db/redis.ts index 6518cb0059..41d030149c 100644 --- a/src/db/redis.ts +++ b/src/db/redis.ts @@ -5,7 +5,7 @@ export default redis.createClient( config.redis.port, config.redis.host, { - auth_pass: config.redis.pass, + password: config.redis.pass, prefix: config.redis.prefix, db: config.redis.db || 0 }