LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merge PR #960

Browse Source
This commit is contained in:
Andrew Chin
2013-08-03 12:07:49 -04:00
parent 7b47a3266f 3221d3dc85
commit a8e7f16369
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
overviewer_core/assetmanager.py
View File

@@ -55,6 +55,16 @@ directory.
logging.debug(traceback.format_exc()) logging.debug(traceback.format_exc())
self.overviewerConfig = dict(tilesets=dict()) self.overviewerConfig = dict(tilesets=dict())
# Make sure python knows the preferred encoding. If it does not, set it
# to utf-8"
self.preferredencoding = locale.getpreferredencoding()
try:
# We don't care what is returned, just that we can get a codec.
codecs.lookup(self.preferredencoding)
except LookupError:
self.preferredencoding = "utf_8"
logging.debug("Preferred enoding set to: %s", self.preferredencoding)
def get_tileset_config(self, name): def get_tileset_config(self, name):
"Return the correct dictionary from the parsed overviewerConfig.js" "Return the correct dictionary from the parsed overviewerConfig.js"
for conf in self.overviewerConfig['tilesets']: for conf in self.overviewerConfig['tilesets']:
@@ -185,7 +195,7 @@ directory.
index = codecs.open(indexpath, 'r', encoding='UTF-8').read() index = codecs.open(indexpath, 'r', encoding='UTF-8').read()
index = index.replace("{title}", "Minecraft Overviewer") index = index.replace("{title}", "Minecraft Overviewer")
index = index.replace("{time}", time.strftime("%a, %d %b %Y %H:%M:%S %Z", time.localtime()).decode(locale.getpreferredencoding())) index = index.replace("{time}", time.strftime("%a, %d %b %Y %H:%M:%S %Z", time.localtime()).decode(self.preferredencoding))
versionstr = "%s (%s)" % (util.findGitVersion(), util.findGitHash()[:7]) versionstr = "%s (%s)" % (util.findGitVersion(), util.findGitHash()[:7])
index = index.replace("{version}", versionstr) index = index.replace("{version}", versionstr)