Verified Commit 0b8b5595 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

See #161: consistency

parent 97ad74fa
Pipeline #1384 passed with stages
in 4 minutes and 17 seconds
......@@ -7,7 +7,7 @@ msgstr ""
#: src/components/activity/Like.vue:19
#: src/components/activity/Listen.vue:19
msgid ", by {%0%}"
msgid ", by %(0)s"
msgstr ""
#: src/components/Sidebar.vue:1
......@@ -16,28 +16,28 @@ msgid "(empty)"
msgstr ""
#: src/components/audio/artist/Card.vue:44
msgid "{%0%} albums"
msgid "%(0)s albums"
msgstr ""
#: src/components/activity/Like.vue:8
msgid "{%0%} favorited a track"
msgid "%(0)s favorited a track"
msgstr ""
#: src/components/favorites/List.vue:9
msgid "{%0%} favorites"
msgid "%(0)s favorites"
msgstr ""
#: src/components/activity/Listen.vue:8
msgid "{%0%} listened to a track"
msgid "%(0)s listened to a track"
msgstr ""
#: src/components/audio/album/Card.vue:56
#: src/components/federation/LibraryCard.vue:26
msgid "{%0%} tracks"
msgid "%(0)s tracks"
msgstr ""
#: src/components/library/radios/Builder.vue:57
msgid "{%0%} tracks matching combined filters"
msgid "%(0)s tracks matching combined filters"
msgstr ""
#: src/App.vue:52
......@@ -150,11 +150,11 @@ msgid "Album"
msgstr ""
#: src/components/library/import/ReleaseImport.vue:4
msgid "Album {%0%} ({%1%} tracks) by {%2%}"
msgid "Album %(0)s (%(1)s tracks) by %(2)s"
msgstr ""
#: src/components/library/Album.vue:13
msgid "Album containing {%0%} tracks, by {%1%}"
msgid "Album containing %(0)s tracks, by %(1)s"
msgstr ""
#: src/components/audio/Search.vue:20
......@@ -307,15 +307,15 @@ msgid "Builder"
msgstr ""
#: src/components/audio/album/Card.vue:13
msgid "By {%0%}"
msgid "By %(0)s"
msgstr ""
#: src/components/federation/LibraryFollowTable.vue:50
msgid "By confirming, {%0%}@{%1%} will be denied access to your library."
msgid "By confirming, %(0)s@%(1)s will be denied access to your library."
msgstr ""
#: src/components/federation/LibraryFollowTable.vue:61
msgid "By confirming, {%0%}@{%1%} will be granted access to your library."
msgid "By confirming, %(0)s@%(1)s will be granted access to your library."
msgstr ""
#: src/components/audio/track/Table.vue:43
......@@ -746,12 +746,12 @@ msgid "Following"
msgstr ""
#: src/components/library/Track.vue:14
msgid "From album {%0%} by {%1%}"
msgid "From album %(0)s by %(1)s"
msgstr ""
#: src/components/activity/Like.vue:15
#: src/components/activity/Listen.vue:16
msgid "from album {%0%}, by {%1%}"
msgid "from album %(0)s, by %(1)s"
msgstr ""
#: src/App.vue:54
......@@ -787,7 +787,7 @@ msgid "Get me to the library"
msgstr ""
#: src/components/Home.vue:78
msgid "Get quality metadata about your music thanks to {%0%}"
msgid "Get quality metadata about your music thanks to %(0)s"
msgstr ""
#: src/components/common/ActionTable.vue:1
......@@ -825,7 +825,7 @@ msgid "Import"
msgstr ""
#: src/components/library/import/Main.vue:34
msgid "Import {%0%} tracks"
msgid "Import %(0)s tracks"
msgstr ""
#: src/components/library/import/BatchDetail.vue:1
......@@ -1070,7 +1070,7 @@ msgid "Metadata"
msgstr ""
#: src/components/library/import/Main.vue:104
msgid "Metadata is the data related to the music you want to import. This includes all the information about the artists, albums and tracks. In order to have a high quality library, it is recommended to grab data from the {%0%} project, which you can think about as the Wikipedia of music."
msgid "Metadata is the data related to the music you want to import. This includes all the information about the artists, albums and tracks. In order to have a high quality library, it is recommended to grab data from the %(0)s project, which you can think about as the Wikipedia of music."
msgstr ""
#: src/components/Sidebar.vue:1
......@@ -1174,7 +1174,7 @@ msgid "Old password"
msgstr ""
#: src/components/library/import/FileUpload.vue:37
msgid "Once all your files are uploaded, simply head over {%0%} to check the import status."
msgid "Once all your files are uploaded, simply head over %(0)s to check the import status."
msgstr ""
#: src/components/federation/LibraryCard.vue:22
......@@ -1287,7 +1287,7 @@ msgid "Play now"
msgstr ""
#: src/views/playlists/Detail.vue:12
msgid "Playlist containing {%0%} tracks, by {%1%}"
msgid "Playlist containing %(0)s tracks, by %(1)s"
msgstr ""
#: src/components/playlists/Form.vue:1
......@@ -1385,7 +1385,7 @@ msgid "Refused"
msgstr ""
#: src/components/auth/Profile.vue:12
msgid "Registered since {%0%}"
msgid "Registered since %(0)s"
msgstr ""
#: src/components/auth/Signup.vue:1
......@@ -1421,7 +1421,7 @@ msgid "Request a password"
msgstr ""
#: src/components/PageNotFound.vue:12
msgid "Requested URL: {%0%}"
msgid "Requested URL: %(0)s"
msgstr ""
#: src/components/library/import/BatchDetail.vue:1
......@@ -1434,7 +1434,7 @@ msgid "Reset your password"
msgstr ""
#: src/components/library/import/TrackImport.vue:31
msgid "Result {%0%}/{%1%}"
msgid "Result %(0)s/%(1)s"
msgstr ""
#: src/components/favorites/List.vue:34
......@@ -1539,15 +1539,15 @@ msgid "Share link"
msgstr ""
#: src/components/audio/artist/Card.vue:31
msgid "Show {%0%} more albums"
msgid "Show %(0)s more albums"
msgstr ""
#: src/components/audio/album/Card.vue:42
msgid "Show {%0%} more tracks"
msgid "Show %(0)s more tracks"
msgstr ""
#: src/components/federation/LibraryFollowTable.vue:83
msgid "Showing results {%0%}-{%1%} on {%2%}"
msgid "Showing results %(0)s-%(1)s on %(2)s"
msgstr ""
#: src/components/manage/users/UsersTable.vue:1
......@@ -1698,7 +1698,7 @@ msgid "The Subsonic API is not available on this Funkwhale instance."
msgstr ""
#: src/components/audio/track/Table.vue:30
msgid "There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as {%0%} to easily download a list of tracks."
msgid "There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as %(0)s to easily download a list of tracks."
msgstr ""
#: src/components/library/import/Main.vue:132
......@@ -1823,7 +1823,7 @@ msgid "Update your password"
msgstr ""
#: src/components/playlists/Card.vue:14
msgid "Updated {%0%}"
msgid "Updated %(0)s"
msgstr ""
#: src/components/manage/users/UsersTable.vue:94
......@@ -1950,7 +1950,7 @@ msgid "Yes, log me out!"
msgstr ""
#: src/components/auth/Logout.vue:6
msgid "You are currently logged in as {%0%}"
msgid "You are currently logged in as %(0)s"
msgstr ""
#: src/components/library/import/Main.vue:100
......
......@@ -7,7 +7,7 @@ msgstr ""
#: src/components/activity/Like.vue:19
#: src/components/activity/Listen.vue:19
msgid ", by {%0%}"
msgid ", by %(0)s"
msgstr ""
#: src/components/Sidebar.vue:1
......@@ -16,28 +16,28 @@ msgid "(empty)"
msgstr ""
#: src/components/audio/artist/Card.vue:44
msgid "{%0%} albums"
msgid "%(0)s albums"
msgstr ""
#: src/components/activity/Like.vue:8
msgid "{%0%} favorited a track"
msgid "%(0)s favorited a track"
msgstr ""
#: src/components/favorites/List.vue:9
msgid "{%0%} favorites"
msgid "%(0)s favorites"
msgstr ""
#: src/components/activity/Listen.vue:8
msgid "{%0%} listened to a track"
msgid "%(0)s listened to a track"
msgstr ""
#: src/components/audio/album/Card.vue:56
#: src/components/federation/LibraryCard.vue:26
msgid "{%0%} tracks"
msgid "%(0)s tracks"
msgstr ""
#: src/components/library/radios/Builder.vue:57
msgid "{%0%} tracks matching combined filters"
msgid "%(0)s tracks matching combined filters"
msgstr ""
#: src/App.vue:52
......@@ -150,11 +150,11 @@ msgid "Album"
msgstr ""
#: src/components/library/import/ReleaseImport.vue:4
msgid "Album {%0%} ({%1%} tracks) by {%2%}"
msgid "Album %(0)s (%(1)s tracks) by %(2)s"
msgstr ""
#: src/components/library/Album.vue:13
msgid "Album containing {%0%} tracks, by {%1%}"
msgid "Album containing %(0)s tracks, by %(1)s"
msgstr ""
#: src/components/audio/Search.vue:20
......@@ -307,15 +307,15 @@ msgid "Builder"
msgstr ""
#: src/components/audio/album/Card.vue:13
msgid "By {%0%}"
msgid "By %(0)s"
msgstr ""
#: src/components/federation/LibraryFollowTable.vue:50
msgid "By confirming, {%0%}@{%1%} will be denied access to your library."
msgid "By confirming, %(0)s@%(1)s will be denied access to your library."
msgstr ""
#: src/components/federation/LibraryFollowTable.vue:61
msgid "By confirming, {%0%}@{%1%} will be granted access to your library."
msgid "By confirming, %(0)s@%(1)s will be granted access to your library."
msgstr ""
#: src/components/audio/track/Table.vue:43
......@@ -746,12 +746,12 @@ msgid "Following"
msgstr ""
#: src/components/library/Track.vue:14
msgid "From album {%0%} by {%1%}"
msgid "From album %(0)s by %(1)s"
msgstr ""
#: src/components/activity/Like.vue:15
#: src/components/activity/Listen.vue:16
msgid "from album {%0%}, by {%1%}"
msgid "from album %(0)s, by %(1)s"
msgstr ""
#: src/App.vue:54
......@@ -787,7 +787,7 @@ msgid "Get me to the library"
msgstr ""
#: src/components/Home.vue:78
msgid "Get quality metadata about your music thanks to {%0%}"
msgid "Get quality metadata about your music thanks to %(0)s"
msgstr ""
#: src/components/common/ActionTable.vue:1
......@@ -825,7 +825,7 @@ msgid "Import"
msgstr ""
#: src/components/library/import/Main.vue:34
msgid "Import {%0%} tracks"
msgid "Import %(0)s tracks"
msgstr ""
#: src/components/library/import/BatchDetail.vue:1
......@@ -1070,7 +1070,7 @@ msgid "Metadata"
msgstr ""
#: src/components/library/import/Main.vue:104
msgid "Metadata is the data related to the music you want to import. This includes all the information about the artists, albums and tracks. In order to have a high quality library, it is recommended to grab data from the {%0%} project, which you can think about as the Wikipedia of music."
msgid "Metadata is the data related to the music you want to import. This includes all the information about the artists, albums and tracks. In order to have a high quality library, it is recommended to grab data from the %(0)s project, which you can think about as the Wikipedia of music."
msgstr ""
#: src/components/Sidebar.vue:1
......@@ -1174,7 +1174,7 @@ msgid "Old password"
msgstr ""
#: src/components/library/import/FileUpload.vue:37
msgid "Once all your files are uploaded, simply head over {%0%} to check the import status."
msgid "Once all your files are uploaded, simply head over %(0)s to check the import status."
msgstr ""
#: src/components/federation/LibraryCard.vue:22
......@@ -1287,7 +1287,7 @@ msgid "Play now"
msgstr ""
#: src/views/playlists/Detail.vue:12
msgid "Playlist containing {%0%} tracks, by {%1%}"
msgid "Playlist containing %(0)s tracks, by %(1)s"
msgstr ""
#: src/components/playlists/Form.vue:1
......@@ -1385,7 +1385,7 @@ msgid "Refused"
msgstr ""
#: src/components/auth/Profile.vue:12
msgid "Registered since {%0%}"
msgid "Registered since %(0)s"
msgstr ""
#: src/components/auth/Signup.vue:1
......@@ -1421,7 +1421,7 @@ msgid "Request a password"
msgstr ""
#: src/components/PageNotFound.vue:12
msgid "Requested URL: {%0%}"
msgid "Requested URL: %(0)s"
msgstr ""
#: src/components/library/import/BatchDetail.vue:1
......@@ -1434,7 +1434,7 @@ msgid "Reset your password"
msgstr ""
#: src/components/library/import/TrackImport.vue:31
msgid "Result {%0%}/{%1%}"
msgid "Result %(0)s/%(1)s"
msgstr ""
#: src/components/favorites/List.vue:34
......@@ -1539,15 +1539,15 @@ msgid "Share link"
msgstr ""
#: src/components/audio/artist/Card.vue:31
msgid "Show {%0%} more albums"
msgid "Show %(0)s more albums"
msgstr ""
#: src/components/audio/album/Card.vue:42
msgid "Show {%0%} more tracks"
msgid "Show %(0)s more tracks"
msgstr ""
#: src/components/federation/LibraryFollowTable.vue:83
msgid "Showing results {%0%}-{%1%} on {%2%}"
msgid "Showing results %(0)s-%(1)s on %(2)s"
msgstr ""
#: src/components/manage/users/UsersTable.vue:1
......@@ -1698,7 +1698,7 @@ msgid "The Subsonic API is not available on this Funkwhale instance."
msgstr ""
#: src/components/audio/track/Table.vue:30
msgid "There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as {%0%} to easily download a list of tracks."
msgid "There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as %(0)s to easily download a list of tracks."
msgstr ""
#: src/components/library/import/Main.vue:132
......@@ -1823,7 +1823,7 @@ msgid "Update your password"
msgstr ""
#: src/components/playlists/Card.vue:14
msgid "Updated {%0%}"
msgid "Updated %(0)s"
msgstr ""
#: src/components/manage/users/UsersTable.vue:94
......@@ -1950,7 +1950,7 @@ msgid "Yes, log me out!"
msgstr ""
#: src/components/auth/Logout.vue:6
msgid "You are currently logged in as {%0%}"
msgid "You are currently logged in as %(0)s"
msgstr ""
#: src/components/library/import/Main.vue:100
......
......@@ -75,7 +75,7 @@
<div class="item">
<i class="tag icon"></i>
<div class="content">
<i18next path="Get quality metadata about your music thanks to {%0%}">
<i18next path="Get quality metadata about your music thanks to %(0)s">
<a href="https://musicbrainz.org" target="_blank">{{ $t('MusicBrainz') }}</a>
</i18next>
</div>
......
......@@ -9,7 +9,7 @@
</div>
</h1>
<p>{{ $t('We\'re sorry, the page you asked for does not exists.') }}</p>
<i18next path="Requested URL: {%0%}"><a :href="path">{{ path }}</a></i18next>
<i18next path="Requested URL: %(0)s"><a :href="path">{{ path }}</a></i18next>
<router-link class="ui icon button" to="/">
{{ $t('Go to home page') }}
<i class="right arrow icon"></i>
......
......@@ -5,18 +5,18 @@
</div>
<div class="content">
<div class="summary">
<i18next path="{%0%} favorited a track">
<i18next path="%(0)s 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>
<i18next path="from album {%0%}, by {%1%}" v-if="event.object.album">
<i18next path="from album %(0)s, by %(1)s" v-if="event.object.album">
{{ event.object.album }}
<em>{{ event.object.artist }}</em>
</i18next>
<i18next path=", by {%0%}" v-else>
<i18next path=", by %(0)s" v-else>
<em>{{ event.object.artist }}</em>
</i18next>
</div>
......
......@@ -5,7 +5,7 @@
</div>
<div class="content">
<div class="summary">
<i18next path="{%0%} listened to a track">
<i18next path="%(0)s listened to a track">
<username class="user" :username="event.actor.local_id" />
</i18next>
<human-date class="date" :date="event.published" />
......@@ -13,10 +13,10 @@
</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">
<i18next path="from album %(0)s, by %(1)s" v-if="event.object.album">
{{ event.object.album }}<em>{{ event.object.artist }}</em>
</i18next>
<i18next path=", by {%0%}" v-else>
<i18next path=", by %(0)s" v-else>
<em>{{ event.object.artist }}</em>
</i18next>
</div>
......
......@@ -10,7 +10,7 @@
</div>
<div class="meta">
<span>
<i18next path="By {%0%}">
<i18next path="By %(0)s">
<router-link tag="span" :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
{{ album.artist.name }}</router-link>
</i18next>
......@@ -39,7 +39,7 @@
</table>
<div class="center aligned segment" v-if="album.tracks.length > initialTracks">
<em v-if="!showAllTracks" @click="showAllTracks = true" class="expand">
<i18next path="Show {%0%} more tracks">{{ album.tracks.length - initialTracks }}</i18next>
<i18next path="Show %(0)s more tracks">{{ album.tracks.length - initialTracks }}</i18next>
</em>
<em v-else @click="showAllTracks = false" class="expand">
<i18next path="Collapse" />
......@@ -53,7 +53,7 @@
</play-button>
<span>
<i class="music icon"></i>
<i18next path="{%0%} tracks">
<i18next path="%(0)s tracks">
{{ album.tracks.length }}
</i18next>
</span>
......
......@@ -28,7 +28,7 @@
</table>
<div class="center aligned segment" v-if="artist.albums.length > initialAlbums">
<em v-if="!showAllAlbums" @click="showAllAlbums = true" class="expand">
<i18next path="Show {%0%} more albums">
<i18next path="Show %(0)s more albums">
{{ artist.albums.length - initialAlbums }}
</i18next>
</em>
......@@ -41,7 +41,7 @@
<div class="extra content">
<span>
<i class="sound icon"></i>
<i18next path="{%0%} albums">
<i18next path="%(0)s albums">
{{ artist.albums.length }}
</i18next>
</span>
......
......@@ -27,7 +27,7 @@
<i18next tag="div" path="Download tracks" class="header" />
<div class="content">
<div class="description">
<i18next tag="p" path="There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as {%0%} to easily download a list of tracks.">
<i18next tag="p" path="There is currently no way to download directly multiple tracks from funkwhale as a ZIP archive. However, you can use a command line tools such as %(0)s to easily download a list of tracks.">
<a href="https://curl.haxx.se/" target="_blank">cURL</a>
</i18next>
<i18next path="Simply copy paste the snippet below into a terminal to launch the download."/>
......
......@@ -3,7 +3,7 @@
<div class="ui vertical stripe segment">
<div class="ui small text container">
<h2><i18next path="Are you sure you want to log out?"/></h2>
<i18next tag="p" path="You are currently logged in as {%0%}">{{ $store.state.auth.username }}</i18next>
<i18next tag="p" path="You are currently logged in as %(0)s">{{ $store.state.auth.username }}</i18next>
<button class="ui button" @click="$store.dispatch('auth/logout')"><i18next path="Yes, log me out!"/></button>
</form>
</div>
......
......@@ -9,7 +9,7 @@
<i class="circular inverted user green icon"></i>
<div class="content">
{{ $store.state.auth.profile.username }}
<i18next class="sub header" path="Registered since {%0%}">{{ signupDate }}</i18next>
<i18next class="sub header" path="Registered since %(0)s">{{ signupDate }}</i18next>
</div>
</h2>
<div class="ui basic green label"><i18next path="This is you!"/></div>
......
......@@ -6,7 +6,7 @@
</div>
<h2 v-if="results" class="ui center aligned icon header">
<i class="circular inverted heart pink icon"></i>
<i18next path="{%0%} favorites">
<i18next path="%(0)s favorites">
{{ $store.state.favorites.count }}
</i18next>
</h2>
......
......@@ -23,7 +23,7 @@
</span>
<span v-if="totalItems">
<i class="music icon"></i>
<i18next path="{%0%} tracks">
<i18next path="%(0)s tracks">
{{ totalItems }}
</i18next>
</span>
......
......@@ -47,7 +47,7 @@
<i class="x icon"></i><i18next path="Deny"/>
<p slot="modal-header"><i18next path="Deny access?"/></p>
<p slot="modal-content">
<i18next path="By confirming, {%0%}@{%1%} will be denied access to your library.">
<i18next path="By confirming, %(0)s@%(1)s will be denied access to your library.">
{{ follow.actor.preferred_username }}
{{ follow.actor.domain }}
</i18next>
......@@ -58,7 +58,7 @@
<i class="check icon"></i> <i18next path="Approve"/>
<p slot="modal-header"><i18next path="Approve access?"/></p>
<p slot="modal-content">
<i18next path="By confirming, {%0%}@{%1%} will be granted access to your library.">
<i18next path="By confirming, %(0)s@%(1)s will be granted access to your library.">
{{ follow.actor.preferred_username }}
{{ follow.actor.domain }}
</i18next>
......@@ -80,7 +80,7 @@
></pagination>
</th>
<th v-if="result && result.results.length > 0">
<i18next path="Showing results {%0%}-{%1%} on {%2%}">
<i18next path="Showing results %(0)s-%(1)s on %(2)s">
{{ ((page-1) * paginateBy) + 1 }}
{{ ((page-1) * paginateBy) + result.results.length }}
{{ result.count }}
......
......@@ -10,7 +10,7 @@
<i class="circular inverted sound yellow icon"></i>
<div class="content">
{{ album.title }}
<i18next tag="div" class="sub header" path="Album containing {%0%} tracks, by {%1%}">
<i18next tag="div" class="sub header" path="Album containing %(0)s tracks, by %(1)s">
{{ album.tracks.length }}
<router-link :to="{name: 'library.artists.detail', params: {id: album.artist.id }}">
{{ album.artist.name }}
......
......@@ -11,7 +11,7 @@
<div class="content">
{{ track.title }}
<div class="sub header">
<i18next path="From album {%0%} by {%1%}">
<i18next path="From album %(0)s by %(1)s">
<router-link :to="{name: 'library.albums.detail', params: {id: track.album.id }}">
{{ track.album.title }}
</router-link><router-link :to="{name: 'library.artists.detail', params: {id: track.artist.id }}">
......
......@@ -34,7 +34,7 @@
</button>
</div>
<div class="ui hidden clearing divider"></div>
<i18next v-if="batch" path="Once all your files are uploaded, simply head over {%0%} to check the import status.">
<i18next v-if="batch" path="Once all your files are uploaded, simply head over %(0)s to check the import status.">
<router-link :to="{name: 'library.import.batches.detail', params: {id: batch.id }}">
<i18next path="import detail page"/>
</router-link>
......
......@@ -31,7 +31,7 @@
:class="['ui', 'positive', 'icon', {'loading': isImporting}, 'button']"
:disabled="isImporting || importData.count === 0"
>
<i18next path="Import {%0%} tracks">{{ importData.count }}</i18next>
<i18next path="Import %(0)s tracks">{{ importData.count }}</i18next>
<i class="check icon"></i>
</button>
<button
......@@ -101,7 +101,7 @@
</div>
<div class="column">
<h5 class="ui header">What is metadata?</h5>