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: "フォローされています" diff --git a/src/web/app/common/views/components/images.vue b/src/web/app/common/views/components/images.vue deleted file mode 100644 index dc802a0180..0000000000 --- a/src/web/app/common/views/components/images.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - - 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/media-list.vue b/src/web/app/common/views/components/media-list.vue new file mode 100644 index 0000000000..d0da584a40 --- /dev/null +++ b/src/web/app/common/views/components/media-list.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts index 52b9680baa..9bca603a53 100644 --- a/src/web/app/desktop/views/components/index.ts +++ b/src/web/app/desktop/views/components/index.ts @@ -11,8 +11,8 @@ import postFormWindow from './post-form-window.vue'; import repostFormWindow from './repost-form-window.vue'; import analogClock from './analog-clock.vue'; import ellipsisIcon from './ellipsis-icon.vue'; -import imagesImage from './images-image.vue'; -import imagesImageDialog from './images-image-dialog.vue'; +import mediaImage from './media-image.vue'; +import mediaImageDialog from './media-image-dialog.vue'; import notifications from './notifications.vue'; import postForm from './post-form.vue'; import repostForm from './repost-form.vue'; @@ -40,8 +40,8 @@ Vue.component('mk-post-form-window', postFormWindow); Vue.component('mk-repost-form-window', repostFormWindow); Vue.component('mk-analog-clock', analogClock); Vue.component('mk-ellipsis-icon', ellipsisIcon); -Vue.component('mk-images-image', imagesImage); -Vue.component('mk-images-image-dialog', imagesImageDialog); +Vue.component('mk-media-image', mediaImage); +Vue.component('mk-media-image-dialog', mediaImageDialog); Vue.component('mk-notifications', notifications); Vue.component('mk-post-form', postForm); Vue.component('mk-repost-form', repostForm); diff --git a/src/web/app/desktop/views/components/images-image-dialog.vue b/src/web/app/desktop/views/components/media-image-dialog.vue similarity index 94% rename from src/web/app/desktop/views/components/images-image-dialog.vue rename to src/web/app/desktop/views/components/media-image-dialog.vue index 60afa7af82..dec140d1c9 100644 --- a/src/web/app/desktop/views/components/images-image-dialog.vue +++ b/src/web/app/desktop/views/components/media-image-dialog.vue @@ -1,5 +1,5 @@