explicitly import _ and ngettext

aqt/about.py

@@ -6,6 +6,7 @@ from aqt.qt import *
 import aqt.forms
 from anki.utils import versionWithBuild
 from aqt.utils import supportText, tooltip
+from anki.lang import _
 
 class ClosableQDialog(QDialog):
     def reject(self):

aqt/addons.py

@@ -17,7 +17,7 @@ from zipfile import ZipFile
 import aqt.forms
 import aqt
 from aqt.downloader import download
-from anki.lang import _
+from anki.lang import _, ngettext
 from anki.utils import intTime
 from anki.sync import AnkiRequestsClient
 

aqt/browser.py

@@ -21,6 +21,7 @@ from aqt.utils import saveGeom, restoreGeom, saveSplitter, restoreSplitter, \
     saveHeader, restoreHeader, saveState, restoreState, getTag, \
     showInfo, askUser, tooltip, openHelp, showWarning, shortcut, mungeQA, \
     getOnlyText, MenuList, SubMenu, qtMenuShortcutWorkaround
+from anki.lang import _
 from anki.hooks import runHook, addHook, remHook, runFilter
 from aqt.webview import AnkiWebView
 from anki.consts import *

aqt/clayout.py

@@ -16,7 +16,7 @@ from anki.utils import isMac, isWin, joinFields, bodyClass
 from aqt.webview import AnkiWebView
 import json
 from anki.hooks import runFilter
-
+from anki.lang import _, ngettext
 
 class CardLayout(QDialog):
 

aqt/customstudy.py

@@ -6,6 +6,7 @@ from aqt.qt import *
 import aqt
 from aqt.utils import showInfo, showWarning
 from anki.consts import *
+from anki.lang import _
 
 RADIO_NEW = 1
 RADIO_REV = 2

aqt/deckbrowser.py

@@ -11,6 +11,7 @@ import aqt
 from anki.sound import clearAudioQueue
 from anki.hooks import runHook
 from copy import deepcopy
+from anki.lang import _, ngettext
 
 class DeckBrowser:
 

aqt/deckchooser.py

@@ -5,6 +5,7 @@
 from aqt.qt import *
 from anki.hooks import addHook, remHook
 from aqt.utils import  shortcut
+from anki.lang import _
 
 class DeckChooser(QHBoxLayout):
 

aqt/deckconf.py

@@ -8,7 +8,7 @@ from aqt.qt import *
 import aqt
 from aqt.utils import showInfo, showWarning, openHelp, getOnlyText, askUser, \
     tooltip, saveGeom, restoreGeom, downArrow
-
+from anki.lang import _, ngettext
 
 class DeckConf(QDialog):
     def __init__(self, mw, deck):

aqt/downloader.py

@@ -8,6 +8,7 @@ from anki.sync import AnkiRequestsClient
 from aqt.utils import showWarning
 from anki.hooks import addHook, remHook
 import aqt
+from anki.lang import _
 
 def download(mw, code):
     "Download addon from AnkiWeb. Caller must start & stop progress diag."

aqt/dyndeckconf.py

@@ -5,6 +5,7 @@
 from aqt.qt import *
 import aqt
 from aqt.utils import  showWarning, openHelp, askUser, saveGeom, restoreGeom
+from anki.lang import _
 
 class DeckConf(QDialog):
     def __init__(self, mw, first=False, search="", deck=None):

aqt/editcurrent.py

@@ -8,7 +8,7 @@ import aqt.editor
 from aqt.utils import saveGeom, restoreGeom
 from anki.hooks import addHook, remHook
 from anki.utils import isMac
-
+from anki.lang import _
 
 class EditCurrent(QDialog):
 

aqt/exporting.py

@@ -10,7 +10,7 @@ from aqt.utils import getSaveFile, tooltip, showWarning, askUser, \
     checkInvalidFilename, showInfo
 from anki.exporting import exporters
 from anki.hooks import addHook, remHook
-from anki.lang import ngettext
+from anki.lang import ngettext, _
 import time
 
 class ExportDialog(QDialog):

aqt/fields.py

@@ -5,6 +5,7 @@ from aqt.qt import *
 from anki.consts import *
 import aqt
 from aqt.utils import showWarning, openHelp, getOnlyText, askUser
+from anki.lang import _, ngettext
 
 class FieldDialog(QDialog):
 

aqt/importing.py

@@ -18,8 +18,7 @@ from anki.hooks import addHook, remHook
 import aqt.forms
 import aqt.modelchooser
 import aqt.deckchooser
-from anki.lang import ngettext
+from anki.lang import ngettext, _
-
 
 class ChangeMap(QDialog):
     def __init__(self, mw, model, current):

aqt/main.py

@@ -30,6 +30,7 @@ from aqt.utils import saveGeom, restoreGeom, showInfo, showWarning, \
     restoreState, getOnlyText, askUser, showText, tooltip, \
     openHelp, openLink, checkInvalidFilename, getFile
 from aqt.qt import sip
+from anki.lang import _, ngettext
 
 class AnkiQt(QMainWindow):
     def __init__(self, app, profileManager, opts, args):

aqt/modelchooser.py

@@ -6,6 +6,7 @@ from aqt.qt import *
 from anki.hooks import addHook, remHook, runHook
 from aqt.utils import  shortcut
 import aqt
+from anki.lang import _
 
 class ModelChooser(QHBoxLayout):
 

aqt/models.py

@@ -8,6 +8,7 @@ import aqt.clayout
 from anki import stdmodels
 from aqt.utils import saveGeom, restoreGeom
 import collections
+from anki.lang import _, ngettext
 
 class Models(QDialog):
     def __init__(self, mw, parent=None, fromMain=False):

aqt/overview.py

@@ -6,6 +6,7 @@ from aqt.utils import openLink, shortcut, tooltip, askUserDialog
 from anki.utils import isMac
 import aqt
 from anki.sound import clearAudioQueue
+from anki.lang import _
 
 class Overview:
     "Deck overview."

aqt/preferences.py

@@ -8,6 +8,7 @@ import anki.lang
 from aqt.utils import openFolder, showWarning, getText, openHelp, showInfo, \
     askUser
 import aqt
+from anki.lang import _
 
 class Preferences(QDialog):
 

aqt/profiles.py

@@ -23,6 +23,7 @@ from aqt import appHelpSite
 import aqt.forms
 from send2trash import send2trash
 import anki.sound
+from anki.lang import _
 
 metaConf = dict(
     ver=0,

aqt/progress.py

@@ -5,6 +5,7 @@
 import time
 from aqt.qt import *
 import aqt.forms
+from anki.lang import _
 
 # fixme: if mw->subwindow opens a progress dialog with mw as the parent, mw
 # gets raised on finish on compiz. perhaps we should be using the progress

aqt/sound.py

@@ -6,6 +6,7 @@ from aqt.qt import *
 import time
 from anki.sound import Recorder
 from aqt.utils import saveGeom, restoreGeom, showWarning
+from anki.lang import _
 
 if not Recorder:
     print("pyaudio not installed")

aqt/stats.py

@@ -7,6 +7,7 @@ import os, time
 from aqt.utils import saveGeom, restoreGeom, maybeHideClose, addCloseShortcut, \
     tooltip, getSaveFile
 import aqt
+from anki.lang import _
 
 # Deck Stats
 ######################################################################

aqt/studydeck.py

@@ -6,6 +6,7 @@ from aqt.qt import *
 import aqt
 from aqt.utils import showInfo, openHelp, getOnlyText, shortcut, restoreGeom, saveGeom
 from anki.hooks import addHook, remHook
+from anki.lang import _
 
 class StudyDeck(QDialog):
     def __init__(self, mw, names=None, accept=None, title=None,

aqt/sync.py

@@ -12,7 +12,7 @@ from anki.sync import Syncer, RemoteServer, FullSyncer, MediaSyncer, \
     RemoteMediaServer
 from anki.hooks import addHook, remHook
 from aqt.utils import tooltip, askUserDialog, showWarning, showText, showInfo
-
+from anki.lang import _
 
 # Sync manager
 ######################################################################

aqt/toolbar.py

@@ -3,6 +3,7 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
 from aqt.qt import *
+from anki.lang import _
 
 class Toolbar:
 

aqt/update.py

@@ -9,6 +9,7 @@ from aqt.qt import *
 import aqt
 from aqt.utils import openLink, showText
 from anki.utils import platDesc, versionWithBuild
+from anki.lang import _
 
 class LatestVersionFinder(QThread):
 

aqt/utils.py

@@ -8,6 +8,7 @@ import aqt
 from anki.sound import stripSounds
 from anki.utils import isWin, isMac, invalidFilename, noBundledLibs, \
     versionWithBuild
+from anki.lang import _
 
 def openHelp(section):
     link = aqt.appHelpSite

aqt/webview.py

@@ -8,6 +8,7 @@ from anki.hooks import runHook
 from aqt.qt import *
 from aqt.utils import openLink, showWarning, tooltip
 from anki.utils import isMac, isWin, isLin, devMode
+from anki.lang import _
 
 # Page for debug messages
 ##########################################################################