From ddb8db8dd7b6f0fc5701b95a94ce3a95b62183cb Mon Sep 17 00:00:00 2001
From: David Bailes <DavidBailes@users.noreply.github.com>
Date: Thu, 11 May 2017 13:01:42 +0100
Subject: [PATCH] Modify the screen reader messages of some of the keyboard
 clip commands

As suggested by Robert, add the word clip/clips to make the messages less confusing and noticeably different from the next/prev label messages.
---
 src/Menus.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 3fc50d95f..7f21ae22a 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -5681,10 +5681,10 @@ void AudacityProject::OnSelectClip(bool next)
 
             message += temp;
          }
-         if (result.waveTrack->GetNumClips() > 1 || nTracksSearched == 1) {
-            temp.Printf(wxT("%d %s %d "), result.index + 1, _("of"), result.waveTrack->GetNumClips());
-            message += temp;
-         }
+         temp.Printf(wxT("%d %s %d %s "), result.index + 1, _("of"), result.waveTrack->GetNumClips(),
+            result.waveTrack->GetNumClips() == 1 ? _("clip") : _("clips"));
+         message += temp;
+
          message += wxT(", ");
       }
       mTrackPanel->MessageForScreenReader(message);
@@ -6745,10 +6745,11 @@ wxString AudacityProject::ClipBoundaryMessage(int nTracksSearched, const std::ve
          message += temp;
       }
       message += (result.clipStart1 ? _("start") : _("end")) + wxT(" ");
-      if (result.waveTrack->GetNumClips() > 1 ) {
-         temp.Printf(wxT("%d %s %d "), result.index1 + 1, _("of"), result.waveTrack->GetNumClips());
-         message += temp;
-      }
+
+      temp.Printf(wxT("%d %s %d %s "), result.index1 + 1, _("of"), result.waveTrack->GetNumClips(),
+         result.waveTrack->GetNumClips() == 1 ? _("clip") : _("clips"));
+      message += temp;
+
       if (result.nFound == 2) {
          temp.Printf(wxT("%s %s %d "), _("and"), result.clipStart2 ? _("start") : _("end"),
             result.index2 + 1);