diff options
Diffstat (limited to 'speak/voice.py')
| -rw-r--r-- | speak/voice.py | 41 |
1 files changed, 4 insertions, 37 deletions
diff --git a/speak/voice.py b/speak/voice.py index 7dbeb5e..5fc732e 100644 --- a/speak/voice.py +++ b/speak/voice.py @@ -21,8 +21,7 @@ # You should have received a copy of the GNU General Public License # along with Speak.activity. If not, see <http://www.gnu.org/licenses/>. -import re -import os +import re, os from gettext import gettext as _ import logging @@ -82,38 +81,8 @@ class Voice: friendlyname = friendlyname.replace('_test','') friendlyname = friendlyname.replace('en-','') friendlyname = friendlyname.replace('english-wisper','whisper') - friendlyname = friendlyname.replace('english-us', 'us') - - - friendlynameRP = name # friendlyname for RP - friendlynameRP = friendlynameRP.replace('english_rp', 'rp') - friendlynameRP = friendlynameRP.replace('english_wmids', 'wmids') - - parts = re.split('[ _-]', friendlyname) - partsRP = re.split('[ _]', friendlynameRP) #RE for english_RP - self.short_name = _(parts[0].capitalize()) - self.friendlyname = ' '.join([self.short_name] + parts[1:]) - - friendlynameRP1 = None - if friendlynameRP == 'rp': - - friendlynameRP1 = 'English (Required Pronunciation)' - self.friendlyname = 'English (Required Pronunciation)' - - friendlynameUS = None - if friendlyname == 'us': - friendlynameUS = 'English (USA)' - self.friendlyname = 'English (USA)' - - friendlynameWMIDS = None - if friendlynameRP == 'wmids': - friendlynameWMIDS = 'English (West Midlands)' - self.friendlyname = 'English (West Midlands)' - - - def __cmp__(self, other): - return cmp(self.friendlyname, other.friendlyname if other else '') - + friendlyname = friendlyname.capitalize() + self.friendlyname = _(friendlyname) def allVoices(): if _allVoices: @@ -122,14 +91,12 @@ def allVoices(): for language, name in espeak.voices(): voice = Voice(language, name) _allVoices[voice.friendlyname] = voice - - return _allVoices + return _allVoices def by_name(name): return allVoices().get(name, defaultVoice()) - def defaultVoice(): """Try to figure out the default voice, from the current locale ($LANG). Fall back to espeak's voice called Default.""" |