fix mac OSX startup - now it actually starts

Conflicts:

	pyfpdb/Configuration.py
This commit is contained in:
Steffen Schaumburg 2011-04-09 20:45:22 +02:00
parent 00c3c114a8
commit 5e047710ea

View File

@ -207,9 +207,8 @@ DATABASE_TYPES = (
DATABASE_TYPE_MYSQL, DATABASE_TYPE_MYSQL,
) )
LOCALE_ENCODING = locale.getdefaultlocale()[1] LOCALE_ENCODING = locale.getpreferredencoding()
#LOCALE_ENCODING = locale.getpreferredencoding() #this breaks on Mac OSX - please leave this comment if LOCALE_ENCODING in ("US-ASCII", "", None):
if LOCALE_ENCODING == "US-ASCII":
print _("Default encoding set to US-ASCII, defaulting to CP1252 instead -- If you're not on a Mac, please report this problem.") print _("Default encoding set to US-ASCII, defaulting to CP1252 instead -- If you're not on a Mac, please report this problem.")
LOCALE_ENCODING = "cp1252" LOCALE_ENCODING = "cp1252"