Merge pull request #110 from learningequality/loading_pages

Use generated loading pages
learningequality · Jun 28, 2023 · 814587d · 814587d
2 parents 680dc3c + fe9e4f5
commit 814587d
Show file tree

Hide file tree

Showing 30 changed files with 18 additions and 7,829 deletions.
diff --git a/.gitignore b/.gitignore
@@ -129,7 +129,7 @@ dmypy.json
 
 # ignores specific to this project.
 *.whl
-src/*.dist-info
+src/kolibri_app/assets
 # generated files
 tmpenv
 whl

diff --git a/Makefile b/Makefile
@@ -36,13 +36,17 @@ install-whl:
 	# This doesn't exist in 0.15, so don't error if it doesn't exist.
 	echo "3.3.1" > kolibrisrc/kolibri/dist/importlib_resources/version.txt || true
 
+loading-pages: needs-version
+	PYTHONPATH=$$PYTHONPATH:./kolibrisrc python -m kolibri manage loadingpage --output-dir src/kolibri_app/assets --version-text "${KOLIBRI_VERSION}-${APP_VERSION}"
+
 get-whl: clean-whl
 # The eval and shell commands here are evaluated when the recipe is parsed, so we put the cleanup
 # into a prerequisite make step, in order to ensure they happen prior to the download.
 	$(eval DLFILE = $(shell wget --content-disposition -P whl/ "${whl}" 2>&1 | grep "Saving to: " | sed 's/Saving to: ‘//' | sed 's/’//'))
 	$(eval WHLFILE = $(shell echo "${DLFILE}" | sed "s/\?.*//"))
 	[ "${DLFILE}" = "${WHLFILE}" ] || mv "${DLFILE}" "${WHLFILE}"
 	$(MAKE) install-whl whl="${WHLFILE}"
+	$(MAKE) loading-pages
 
 dependencies:
 	PYINSTALLER_COMPILE_BOOTLOADER=1 pip3 install -r build_requires.txt --no-binary pyinstaller
@@ -109,3 +113,7 @@ notarize-dmg: needs-version
 	$(MAKE) guard-MAC_NOTARIZE_USERNAME
 	$(MAKE) guard-MAC_NOTARIZE_PASSWORD
 	./notarize-dmg.sh "./dist/kolibri-${KOLIBRI_VERSION}-${APP_VERSION}.dmg"
+
+
+run-dev:
+	PYTHONPATH=$$PYTHONPATH:./kolibrisrc python -m kolibri_app
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Once you have downloaded and installed the Kolibri whl file, run `make pyinstall
 
 #### Running the app from source
 
-`python -m kolibri_app`
+`make run-dev`
 
 #### Creating a native app for testing
 

diff --git a/src/kolibri_app/assets/_load-ar.html b/src/kolibri_app/assets/_load-ar.html
diff --git a/src/kolibri_app/assets/_load-bg.html b/src/kolibri_app/assets/_load-bg.html
diff --git a/src/kolibri_app/assets/_load-bn.html b/src/kolibri_app/assets/_load-bn.html
diff --git a/src/kolibri_app/assets/_load-en_US.html b/src/kolibri_app/assets/_load-en_US.html
diff --git a/src/kolibri_app/assets/_load-es_ES.html b/src/kolibri_app/assets/_load-es_ES.html
diff --git a/src/kolibri_app/assets/_load-fa.html b/src/kolibri_app/assets/_load-fa.html
diff --git a/src/kolibri_app/assets/_load-fr.html b/src/kolibri_app/assets/_load-fr.html
diff --git a/src/kolibri_app/assets/_load-fv.html b/src/kolibri_app/assets/_load-fv.html
diff --git a/src/kolibri_app/assets/_load-gu_IN.html b/src/kolibri_app/assets/_load-gu_IN.html
diff --git a/src/kolibri_app/assets/_load-hi.html b/src/kolibri_app/assets/_load-hi.html
diff --git a/src/kolibri_app/assets/_load-ko.html b/src/kolibri_app/assets/_load-ko.html
diff --git a/src/kolibri_app/assets/_load-la.html b/src/kolibri_app/assets/_load-la.html
diff --git a/src/kolibri_app/assets/_load-mr.html b/src/kolibri_app/assets/_load-mr.html
diff --git a/src/kolibri_app/assets/_load-my.html b/src/kolibri_app/assets/_load-my.html
diff --git a/src/kolibri_app/assets/_load-ny.html b/src/kolibri_app/assets/_load-ny.html
diff --git a/src/kolibri_app/assets/_load-pt_BR.html b/src/kolibri_app/assets/_load-pt_BR.html
diff --git a/src/kolibri_app/assets/_load-sw_TZ.html b/src/kolibri_app/assets/_load-sw_TZ.html
diff --git a/src/kolibri_app/assets/_load-te.html b/src/kolibri_app/assets/_load-te.html
diff --git a/src/kolibri_app/assets/_load-tl.html b/src/kolibri_app/assets/_load-tl.html
diff --git a/src/kolibri_app/assets/_load-ur_PK.html b/src/kolibri_app/assets/_load-ur_PK.html
diff --git a/src/kolibri_app/assets/_load-vi.html b/src/kolibri_app/assets/_load-vi.html
diff --git a/src/kolibri_app/assets/_load-yo.html b/src/kolibri_app/assets/_load-yo.html
diff --git a/src/kolibri_app/assets/_load.html b/src/kolibri_app/assets/_load.html
diff --git a/src/kolibri_app/assets/launch-image.png b/src/kolibri_app/assets/launch-image.png
diff --git a/src/kolibri_app/assets/loading-spinner.gif b/src/kolibri_app/assets/loading-spinner.gif
diff --git a/src/kolibri_app/i18n.py b/src/kolibri_app/i18n.py
@@ -22,7 +22,7 @@
     )
 
 if not languages:
-    languages = ["en_US"]
+    languages = ["en"]
 
 nelangs = []
 for lang in languages:
@@ -50,7 +50,7 @@
 # trigger the exception handling fallback if locale_info doesn't have a language key.
 if "language" not in locale_info:
     # Fallback to English and if we fail to find any language catalogs.
-    locale_info["language"] = "en_US"
+    locale_info["language"] = "en"
 _ = t.gettext
 
 logging.debug("Locale info = {}".format(locale_info))
diff --git a/src/kolibri_app/view.py b/src/kolibri_app/view.py
@@ -5,6 +5,7 @@
 from io import BytesIO
 
 import wx
+from django.utils.translation.trans_real import to_language
 from wx import html2
 
 from kolibri_app.constants import APP_NAME
@@ -17,21 +18,21 @@
 
 html2.WebView.MSWSetEmulationLevel(html2.WEBVIEWIE_EMU_IE11)
 
-LOADER_PAGE_TEMPLATE = "_load-{}.html"
+LOADER_PAGE = "loading.html"
 
 
 class LoadingHandler(wx.html2.WebViewHandler):
     def __init__(self):
         wx.html2.WebViewHandler.__init__(self, "loading")
-        lang_id = locale_info["language"]
+        lang_id = to_language(locale_info["language"])
         asset_files = files("kolibri_app") / "assets"
-        loader_page = asset_files / LOADER_PAGE_TEMPLATE.format(lang_id)
+        loader_page = asset_files / lang_id / LOADER_PAGE
         if not loader_page.is_file():
             lang_id = lang_id.split("-")[0]
-            loader_page = asset_files / LOADER_PAGE_TEMPLATE.format(lang_id)
+            loader_page = asset_files / lang_id / LOADER_PAGE
         if not loader_page.is_file():
             # if we can't find anything in the given language, default to the English loading page.
-            loader_page = asset_files / LOADER_PAGE_TEMPLATE.format("en_US")
+            loader_page = asset_files / "en" / LOADER_PAGE
         with loader_page.open("rb") as f:
             self.loader_page = f.read()