Fix issues with other merges

This commit is contained in:
Tim Bentley 2010-09-22 06:03:10 +01:00
parent 5e38d34997
commit 47b359a313

View File

@ -111,18 +111,18 @@ class LanguageManager(object):
action_name = u'en' action_name = u'en'
else: else:
action_name = u'%s' % action.objectName() action_name = u'%s' % action.objectName()
qm_list = LanguageManager.get_qm_list() qm_list = LanguageManager.get_qm_list()
if LanguageManager.auto_language: if LanguageManager.auto_language:
language = u'[%s]' % qm_list[action_name] language = u'[%s]' % qm_list[action_name]
else: else:
language = u'%s' % qm_list[action_name] language = u'%s' % qm_list[action_name]
QtCore.QSettings().setValue( QtCore.QSettings().setValue(
u'general/language', QtCore.QVariant(language)) u'general/language', QtCore.QVariant(language))
log.info(u'Language file: \'%s\' written to conf file' % language) log.info(u'Language file: \'%s\' written to conf file' % language)
QtGui.QMessageBox.information(None, QtGui.QMessageBox.information(None,
translate('OpenLP.LanguageManager', 'Language'), translate('OpenLP.LanguageManager', 'Language'),
translate('OpenLP.LanguageManager', translate('OpenLP.LanguageManager',
'Please restart OpenLP to use your new language setting.')) 'Please restart OpenLP to use your new language setting.'))
@staticmethod @staticmethod
def init_qm_list(): def init_qm_list():