Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win32 fix

Browse Source 
svn: r21529
This commit is contained in:
Josip Pisoj 2013-03-03 00:08:15 +00:00
parent 4ca0c9f8c9
commit 8ea29ede81
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps/gen/datehandler/_grampslocale.py
View File

@ -45,7 +45,10 @@ else:
try: try:
codeset = glocale.get_translation().info()["charset"] codeset = glocale.get_translation().info()["charset"]
except KeyError: except KeyError:
codeset = "UTF-8" if win():
codeset = locale.getlocale()[1]
else:
codeset = "UTF-8"
try: try:

5
setup.py
View File

@ -243,6 +243,9 @@ def write_const_py(command):
data_dir = os.path.join(share_dir, 'gramps') data_dir = os.path.join(share_dir, 'gramps')
image_dir = os.path.join(share_dir, 'gramps', 'icons', 'hicolor') image_dir = os.path.join(share_dir, 'gramps', 'icons', 'hicolor')
doc_dir = os.path.join(share_dir, 'doc', 'gramps') doc_dir = os.path.join(share_dir, 'doc', 'gramps')
if sys.platform == 'win32':
locale_dir= locale_dir.replace('\\', '\\\\')
else: else:
#in build #in build
if 'install' in command.distribution.command_obj: if 'install' in command.distribution.command_obj:
@ -253,6 +256,8 @@ def write_const_py(command):
data_dir = os.path.join(base_dir, 'data') data_dir = os.path.join(base_dir, 'data')
image_dir = os.path.join(base_dir, 'images') image_dir = os.path.join(base_dir, 'images')
doc_dir = base_dir doc_dir = base_dir
if sys.platform == 'win32':
locale_dir= locale_dir.replace('\\', '\\\\')
subst_vars = (('@VERSIONSTRING@', VERSION), subst_vars = (('@VERSIONSTRING@', VERSION),
('@LOCALE_DIR@', locale_dir), ('@LOCALE_DIR@', locale_dir),