CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-09-21 03:51:26 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/Exporter

Browse source
This commit is contained in:
Olivier Keshavjee 2016-04-02 13:00:23 +02:00
commit d20a9972c9
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
i18n/manuskript_es.qm
View file

Binary file not shown.

2
i18n/manuskript_es.ts
View file

@ -139,7 +139,7 @@
<message>
<location filename="../manuskript/ui/mainWindow.ui" line="1377"/>
<source>Full</source>
<translation>Lleno</translation>
<translation>Completo</translation>
</message>
<message>
<location filename="../manuskript/ui/mainWindow.ui" line="420"/>

1
manuskript.spec
View file

@ -11,6 +11,7 @@ a = Analysis(['bin/manuskript'],
("libs", "libs"),
("resources", "resources"),
("sample-projects", "sample-projects"),
("i18n", "i18n"),
],
hiddenimports=["xml.dom"],
hookspath=[],

23
manuskript/load_save/version_1.py
View file

@ -364,9 +364,14 @@ def saveProject(zip=None):
# Check if content is in cache, and write if necessary
if path not in cache or cache[path] != content:
log("* Writing file {} ({})".format(path, "not in cache" if path not in cache else "different"))
mode = "w" + ("b" if type(content) == bytes else "")
with open(filename, mode) as f:
f.write(content)
# mode = "w" + ("b" if type(content) == bytes else "")
if type(content) == bytes:
with open(filename, "wb") as f:
f.write(content)
else:
with open(filename, "w", encoding='utf8') as f:
f.write(content)
cache[path] = content
# Removing phantoms
@ -395,7 +400,7 @@ def saveProject(zip=None):
pass
# Write the project file's content
with open(project, "w") as f:
with open(project, "w", encoding='utf8') as f:
f.write("1") # Format number
@ -622,9 +627,13 @@ def loadProject(project, zip=None):
for dirpath, dirnames, filenames in os.walk(path):
p = dirpath.replace(path, "")
for f in filenames:
mode = "r" + ("b" if f[-4:] in [".xml", "opml"] else "")
with open(os.path.join(dirpath, f), mode) as fo:
files[os.path.join(p, f)] = fo.read()
# mode = "r" + ("b" if f[-4:] in [".xml", "opml"] else "")
if f[-4:] in [".xml", "opml"]:
with open(os.path.join(dirpath, f), "rb") as fo:
files[os.path.join(p, f)] = fo.read()
else:
with open(os.path.join(dirpath, f), "r", encoding="utf8") as fo:
files[os.path.join(p, f)] = fo.read()
# Saves to cache (only if we loaded from disk and not zip)
global cache