From 912c98c71b64719d55be85e59097230b257d1a68 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 23 Apr 2018 19:33:39 +0200
Subject: [PATCH] Fix #175: Typos/not showing text due to i18n work
---
changes/changelog.d/175.bugfix | 1 +
front/src/components/activity/Like.vue | 6 +++---
front/src/components/activity/Listen.vue | 10 +++++-----
front/src/components/library/Artist.vue | 5 +----
front/src/views/instance/Timeline.vue | 6 ------
5 files changed, 10 insertions(+), 18 deletions(-)
create mode 100644 changes/changelog.d/175.bugfix
diff --git a/changes/changelog.d/175.bugfix b/changes/changelog.d/175.bugfix
new file mode 100644
index 00000000..f62a5273
--- /dev/null
+++ b/changes/changelog.d/175.bugfix
@@ -0,0 +1 @@
+Typos/not showing text due to i18n work (#175)
diff --git a/front/src/components/activity/Like.vue b/front/src/components/activity/Like.vue
index deda121c..5396accc 100644
--- a/front/src/components/activity/Like.vue
+++ b/front/src/components/activity/Like.vue
@@ -5,10 +5,10 @@
</div>
<div class="content">
<div class="summary">
- <i18next path="{%0%} favorited a track {%1%}">
- <slot name="user"></slot>
- <slot name="date"></slot>
+ <i18next path="{%0%} favorited a track">
+ <username class="user" :username="event.actor.local_id" />
</i18next>
+ <human-date class="date" :date="event.published" />
</div>
<div class="extra text">
<router-link :to="{name: 'library.tracks.detail', params: {id: event.object.local_id }}">{{ event.object.name }}</router-link>
diff --git a/front/src/components/activity/Listen.vue b/front/src/components/activity/Listen.vue
index d207c280..bfa3ca16 100644
--- a/front/src/components/activity/Listen.vue
+++ b/front/src/components/activity/Listen.vue
@@ -5,16 +5,16 @@
</div>
<div class="content">
<div class="summary">
- <i18next path="{%0%} listened to a track {%1%}">
- <slot name="user"></slot>
- <slot name="date"></slot>
+ <i18next path="{%0%} listened to a track">
+ <username class="user" :username="event.actor.local_id" />
</i18next>
+ <human-date class="date" :date="event.published" />
+
</div>
<div class="extra text">
<router-link :to="{name: 'library.tracks.detail', params: {id: event.object.local_id }}">{{ event.object.name }}</router-link>
<i18next path="from album {%0%}, by {%1%}" v-if="event.object.album">
- {{ event.object.album }}
- <em>{{ event.object.artist }}</em>
+ {{ event.object.album }}<em>{{ event.object.artist }}</em>
</i18next>
<i18next path=", by {%0%}" v-else>
<em>{{ event.object.artist }}</em>
diff --git a/front/src/components/library/Artist.vue b/front/src/components/library/Artist.vue
index 5c17ac6a..e16cb658 100644
--- a/front/src/components/library/Artist.vue
+++ b/front/src/components/library/Artist.vue
@@ -11,10 +11,7 @@
<div class="content">
{{ artist.name }}
<div class="sub header">
- <i18next path="{%0%} tracks in {%1%} albums">
- {{ totalTracks }}
- {{ albums.length }}
- </i18next>
+ {{ $t('{% track_count %} tracks in {% album_count %} albums', {track_count: totalTracks, album_count: albums.length})}}
</div>
</div>
</h2>
diff --git a/front/src/views/instance/Timeline.vue b/front/src/views/instance/Timeline.vue
index 8b34798c..2ab8b708 100644
--- a/front/src/views/instance/Timeline.vue
+++ b/front/src/views/instance/Timeline.vue
@@ -14,12 +14,6 @@
v-if="components[event.type]"
:is="components[event.type]"
:event="event">
- <username
- class="user"
- :username="event.actor.local_id"
- slot="user"></username>
- {{ event.published }}
- <human-date class="date" :date="event.published" slot="date"></human-date>
</component>
</div>
</div>
--
GitLab