configure_locale_and_language(): switches from class-based to GNU get…

…text API

Fixes #1293 by using gettext.[bind]textdomain(), which will allow

    from gettext import gettext as _

to use the globally-configured locale without running afoul of mypy.

This reverts commit 4dd4d13.

securedrop_client/app.py

@@ -72,11 +72,8 @@ def configure_locale_and_language() -> str:
             language_code = current_locale[:2]
     except ValueError:  # pragma: no cover
         language_code = "en"  # pragma: no cover
-    # DEBUG/TRANSLATE: override the language code here (e.g. to Chinese).
-    # language_code = 'zh'
-    gettext.translation(
-        "messages", localedir=localedir, languages=[language_code], fallback=True
-    ).install("ngettext")
+    gettext.bindtextdomain("messages", localedir=localedir)
+    gettext.textdomain("messages")
     return language_code
 
 

securedrop_client/gui/main.py

@@ -20,6 +20,7 @@
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 import logging
+from gettext import gettext as _
 from typing import Dict, List, Optional  # noqa: F401
 
 from PyQt5.QtCore import Qt

securedrop_client/gui/widgets.py

@@ -19,6 +19,8 @@
 import html
 import logging
 import sys
+from gettext import gettext as _
+from gettext import ngettext
 from typing import Dict, List, Optional, Union  # noqa: F401
 from uuid import uuid4
 

securedrop_client/logic.py

@@ -22,6 +22,7 @@
 import logging
 import os
 import uuid
+from gettext import gettext as _
 from typing import Any, Dict, List, Tuple, Type, Union  # noqa: F401
 
 import arrow

tests/gui/test_widgets.py

@@ -4,6 +4,7 @@
 import math
 import random
 from datetime import datetime
+from gettext import gettext as _
 from unittest.mock import Mock, PropertyMock, patch
 
 import arrow

tests/test_logic.py

@@ -5,6 +5,7 @@
 import datetime
 import logging
 import os
+from gettext import gettext as _
 from typing import Type
 from unittest.mock import Mock, call