From 98cc0aa6193d4bd5bc4650c520f39202240f6f53 Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Tue, 21 May 2019 13:18:14 +0200
Subject: [PATCH] Handling plural forms

---
 approot/messages.xml     | 14 +++++++++++---
 approot/messages_fr.xml  | 13 ++++++++++---
 src/ui/PlayQueueView.cpp |  4 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/approot/messages.xml b/approot/messages.xml
index 8527a8ea..887c6073 100644
--- a/approot/messages.xml
+++ b/approot/messages.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<messages xmlns:if="Wt.WTemplate.conditions">
+<messages xmlns:if="Wt.WTemplate.conditions"
+	nplurals="2" plural="n > 1 ? 1 : 0">
 
 <!--Common-->
 <message id="Lms.add">Add</message>
@@ -100,8 +101,14 @@
 <!--Playqueue-->
 <message id="Lms.PlayQueue.clear">Clear</message>
 <message id="Lms.PlayQueue.nb-tracks">{1} tracks</message>
-<message id="Lms.PlayQueue.nb-tracks-added">Added {1} tracks</message>
-<message id="Lms.PlayQueue.nb-tracks-playing">Playing {1} tracks</message>
+<message id="Lms.PlayQueue.nb-tracks-added">
+	<plural case="0">Added {1} track</plural>
+	<plural case="1">Added {1} tracks</plural>
+</message>
+<message id="Lms.PlayQueue.nb-tracks-playing">
+	<plural case="0">Playing {1} track</plural>
+	<plural case="1">Playing {1} tracks</plural>
+</message>
 <message id="Lms.PlayQueue.playqueue">Play Queue</message>
 <message id="Lms.PlayQueue.radio-mode">Radio mode</message>
 <message id="Lms.PlayQueue.repeat">Repeat</message>
@@ -132,3 +139,4 @@
 <message id="Wt.Auth.password-info"></message>
 
 </messages>
+
diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml
index 3bf1c739..6044714d 100644
--- a/approot/messages_fr.xml
+++ b/approot/messages_fr.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<messages xmlns:if="Wt.WTemplate.conditions">
+<messages xmlns:if="Wt.WTemplate.conditions"
+	nplurals="2" plural="n > 1 ? 1 : 0">
 
 <!--Common-->
 <message id="Lms.add">Ajouter</message>
@@ -100,8 +101,14 @@
 <!--Playqueue-->
 <message id="Lms.PlayQueue.clear">Effacer</message>
 <message id="Lms.PlayQueue.nb-tracks">{1} pistes</message>
-<message id="Lms.PlayQueue.nb-tracks-added">{1} pistes ajoutées</message>
-<message id="Lms.PlayQueue.nb-tracks-playing">{1} pistes ajoutées</message>
+<message id="Lms.PlayQueue.nb-tracks-playing">
+	<plural case="0">{1} piste ajoutée</plural>
+	<plural case="1">{1} pistes ajoutées</plural>
+</message>
+<message id="Lms.PlayQueue.nb-tracks-added">
+	<plural case="0">{1} piste ajoutée</plural>
+	<plural case="1">{1} pistes ajoutées</plural>
+</message>
 <message id="Lms.PlayQueue.playqueue">Liste de lecture</message>
 <message id="Lms.PlayQueue.radio-mode">Mode radio</message>
 <message id="Lms.PlayQueue.repeat">Repéter</message>
diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp
index 8734b830..95cd986b 100644
--- a/src/ui/PlayQueueView.cpp
+++ b/src/ui/PlayQueueView.cpp
@@ -298,7 +298,7 @@ void
 PlayQueue::addTracks(const std::vector<Database::Track::pointer>& tracks)
 {
 	enqueueTracks(tracks);
-	LmsApp->notifyMsg(MsgType::Info, Wt::WString::tr("Lms.PlayQueue.nb-tracks-added").arg(tracks.size()), std::chrono::milliseconds(2000));
+	LmsApp->notifyMsg(MsgType::Info, Wt::WString::trn("Lms.PlayQueue.nb-tracks-added", tracks.size()).arg(tracks.size()), std::chrono::milliseconds(2000));
 }
 
 void
@@ -310,7 +310,7 @@ PlayQueue::playTracks(const std::vector<Database::Track::pointer>& tracks)
 	enqueueTracks(tracks);
 	load(0, true);
 
-	LmsApp->notifyMsg(MsgType::Info, Wt::WString::tr("Lms.PlayQueue.nb-tracks-playing").arg(tracks.size()), std::chrono::milliseconds(2000));
+	LmsApp->notifyMsg(MsgType::Info, Wt::WString::trn("Lms.PlayQueue.nb-tracks-playing", tracks.size()).arg(tracks.size()), std::chrono::milliseconds(2000));
 }