From 6d45415b00a2fcabc7ce70710cc06c10b782c9ec Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sun, 30 Oct 2011 16:53:39 +0000 Subject: [PATCH] Consistently use "Various artists" with a lower case "a" --- src/globalsearch/globalsearchitemdelegate.cpp | 2 +- src/library/librarymodel.cpp | 2 +- src/translations/translations.pot | 3 --- tests/librarymodel_test.cpp | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/globalsearch/globalsearchitemdelegate.cpp b/src/globalsearch/globalsearchitemdelegate.cpp index ded793dd9..c5a7693ee 100644 --- a/src/globalsearch/globalsearchitemdelegate.cpp +++ b/src/globalsearch/globalsearchitemdelegate.cpp @@ -159,7 +159,7 @@ void GlobalSearchItemDelegate::paint(QPainter* p, if (!m.albumartist().isEmpty()) line_1 += m.albumartist(); else if (m.is_compilation()) - line_1 += tr("Various Artists"); + line_1 += tr("Various artists"); else if (!m.artist().isEmpty()) line_1 += m.artist(); else diff --git a/src/library/librarymodel.cpp b/src/library/librarymodel.cpp index 06a3f2beb..46d985d76 100644 --- a/src/library/librarymodel.cpp +++ b/src/library/librarymodel.cpp @@ -218,7 +218,7 @@ LibraryItem* LibraryModel::CreateCompilationArtistNode(bool signal, LibraryItem* compilation_artist_node_ = 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_->container_level = parent->container_level + 1; diff --git a/src/translations/translations.pot b/src/translations/translations.pot index 7f2f1da2f..2d1bbdea4 100644 --- a/src/translations/translations.pot +++ b/src/translations/translations.pot @@ -3024,9 +3024,6 @@ msgstr "" msgid "Variable bit rate" msgstr "" -msgid "Various Artists" -msgstr "" - msgid "Various artists" msgstr "" diff --git a/tests/librarymodel_test.cpp b/tests/librarymodel_test.cpp index bd7bb2441..7596c3a60 100644 --- a/tests/librarymodel_test.cpp +++ b/tests/librarymodel_test.cpp @@ -108,7 +108,7 @@ TEST_F(LibraryModelTest, CompilationAlbums) { ASSERT_EQ(1, model_->rowCount(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)); ASSERT_EQ(model_->rowCount(va_index), 1);