Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Consistently use "Various artists" with a lower case "a"

This commit is contained in:
David Sansome 2011-10-30 16:53:39 +00:00
parent a2b95b7f54
commit 6d45415b00
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/globalsearch/globalsearchitemdelegate.cpp
View File

@ -159,7 +159,7 @@ void GlobalSearchItemDelegate::paint(QPainter* p,
if (!m.albumartist().isEmpty()) if (!m.albumartist().isEmpty())
line_1 += m.albumartist(); line_1 += m.albumartist();
else if (m.is_compilation()) else if (m.is_compilation())
line_1 += tr("Various Artists"); line_1 += tr("Various artists");
else if (!m.artist().isEmpty()) else if (!m.artist().isEmpty())
line_1 += m.artist(); line_1 += m.artist();
else else

2
src/library/librarymodel.cpp
View File

@ -218,7 +218,7 @@ LibraryItem* LibraryModel::CreateCompilationArtistNode(bool signal, LibraryItem*
compilation_artist_node_ = compilation_artist_node_ =
new LibraryItem(LibraryItem::Type_Container, parent); new LibraryItem(LibraryItem::Type_Container, parent);
compilation_artist_node_->key = tr("Various Artists"); compilation_artist_node_->key = tr("Various artists");
compilation_artist_node_->sort_text = " various"; compilation_artist_node_->sort_text = " various";
compilation_artist_node_->container_level = parent->container_level + 1; compilation_artist_node_->container_level = parent->container_level + 1;

3
src/translations/translations.pot
View File

@ -3024,9 +3024,6 @@ msgstr ""
msgid "Variable bit rate" msgid "Variable bit rate"
msgstr "" msgstr ""
msgid "Various Artists"
msgstr ""
msgid "Various artists" msgid "Various artists"
msgstr "" msgstr ""

2
tests/librarymodel_test.cpp
View File

@ -108,7 +108,7 @@ TEST_F(LibraryModelTest, CompilationAlbums) {
ASSERT_EQ(1, model_->rowCount(QModelIndex())); ASSERT_EQ(1, model_->rowCount(QModelIndex()));
QModelIndex va_index = model_->index(0, 0, QModelIndex()); QModelIndex va_index = model_->index(0, 0, QModelIndex());
EXPECT_EQ("Various Artists", va_index.data().toString()); EXPECT_EQ("Various artists", va_index.data().toString());
EXPECT_TRUE(model_->hasChildren(va_index)); EXPECT_TRUE(model_->hasChildren(va_index));
ASSERT_EQ(model_->rowCount(va_index), 1); ASSERT_EQ(model_->rowCount(va_index), 1);