fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-01-06 08:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:musicbrainz/picard

Browse Source
This commit is contained in:
Michael Wiencek
2012-09-08 23:53:49 -05:00
parent b36d88ad46 accb6b9b3f
commit eb72e12df8
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
picard/tagger.py
View File

@@ -206,9 +206,10 @@ class Tagger(QtGui.QApplication):
def setup_gettext(self, localedir):
"""Setup locales, load translations, install gettext functions."""
if self.config.setting["ui_language"]:
ui_language = self.config.setting["ui_language"]
if ui_language:
os.environ['LANGUAGE'] = ''
os.environ['LANG'] = self.config.setting["ui_language"]
os.environ['LANG'] = ui_language
if sys.platform == "win32":
try:
locale.setlocale(locale.LC_ALL, os.environ["LANG"])
@@ -221,6 +222,13 @@ class Tagger(QtGui.QApplication):
except:
pass
else:
if sys.platform == "darwin" and not ui_language:
try:
import Foundation
defaults = Foundation.NSUserDefaults.standardUserDefaults()
os.environ["LANG"] = defaults.objectForKey_("AppleLanguages")[0]
except:
pass
try:
locale.setlocale(locale.LC_ALL, "")
except:

3
picard/ui/mainwindow.py
View File

@@ -255,6 +255,7 @@ class MainWindow(QtGui.QMainWindow):
def create_actions(self):
self.options_action = QtGui.QAction(icontheme.lookup('preferences-desktop'), _("&Options..."), self)
self.options_action.setMenuRole(QtGui.QAction.PreferencesRole)
self.options_action.triggered.connect(self.show_options)
self.cut_action = QtGui.QAction(icontheme.lookup('edit-cut', icontheme.ICON_SIZE_MENU), _(u"&Cut"), self)
@@ -273,6 +274,7 @@ class MainWindow(QtGui.QMainWindow):
self.help_action.triggered.connect(self.show_help)
self.about_action = QtGui.QAction(_("&About..."), self)
self.about_action.setMenuRole(QtGui.QAction.AboutRole)
self.about_action.triggered.connect(self.show_about)
self.donate_action = QtGui.QAction(_("&Donate..."), self)
@@ -309,6 +311,7 @@ class MainWindow(QtGui.QMainWindow):
self.submit_action.triggered.connect(self._on_submit)
self.exit_action = QtGui.QAction(_(u"E&xit"), self)
self.exit_action.setMenuRole(QtGui.QAction.QuitRole)
# TR: Keyboard shortcut for "Exit"
self.exit_action.setShortcut(QtGui.QKeySequence(_(u"Ctrl+Q")))
self.exit_action.triggered.connect(self.close)

2
setup.py
View File

@@ -30,7 +30,7 @@ try:
'iconfile' : 'picard.icns',
'frameworks' : ['libofa.0.dylib', 'libiconv.2.dylib', 'libdiscid.0.dylib'],
'resources' : ['locale'],
'includes' : ['sip', 'PyQt4', 'picard.util.astrcmp', 'picard.musicdns.ofa', 'picard.musicdns.avcodec'],
'includes' : ['sip', 'PyQt4', 'Foundation', 'picard.util.astrcmp', 'picard.musicdns.ofa', 'picard.musicdns.avcodec'],
'excludes' : ['pydoc', 'PyQt4.QtDeclarative', 'PyQt4.QtDesigner', 'PyQt4.QtHelp', 'PyQt4.QtMultimedia',
'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtScriptTools', 'PyQt4.QtSql', 'PyQt4.QtSvg',
'PyQt4.QtTest', 'PyQt4.QtWebKit', 'PyQt4.QtXmlPatterns', 'PyQt4.phonon'],