Internationalization base

web/api/serializers.py

@@ -44,18 +44,18 @@ def get_most_recent_scan(self, obj):
 		return obj.get_recent_scan_id()
 
 	def get_insert_date(self, obj):
-		return naturalday(obj.insert_date).title()
+		return naturalday(obj.insert_date)
 
 	def get_insert_date_humanized(self, obj):
-		return naturaltime(obj.insert_date).title()
+		return naturaltime(obj.insert_date)
 
 	def get_start_scan_date(self, obj):
 		if obj.start_scan_date:
-			return naturalday(obj.start_scan_date).title()
+			return naturalday(obj.start_scan_date)
 
 	def get_start_scan_date_humanized(self, obj):
 		if obj.start_scan_date:
-			return naturaltime(obj.start_scan_date).title()
+			return naturaltime(obj.start_scan_date)
 
 
 class SubScanResultSerializer(serializers.ModelSerializer):

web/celery-entrypoint.sh

@@ -1,6 +1,14 @@
 #!/bin/bash
 
 python3 manage.py makemigrations
+
+# Hotfix for missing users migration due to swap mid-project
+# Assumes PostgreSQL is the db used
+
+apt-get install -y postgresql-client
+echo "INSERT INTO django_migrations (app, name, applied) SELECT 'users', '0001_initial', CURRENT_TIMESTAMP WHERE NOT EXISTS (SELECT app FROM django_migrations WHERE app = 'users' AND name = '0001_initial');" | python3 manage.py dbshell
+echo "UPDATE django_content_type SET app_label = 'users' WHERE app_label = 'auth' and model = 'user';" | python3 manage.py dbshell
+
 python3 manage.py migrate
 python3 manage.py collectstatic --no-input --clear
 
@@ -21,6 +29,10 @@ Pin-Priority: -1
 ' | tee /etc/apt/preferences.d/mozilla-firefox
 apt update
 apt install firefox -y
+apt install -y gettext
+
+find . -type f -name "*.po" -exec sed -i 's/^#~ //g' {} +
+python3 manage.py compilemessages
 
 # Temporary fix for whatportis bug - See https://github.com/yogeshojha/rengine/issues/984
 sed -i 's/purge()/truncate()/g' /usr/local/lib/python3.10/dist-packages/whatportis/cli.py
@@ -162,6 +174,7 @@ exec "$@"
 # httpx seems to have issue, use alias instead!!!
 echo 'alias httpx="/go/bin/httpx"' >> ~/.bashrc
 
+pip uninstall -y httpcore
 
 # watchmedo auto-restart --recursive --pattern="*.py" --directory="/usr/src/app/reNgine/" -- celery -A reNgine.tasks worker --autoscale=10,0 -l INFO -Q scan_queue &
 echo "Starting Workers..."

web/dashboard/forms.py

@@ -0,0 +1,8 @@
+from django.forms import ModelForm
+from users.models import User
+
+
+class UserSettingsForm(ModelForm):
+    class Meta:
+        model = User
+        fields = ["language"]