diff --git a/src-ui/angular.json b/src-ui/angular.json
index 9f53a8fb1..4691fec61 100644
--- a/src-ui/angular.json
+++ b/src-ui/angular.json
@@ -16,13 +16,13 @@
 			"i18n": {
 				"sourceLocale": "en-US",
 				"locales": {
-					"de": "src/locale/messages.de.xlf",
+					"de-DE": "src/locale/messages.de_DE.xlf",
 					"nl-NL": "src/locale/messages.nl_NL.xlf",
-					"fr": "src/locale/messages.fr.xlf",
+					"fr-FR": "src/locale/messages.fr_FR.xlf",
 					"en-GB": "src/locale/messages.en_GB.xlf",
 					"pt-BR": "src/locale/messages.pt_BR.xlf",
-					"it": "src/locale/messages.it.xlf",
-					"ro": "src/locale/messages.ro.xlf"
+					"it-IT": "src/locale/messages.it_IT.xlf",
+					"ro-RO": "src/locale/messages.ro_RO.xlf"
 				}
 			},
 			"architect": {
diff --git a/src-ui/src/locale/messages.de.xlf b/src-ui/src/locale/messages.de_DE.xlf
similarity index 100%
rename from src-ui/src/locale/messages.de.xlf
rename to src-ui/src/locale/messages.de_DE.xlf
diff --git a/src-ui/src/locale/messages.fr.xlf b/src-ui/src/locale/messages.fr_FR.xlf
similarity index 100%
rename from src-ui/src/locale/messages.fr.xlf
rename to src-ui/src/locale/messages.fr_FR.xlf
diff --git a/src-ui/src/locale/messages.it.xlf b/src-ui/src/locale/messages.it_IT.xlf
similarity index 100%
rename from src-ui/src/locale/messages.it.xlf
rename to src-ui/src/locale/messages.it_IT.xlf
diff --git a/src-ui/src/locale/messages.ro.xlf b/src-ui/src/locale/messages.ro_RO.xlf
similarity index 100%
rename from src-ui/src/locale/messages.ro.xlf
rename to src-ui/src/locale/messages.ro_RO.xlf
diff --git a/src/locale/cs/LC_MESSAGES/django.po b/src/locale/cs_CZ/LC_MESSAGES/django.po
similarity index 100%
rename from src/locale/cs/LC_MESSAGES/django.po
rename to src/locale/cs_CZ/LC_MESSAGES/django.po
diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de_DE/LC_MESSAGES/django.po
similarity index 100%
rename from src/locale/de/LC_MESSAGES/django.po
rename to src/locale/de_DE/LC_MESSAGES/django.po
diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr_FR/LC_MESSAGES/django.po
similarity index 100%
rename from src/locale/fr/LC_MESSAGES/django.po
rename to src/locale/fr_FR/LC_MESSAGES/django.po
diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it_IT/LC_MESSAGES/django.po
similarity index 100%
rename from src/locale/it/LC_MESSAGES/django.po
rename to src/locale/it_IT/LC_MESSAGES/django.po
diff --git a/src/locale/ro/LC_MESSAGES/django.po b/src/locale/ro_RO/LC_MESSAGES/django.po
similarity index 100%
rename from src/locale/ro/LC_MESSAGES/django.po
rename to src/locale/ro_RO/LC_MESSAGES/django.po
diff --git a/src/paperless/settings.py b/src/paperless/settings.py
index 3330da19c..f57be3b6d 100644
--- a/src/paperless/settings.py
+++ b/src/paperless/settings.py
@@ -297,12 +297,12 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ("en-us", _("English (US)")),
     ("en-gb", _("English (GB)")),
-    ("de", _("German")),
+    ("de-de", _("German")),
     ("nl-nl", _("Dutch")),
-    ("fr", _("French")),
+    ("fr-fr", _("French")),
     ("pt-br", _("Portuguese (Brazil)")),
-    ("it", _("Italian")),
-    ("ro", _("Romanian"))
+    ("it-it", _("Italian")),
+    ("ro-ro", _("Romanian"))
 ]
 
 LOCALE_PATHS = [