mirror of
https://github.com/ankitects/anki.git
synced 2025-11-09 06:07:11 -05:00
fail silently when setting locale, automatically save personal deck on download
This commit is contained in:
parent
e5c898fb68
commit
b31ff97619
1 changed files with 14 additions and 12 deletions
|
|
@ -1965,7 +1965,10 @@ it to your friends.
|
||||||
|
|
||||||
def setLang(self):
|
def setLang(self):
|
||||||
"Set the user interface language."
|
"Set the user interface language."
|
||||||
locale.setlocale(locale.LC_ALL, '')
|
try:
|
||||||
|
locale.setlocale(locale.LC_ALL, '')
|
||||||
|
except:
|
||||||
|
pass
|
||||||
languageDir=os.path.join(ankiqt.modDir, "locale")
|
languageDir=os.path.join(ankiqt.modDir, "locale")
|
||||||
self.languageTrans = gettext.translation('ankiqt', languageDir,
|
self.languageTrans = gettext.translation('ankiqt', languageDir,
|
||||||
languages=[self.config["interfaceLang"]],
|
languages=[self.config["interfaceLang"]],
|
||||||
|
|
@ -2074,20 +2077,19 @@ it to your friends.
|
||||||
"Reopen after sync finished."
|
"Reopen after sync finished."
|
||||||
self.mainWin.buttonStack.show()
|
self.mainWin.buttonStack.show()
|
||||||
if self.loadAfterSync:
|
if self.loadAfterSync:
|
||||||
uprecent = self.loadAfterSync != 2
|
if self.loadAfterSync == 2:
|
||||||
self.loadDeck(self.deckPath, sync=False, uprecent=uprecent)
|
p = os.path.join(self.documentDir,
|
||||||
|
self.syncName + ".anki")
|
||||||
|
if os.path.exists(p):
|
||||||
|
p = os.path.join(self.documentDir,
|
||||||
|
self.syncName + "%d.anki"
|
||||||
|
% time.time())
|
||||||
|
shutil.copy2(self.deckPath, p)
|
||||||
|
self.deckPath = p
|
||||||
|
self.loadDeck(self.deckPath, sync=False)
|
||||||
self.deck.syncName = self.syncName
|
self.deck.syncName = self.syncName
|
||||||
self.deck.s.flush()
|
self.deck.s.flush()
|
||||||
self.deck.s.commit()
|
self.deck.s.commit()
|
||||||
if self.loadAfterSync == 2:
|
|
||||||
# ugly hack for open online: mark temp deck as in-memory
|
|
||||||
self.deck.tmpMediaDir = re.sub(
|
|
||||||
"(?i)\.(anki)$", ".media", self.deck.path)
|
|
||||||
self.deck.path = None
|
|
||||||
self.deck.flushMod()
|
|
||||||
if not self.onSaveAs():
|
|
||||||
self.deck = None
|
|
||||||
self.moveToState("noDeck")
|
|
||||||
elif not self.hideWelcome:
|
elif not self.hideWelcome:
|
||||||
self.moveToState("noDeck")
|
self.moveToState("noDeck")
|
||||||
self.deckPath = None
|
self.deckPath = None
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue