iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use same trans for with and without markup

Browse Source
This commit is contained in:
craig.p.drummond
2014-06-17 16:58:23 +00:00
committed by craig.p.drummond
parent 5bd06445bf
commit b033be1271
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mpd/song.cpp
View File

@@ -594,17 +594,18 @@ QString Song::describe(bool withMarkup) const
{
QString albumText=album.isEmpty() ? name() : displayAlbum(album, Song::albumYear(*this));
return withMarkup
? title.isEmpty()
? QLatin1String("<b>")+albumText+QLatin1String("</b>")
: artist.isEmpty()
if (title.isEmpty()) {
return withMarkup ? albumText : (QLatin1String("<b>")+albumText+QLatin1String("</b>"));
}
QString descr=artist.isEmpty()
? i18nc("Song on Album", "<b>%1</b> on <b>%2</b>", title, albumText)
: i18nc("Song by Artist on Album", "<b>%1</b> by <b>%2</b> on <b>%3</b>", title, artist, albumText)
: title.isEmpty()
? albumText
: artist.isEmpty()
? i18nc("Song on Album", "%1 on %2", title, albumText)
: i18nc("Song by Artist on Album", "%1 by %2 on %3", title, artist, albumText);
: i18nc("Song by Artist on Album", "<b>%1</b> by <b>%2</b> on <b>%3</b>", title, artist, albumText);
if (!withMarkup) {
descr=descr.replace("<b>", "");
descr=descr.replace("</b>", "");
}
return descr;
}
//QString Song::basicDescription() const