[web] Fix translation for genre page. Alignment of logic between artist, composer, and genre pages when navigating to albums or tracks.

web-src/src/components/ListComposers.vue

@@ -61,7 +61,7 @@ export default {
     open_composer: function (composer) {
       this.selected_composer = composer
       this.$router.push({
-        name: 'ComposerTracks',
+        name: 'ComposerAlbums',
         params: { composer: composer.name }
       })
     },

web-src/src/locales/en.json

@@ -263,7 +263,7 @@
       }
     },
     "artist": {
-      "album-count": "{count} albums {'|'} ",
+      "album-count": "{count} albums",
       "shuffle": "Shuffle",
       "track-count": "{count} tracks",
       "sort-by": {
@@ -330,14 +330,9 @@
       }
     },
     "composer": {
-      "album-count": "{count} albums {'|'}",
+      "album-count": "{count} albums",
       "shuffle": "Shuffle",
-      "track-count": "{count} tracks",
+      "track-count": "{count} tracks"
-      "tracks": {
-        "album-count": "{count} albums",
-        "track-count": " {'|'} {count} tracks",
-        "shuffle": "Shuffle"
-      }
     },
     "composers": {
       "count": "{count} composers",
@@ -348,13 +343,9 @@
       "title": "Files"
     },
     "genre": {
-      "album-count": "{count} albums {'|'} ",
+      "album-count": "{count} albums",
       "shuffle": "Shuffle",
-      "tracks": {
+      "track-count": "{count} tracks"
-        "album-count": "{count} albums {'|'} ",
-        "count": " {count} tracks",
-        "shuffle": "Shuffle"
-      }
     },
     "genres": {
       "count": "{count} genres",

web-src/src/locales/fr.json

@@ -263,7 +263,7 @@
       }
     },
     "artist": {
-      "album-count": "{count} albums {'|'} ",
+      "album-count": "{count} albums",
       "shuffle": "Lecture aléatoire",
       "track-count": "{count} pistes",
       "sort-by": {
@@ -330,14 +330,9 @@
       }
     },
     "composer": {
-      "album-count": "{count} albums {'|'}",
+      "album-count": "{count} albums",
       "shuffle": "Lecture aléatoire",
-      "track-count": "{count} pistes",
+      "track-count": "{count} pistes"
-      "pistes": {
-        "album-count": "{count} albums",
-        "track-count": " {'|'} {count} pistes",
-        "shuffle": "Lecture aléatoire"
-      }
     },
     "composers": {
       "count": "{count} compositeurs",
@@ -348,13 +343,9 @@
       "title": "Fichiers"
     },
     "genre": {
-      "album-count": "{count} albums {'|'} ",
+      "album-count": "{count} albums",
       "shuffle": "Lecture aléatoire",
-      "pistes": {
+      "track-count": "{count} pistes"
-        "album-count": "{count} albums {'|'} ",
-        "count": " {count} pistes",
-        "shuffle": "Lecture aléatoire"
-      }
     },
     "genres": {
       "count": "{count} genres",

web-src/src/pages/PageArtist.vue

@@ -37,6 +37,7 @@
         <span
           v-text="$t('page.artist.album-count', { count: artist.album_count })"
         />
+        <span>&nbsp;|&nbsp;</span>
         <a
           class="has-text-link"
           @click="open_tracks"

web-src/src/pages/PageArtistTracks.vue

@@ -26,12 +26,11 @@
           <a
             class="has-text-link"
             @click="open_artist"
-            v-text="
+            v-text="$t('page.artist.album-count', { count: artist.album_count })"
-              $t('page.artist.track-count', {
+          />
-                albums: artist.album_count,
+          <span>&nbsp;|&nbsp;</span>
-                tracks: artist.track_count
+          <span
-              })
+            v-text="$t('page.artist.track-count', { count: artist.track_count })"
-            "
           />
         </p>
         <list-tracks :tracks="tracks.items" :uris="track_uris" />

web-src/src/pages/PageComposer.vue

@@ -25,6 +25,7 @@
               $t('page.composer.album-count', { count: composer.album_count })
             "
           />
+          <span>&nbsp;|&nbsp;</span>
           <a
             class="has-text-link"
             @click="open_tracks"

web-src/src/pages/PageComposerTracks.vue

@@ -14,7 +14,7 @@
           </a>
           <a class="button is-small is-dark is-rounded" @click="play">
             <mdicon class="icon" name="shuffle" size="16" />
-            <span v-text="$t('page.composer.tracks.shuffle')" />
+            <span v-text="$t('page.composer.shuffle')" />
           </a>
         </div>
       </template>
@@ -24,11 +24,12 @@
             class="has-text-link"
             @click="open_albums"
             v-text="
-              $t('page.composer.tracks.album-count', {
+              $t('page.composer.album-count', {
                 count: composer.album_count
               })
             "
           />
+          <span>&nbsp;|&nbsp;</span>
           <span
             v-text="
               $t('page.composer.track-count', { count: composer.track_count })

web-src/src/pages/PageGenre.vue

@@ -26,6 +26,7 @@
           <span
             v-text="$t('page.genre.album-count', { count: genre.album_count })"
           />
+          <span>&nbsp;|&nbsp;</span>
           <a
             class="has-text-link"
             @click="open_tracks"

web-src/src/pages/PageGenreTracks.vue

@@ -17,7 +17,7 @@
           </a>
           <a class="button is-small is-dark is-rounded" @click="play">
             <mdicon class="icon" name="shuffle" size="16" />
-            <span v-text="$t('page.genre.tracks.shuffle')" />
+            <span v-text="$t('page.genre.shuffle')" />
           </a>
         </div>
       </template>
@@ -27,11 +27,12 @@
             class="has-text-link"
             @click="open_genre"
             v-text="
-              $t('page.genre.tracks.album-count', { count: genre.album_count })
+              $t('page.genre.album-count', { count: genre.album_count })
             "
           />
+          <span>&nbsp;|&nbsp;</span>
           <span
-            v-text="$t('page.genre.tracks.count', { count: genre.track_count })"
+            v-text="$t('page.genre.track-count', { count: genre.track_count })"
           />
         </p>
         <list-tracks :tracks="tracks.items" :expression="expression" />