Merge branch 'master' into remotesetting

This commit is contained in:
chrys 2018-09-06 23:38:28 +02:00
commit 4d98a46ca4
2 changed files with 4 additions and 2 deletions

View File

@ -26,7 +26,6 @@ class command():
return _('checks the spelling of the current word') return _('checks the spelling of the current word')
def updateSpellLanguage(self): def updateSpellLanguage(self):
if not initialized: if not initialized:
self.env['runtime']['outputManager'].presentText(_('pyenchant is not installed'), interrupt=True)
return return
self.spellChecker = enchant.Dict(self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')) self.spellChecker = enchant.Dict(self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage'))
self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')

View File

@ -258,6 +258,9 @@ class settingsManager():
environment['runtime']['punctuationManager'] = punctuationManager.punctuationManager() environment['runtime']['punctuationManager'] = punctuationManager.punctuationManager()
environment['runtime']['punctuationManager'].initialize(environment) environment['runtime']['punctuationManager'].initialize(environment)
environment['runtime']['textManager'] = textManager.textManager()
environment['runtime']['textManager'].initialize(environment)
if not os.path.exists(self.getSetting('general','punctuationProfile')): if not os.path.exists(self.getSetting('general','punctuationProfile')):
if os.path.exists(settingsRoot + 'punctuation/' + self.getSetting('general','punctuationProfile')): if os.path.exists(settingsRoot + 'punctuation/' + self.getSetting('general','punctuationProfile')):
self.setSetting('general', 'punctuationProfile', settingsRoot + 'punctuation/' + self.getSetting('general','punctuationProfile')) self.setSetting('general', 'punctuationProfile', settingsRoot + 'punctuation/' + self.getSetting('general','punctuationProfile'))