From 1f1fa125f039213dc2d61c99bd52d8bc207beddb Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 21 Dec 2012 18:04:26 +0900
Subject: [PATCH] fix i18n on linux install

---
 .gitignore      |  3 +--
 anki/lang.py    |  4 +++-
 aqt/__init__.py | 13 ++++---------
 runanki         | 13 ++-----------
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91689eef5..ad6d9373d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,7 @@
 *.mo
 *\#
 .*.swp
-samples
-unihan.db
 .coverage
 aqt/forms
 locale
+.idea
diff --git a/anki/lang.py b/anki/lang.py
index dd34c6ef6..9251e77d4 100644
--- a/anki/lang.py
+++ b/anki/lang.py
@@ -73,11 +73,13 @@ def langDir():
         os.path.abspath(__file__)), "locale")
     if not os.path.exists(dir):
         dir = os.path.join(os.path.dirname(sys.argv[0]), "locale")
+    if not os.path.exists(dir):
+        dir = "/usr/share/anki/locale"
     return dir
 
 def setLang(lang, local=True):
     trans = gettext.translation(
-        'libanki', langDir(), languages=[lang], fallback=True)
+        'anki', langDir(), languages=[lang], fallback=True)
     if local:
         threadLocal.currentLang = lang
         threadLocal.currentTranslation = trans
diff --git a/aqt/__init__.py b/aqt/__init__.py
index ca588d9be..c7eec9a0b 100644
--- a/aqt/__init__.py
+++ b/aqt/__init__.py
@@ -5,8 +5,8 @@ import os, sys, optparse, atexit, tempfile, __builtin__
 from aqt.qt import *
 import locale, gettext
 import anki.lang
-from anki.consts import HELP_SITE as appHelpSite
-from anki.hooks import runHook
+from anki.consts import HELP_SITE
+from anki.lang import langDir
 
 appVersion="2.0.3"
 appWebsite="http://ankisrs.net/"
@@ -14,6 +14,7 @@ appChanges="http://ankisrs.net/docs/changes.html"
 appDonate="http://ankisrs.net/support/"
 appShared="https://ankiweb.net/shared/"
 appUpdate="https://ankiweb.net/update/desktop"
+appHelpSite=HELP_SITE
 mw = None # set on init
 
 moduleDir = os.path.split(os.path.dirname(os.path.abspath(__file__)))[0]
@@ -71,12 +72,6 @@ dialogs = DialogManager()
 _gtrans = None
 _qtrans = None
 
-def langDir():
-    dir = os.path.join(moduleDir,  "aqt", "locale")
-    if not os.path.exists(dir):
-        dir = os.path.join(os.path.dirname(sys.argv[0]), "locale")
-    return dir
-
 def setupLang(pm, app, force=None):
     global _gtrans, _qtrans
     try:
@@ -87,7 +82,7 @@ def setupLang(pm, app, force=None):
     dir = langDir()
     # gettext
     _gtrans = gettext.translation(
-        'ankiqt', dir, languages=[lang], fallback=True)
+        'anki', dir, languages=[lang], fallback=True)
     __builtin__.__dict__['_'] = _gtrans.ugettext
     __builtin__.__dict__['ngettext'] = _gtrans.ungettext
     anki.lang.setLang(lang, local=False)
diff --git a/runanki b/runanki
index 924a64fd3..5de209e30 100755
--- a/runanki
+++ b/runanki
@@ -1,15 +1,6 @@
 #!/usr/bin/env python
 
-import os, sys
-# system-wide install
+import sys
 sys.path.insert(0, "/usr/share/anki")
-sys.path.insert(0, "/usr/share/anki/libanki")
-# running from extracted folder
-base = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, base)
-sys.path.insert(0, os.path.join(base, "libanki"))
-# or git
-sys.path.insert(0, os.path.join(base, "..", "libanki"))
-# start
-import anki, aqt
+import aqt
 aqt.run()