Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-20 13:50:24 +02:00
commit 3bcbb831e1

View file

@ -625,10 +625,10 @@ public class VoiceRouter {
pn = pn.replace(':', ' '); pn = pn.replace(':', ' ');
pn = pn.replace(";", ", "); // Trailing blank prevents punctuation being pronounced. Replace by comma for better intonation. pn = pn.replace(";", ", "); // Trailing blank prevents punctuation being pronounced. Replace by comma for better intonation.
pn = pn.replace("/", ", "); // Slash is actually pronounced by many TTS engines, ceeating an awkward voice prompt, better replace by comma. pn = pn.replace("/", ", "); // Slash is actually pronounced by many TTS engines, ceeating an awkward voice prompt, better replace by comma.
if ((player != null) && (!"de".equals(player.getLanguage()))) { if ((player != null) && (!player.getLanguage().equals("de"))) {
pn = pn.replace("\u00df", "ss"); // Helps non-German tts voices to pronounce German Strasse (=street) pn = pn.replace("\u00df", "ss"); // Helps non-German tts voices to pronounce German Strasse (=street)
} }
if ((player != null) && ("en".startsWith(player.getLanguage()))) { if ((player != null) && (player.getLanguage().startsWith("en"))) {
pn = pn.replace("SR", "S R"); // Avoid SR (as for State Route or Strada Regionale) be pronounced as "Senior" in English tts voice pn = pn.replace("SR", "S R"); // Avoid SR (as for State Route or Strada Regionale) be pronounced as "Senior" in English tts voice
pn = pn.replace("Dr.", "Dr "); // Avoid pause many English TTS voices introduce after period pn = pn.replace("Dr.", "Dr "); // Avoid pause many English TTS voices introduce after period
} }