From 1c6572faa7ed72ebae947933a0a03787b947f2bb Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 1 Feb 2011 02:22:15 +0000 Subject: [PATCH] Put the list of locales in the bundle plist to make wxLANGUAGE_DEFAULT work. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7028 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/ConfigMain.cpp | 8 ++++---- Source/Core/DolphinWX/Src/ISOProperties.cpp | 4 ++-- Source/Core/DolphinWX/Src/SConscript | 6 +++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index d86796236c..db73394506 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -525,8 +525,8 @@ void CConfigMain::InitializeGUIValues() void CConfigMain::InitializeGUITooltips() { // General - Basic - CPUThread->SetToolTip(_("This splits the Video and CPU threads, so they can be run on separate cores.\nCauses major speed improvements on PCs with more than one core,\nbut can also cause occasional crashes/glitches.")); - Framelimit->SetToolTip(_("If you set Framelimit higher than game full speed (NTSC:60, PAL:50),\nyou also have to disable Audio Throttle in DSP to make it effective.")); + CPUThread->SetToolTip(_("This splits the Video and CPU threads, so they can be run on separate cores.\nCauses major speed improvements on PCs with more than one core, but can also cause occasional crashes/glitches.")); + Framelimit->SetToolTip(_("If you set Framelimit higher than game full speed (NTSC:60, PAL:50), you also have to disable Audio Throttle in DSP to make it effective.")); // General - Advanced DSPThread->SetToolTip(_("Run DSPLLE on a dedicated thread (not recommended).")); @@ -537,14 +537,14 @@ void CConfigMain::InitializeGUITooltips() WindowHeight->SetToolTip(_("Window height for windowed mode")); WindowAutoSize->SetToolTip(_("Auto size the window to match the game's output resolution adjusted by the EFB scale.\nIt is best to set the aspect ratio to stretch when using this.")); Fullscreen->SetToolTip(_("Start the rendering window in fullscreen mode.")); - HideCursor->SetToolTip(_("Hide the cursor when it is over the rendering window\n and the rendering window has focus.")); + HideCursor->SetToolTip(_("Hide the cursor when it is over the rendering window and the rendering window has focus.")); RenderToMain->SetToolTip(_("Render to main window.")); ProgressiveScan->SetToolTip(_("Will enable progressive scan option if supported by software.")); NTSCJ->SetToolTip(_("Required for using the Japanese ROM font.")); // Display - Interface ConfirmStop->SetToolTip(_("Show a confirmation box before stopping a game.")); - UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin\nsuddenly crashes without any explanation at all.")); + UsePanicHandlers->SetToolTip(_("Show a message box when a potentially serious error has occured.\nDisabling this may avoid annoying and non-fatal messages, but it may also mean that Dolphin suddenly crashes without any explanation at all.")); // Display - Themes: Copyright notice Theme->SetItemToolTip(0, _("Created by Milosz Wlazlo [miloszwl@miloszwl.com, miloszwl.deviantart.com]")); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index 135bd9717e..a19c0a778e 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -1019,7 +1019,7 @@ void CISOProperties::LoadGameConfig() PHackChoice->Enable(bTemp); PHackChoice->Clear(); - PHackChoice->Append(wxString(_("Custom"), *wxConvCurrent)); + PHackChoice->Append(_("Custom")); for (int i=0 ; ; i++) { sprintf(sIndex,"%d",i); @@ -1027,7 +1027,7 @@ void CISOProperties::LoadGameConfig() break; PHPresetsIni.Get(sIndex, "Title", &sTemp); if (sTemp.empty()) - sTemp = wxString(_("(UNKNOWN)"), *wxConvCurrent).char_str(); + sTemp = _("(UNKNOWN)").char_str(); if (i == 0) PHackChoice->Append(wxString("-----------", *wxConvCurrent)); PHackChoice->Append(wxString(sTemp.c_str(), *wxConvCurrent)); diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 8e7f78ad08..044d5e21e3 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -80,18 +80,21 @@ elif sys.platform == 'darwin': env.Install(env['data_dir'], '#Source/Core/DolphinWX/resources/Dolphin.icns') + languages = [] msgfmt = env.WhereIs('msgfmt') if not msgfmt == None: po_files = Glob('#Languages/*.po', strings = True) for po in po_files: index_lo = po.find('Languages/') + len('Languages/') index_hi = po.find('.po') - lproj = os.sep + po[index_lo:index_hi] + '.lproj' + lang = po[index_lo:index_hi] + lproj = os.sep + lang + '.lproj' mo_dir = env['build_dir'] + '/Languages' + lproj mo_file = mo_dir + '/dolphin-emu.mo' env.Command('#' + mo_file, po, 'mkdir -p ' + mo_dir + ' && ' + msgfmt + ' -o ' + mo_file + ' ' + po) env.Install(env['data_dir'] + lproj, '#' + mo_file) + languages += [lang] from plistlib import writePlist def createPlist(target, source, env): @@ -103,6 +106,7 @@ elif sys.platform == 'darwin': CFBundleExecutable = 'Dolphin', CFBundleIconFile = 'Dolphin.icns', CFBundleIdentifier = 'com.dolphin-emulator.dolphin', + CFBundleLocalizations = languages, CFBundlePackageType = 'APPL', CFBundleShortVersionString = utils.GenerateRevFile('', Dir('#None').abspath, None),