From ab2f1f9dffb1a23c6643b0449bda78c823e0bb8a Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sat, 5 Sep 2015 10:29:11 +0200
Subject: [PATCH] Fixed the plural typo in the artist list

---
 app/build.gradle                                            | 4 ++--
 app/src/main/assets/changelog.html                          | 6 ++++++
 .../main/java/com/kabouzeid/gramophone/util/MusicUtil.java  | 6 ++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d83305d3..8d158ec6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,8 +59,8 @@ android {
         applicationId "com.kabouzeid.gramophone"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 72
-        versionName "0.9.44 beta5"
+        versionCode 73
+        versionName "0.9.44 beta6"
     }
     buildTypes {
         release {
diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 1ccd8613..db61ef8d 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -25,6 +25,12 @@
 
 <p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>
 
+<h3>Version 0.9.44 beta6</h3>
+
+<ol>
+    <li><b>FIX:</b> Fixed the plural typo in the artist list.</li>
+</ol>
+
 <h3>Version 0.9.44 beta5</h3>
 
 <ol>
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
index c9525ee3..1f53acc1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
@@ -109,8 +109,10 @@ public class MusicUtil {
     }
 
     @NonNull
-    public static String getArtistInfoString(@NonNull Context context, @NonNull Artist artist) {
-        return artist.songCount + " " + context.getResources().getString(R.string.songs) + " | " + artist.albumCount + " " + context.getResources().getString(R.string.albums);
+    public static String getArtistInfoString(@NonNull final Context context, @NonNull final Artist artist) {
+        String albumString = artist.albumCount == 1 ? context.getResources().getString(R.string.album) : context.getResources().getString(R.string.albums);
+        String songString = artist.songCount == 1 ? context.getResources().getString(R.string.song) : context.getResources().getString(R.string.songs);
+        return artist.albumCount + " " + albumString + " | " + artist.songCount + " " + songString;
     }
 
     public static String getReadableDurationString(long songDurationMillis) {