From 2dba24d0da54b5be3d5435c250af832276ae2c8e Mon Sep 17 00:00:00 2001 From: rinsuki <428rinsuki+git@gmail.com> Date: Mon, 26 Mar 2018 16:56:46 +0900 Subject: [PATCH 1/4] mk-images -> mk-media-list, mk-images-image -> mk-media-image --- src/web/app/common/views/components/index.ts | 4 ++-- .../components/{images.vue => media-list.vue} | 18 +++++++++--------- src/web/app/desktop/views/components/index.ts | 8 ++++---- ...image-dialog.vue => media-image-dialog.vue} | 4 ++-- .../{images-image.vue => media-image.vue} | 8 ++++---- .../views/components/post-detail.sub.vue | 2 +- .../desktop/views/components/post-detail.vue | 2 +- .../desktop/views/components/posts.post.vue | 2 +- .../views/components/sub-post-content.vue | 2 +- src/web/app/mobile/views/components/index.ts | 4 ++-- .../{images-image.vue => media-image.vue} | 4 ++-- .../mobile/views/components/post-detail.vue | 2 +- src/web/app/mobile/views/components/post.vue | 2 +- .../views/components/sub-post-content.vue | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) rename src/web/app/common/views/components/{images.vue => media-list.vue} (82%) rename src/web/app/desktop/views/components/{images-image-dialog.vue => media-image-dialog.vue} (94%) rename src/web/app/desktop/views/components/{images-image.vue => media-image.vue} (89%) rename src/web/app/mobile/views/components/{images-image.vue => media-image.vue} (82%) diff --git a/src/web/app/common/views/components/index.ts b/src/web/app/common/views/components/index.ts index fbf9d22a0b..b58ba37ecb 100644 --- a/src/web/app/common/views/components/index.ts +++ b/src/web/app/common/views/components/index.ts @@ -11,7 +11,7 @@ import reactionIcon from './reaction-icon.vue'; import reactionsViewer from './reactions-viewer.vue'; import time from './time.vue'; import timer from './timer.vue'; -import images from './images.vue'; +import mediaList from './media-list.vue'; import uploader from './uploader.vue'; import specialMessage from './special-message.vue'; import streamIndicator from './stream-indicator.vue'; @@ -36,7 +36,7 @@ Vue.component('mk-reaction-icon', reactionIcon); Vue.component('mk-reactions-viewer', reactionsViewer); Vue.component('mk-time', time); Vue.component('mk-timer', timer); -Vue.component('mk-images', images); +Vue.component('mk-media-list', mediaList); Vue.component('mk-uploader', uploader); Vue.component('mk-special-message', specialMessage); Vue.component('mk-stream-indicator', streamIndicator); diff --git a/src/web/app/common/views/components/images.vue b/src/web/app/common/views/components/media-list.vue similarity index 82% rename from src/web/app/common/views/components/images.vue rename to src/web/app/common/views/components/media-list.vue index dc802a0180..b0e6685082 100644 --- a/src/web/app/common/views/components/images.vue +++ b/src/web/app/common/views/components/media-list.vue @@ -1,6 +1,6 @@ @@ -8,16 +8,16 @@ import Vue from 'vue'; export default Vue.extend({ - props: ['images'], + props: ['mediaList'], mounted() { - const tags = this.$refs.image as Vue[]; + const tags = this.$refs.media as Vue[]; - if (this.images.length == 1) { + if (this.mediaList.length == 1) { (this.$el.style as any).gridTemplateRows = '1fr'; (tags[0].$el.style as any).gridColumn = '1 / 2'; (tags[0].$el.style as any).gridRow = '1 / 2'; - } else if (this.images.length == 2) { + } else if (this.mediaList.length == 2) { (this.$el.style as any).gridTemplateColumns = '1fr 1fr'; (this.$el.style as any).gridTemplateRows = '1fr'; @@ -25,7 +25,7 @@ export default Vue.extend({ (tags[0].$el.style as any).gridRow = '1 / 2'; (tags[1].$el.style as any).gridColumn = '2 / 3'; (tags[1].$el.style as any).gridRow = '1 / 2'; - } else if (this.images.length == 3) { + } else if (this.mediaList.length == 3) { (this.$el.style as any).gridTemplateColumns = '1fr 0.5fr'; (this.$el.style as any).gridTemplateRows = '1fr 1fr'; @@ -35,7 +35,7 @@ export default Vue.extend({ (tags[1].$el.style as any).gridRow = '1 / 2'; (tags[2].$el.style as any).gridColumn = '2 / 3'; (tags[2].$el.style as any).gridRow = '2 / 3'; - } else if (this.images.length == 4) { + } else if (this.mediaList.length == 4) { (this.$el.style as any).gridTemplateColumns = '1fr 1fr'; (this.$el.style as any).gridTemplateRows = '1fr 1fr'; @@ -53,7 +53,7 @@ export default Vue.extend({ From 8eab25f22c3ecb65c5869afa26afbbf791f0066d Mon Sep 17 00:00:00 2001 From: rinsuki <428rinsuki+git@gmail.com> Date: Mon, 26 Mar 2018 17:33:29 +0900 Subject: [PATCH 4/4] add mobile.tags.mk-user-timeline.load-more translation --- locales/en.yml | 1 + locales/ja.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/locales/en.yml b/locales/en.yml index e559846772..2cc857f698 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -654,6 +654,7 @@ mobile: mk-user-timeline: no-posts: "This user seems never post" no-posts-with-media: "There is no posts with media" + load-more: "More" mk-user: follows-you: "Follows you" diff --git a/locales/ja.yml b/locales/ja.yml index b60e9e3f41..86b5949904 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -654,6 +654,7 @@ mobile: mk-user-timeline: no-posts: "このユーザーはまだ投稿していないようです。" no-posts-with-media: "メディア付き投稿はありません。" + load-more: "もっとみる" mk-user: follows-you: "フォローされています"