From 4591edc56e3ef672b925af667682fadfd1074f2f Mon Sep 17 00:00:00 2001
From: Viktor Haid <52320564+viktorhaid@users.noreply.github.com>
Date: Thu, 4 Jul 2024 02:22:15 +0200
Subject: [PATCH 1/2] fix i18n

---
 Dockerfile       | 5 ++++-
 MANIFEST.in      | 1 +
 snappass/main.py | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 70e18c50..871a0ff9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,13 @@ WORKDIR $APP_DIR
 COPY ["setup.py", "requirements.txt", "MANIFEST.in", "README.rst", "AUTHORS.rst", "$APP_DIR/"]
 COPY ["./snappass", "$APP_DIR/snappass"]
 
+RUN pip install -r requirements.txt
+
+RUN pybabel compile -d snappass/translations
+
 RUN python setup.py install && \
     chown -R snappass $APP_DIR && \
     chgrp -R snappass $APP_DIR
-RUN pip install -r requirements.txt
 
 USER snappass
 
diff --git a/MANIFEST.in b/MANIFEST.in
index ec67e989..e919377d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
 include *.rst LICENSE
 recursive-include snappass/static *
 recursive-include snappass/templates *
+recursive-include snappass/translations *
diff --git a/snappass/main.py b/snappass/main.py
index 6f06572e..460ba762 100644
--- a/snappass/main.py
+++ b/snappass/main.py
@@ -11,7 +11,7 @@
 from urllib.parse import unquote_plus
 from urllib.parse import urljoin
 from distutils.util import strtobool
-from flask_babel import Babel
+from flask_babel import Babel, _
 
 NO_SSL = bool(strtobool(os.environ.get('NO_SSL', 'False')))
 URL_PREFIX = os.environ.get('URL_PREFIX', None)

From 4ea88cca7608d718ed675677fa2a3ad3bd6a29c5 Mon Sep 17 00:00:00 2001
From: Viktor Haid <52320564+viktorhaid@users.noreply.github.com>
Date: Fri, 23 Aug 2024 12:52:00 +0200
Subject: [PATCH 2/2] Ignore linter error regarding _

---
 snappass/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/snappass/main.py b/snappass/main.py
index 745fab68..09867e42 100644
--- a/snappass/main.py
+++ b/snappass/main.py
@@ -11,7 +11,8 @@
 from urllib.parse import unquote_plus
 from urllib.parse import urljoin
 from distutils.util import strtobool
-from flask_babel import Babel, _
+# _ is required to get the Jinja templates translated
+from flask_babel import Babel, _  # noqa: F401
 
 NO_SSL = bool(strtobool(os.environ.get('NO_SSL', 'False')))
 URL_PREFIX = os.environ.get('URL_PREFIX', None)