diff --git a/Commons/I18n.qml b/Commons/I18n.qml
index 7cd839350..5cb9335f8 100644
--- a/Commons/I18n.qml
+++ b/Commons/I18n.qml
@@ -187,6 +187,33 @@ Singleton {
     };
   }
 
+  // Default date format per language (used by lock screen, etc.)
+  readonly property var dateFormats: ({
+                                        "de": "dddd, d. MMMM",
+                                        "en": "dddd, MMMM d",
+                                        "es": "dddd, d 'de' MMMM",
+                                        "fr": "dddd d MMMM",
+                                        "hu": "dddd, MMMM d.",
+                                        "it": "dddd d MMMM",
+                                        "ja": "yyyy年M月d日 dddd",
+                                        "ko": "yyyy년 M월 d일 dddd",
+                                        "ku": "dddd, dê MMMM",
+                                        "nl": "dddd d MMMM",
+                                        "nn": "dddd d. MMMM",
+                                        "pl": "dddd, d MMMM",
+                                        "pt": "dddd, d 'de' MMMM",
+                                        "ru": "dddd, d MMMM",
+                                        "sv": "dddd d MMMM",
+                                        "tr": "dddd, d MMMM",
+                                        "uk": "dddd, d MMMM",
+                                        "zh": "yyyy年M月d日 dddd"
+                                      })
+
+  function dateFormat() {
+    var lang = langCode.split("-")[0];
+    return dateFormats[lang] || "dddd, d MMMM";
+  }
+
   // -------------------------------------------
   function setLanguage(newLangCode, fullLocale) {
     if (typeof fullLocale === "undefined") {
diff --git a/Modules/LockScreen/LockScreenHeader.qml b/Modules/LockScreen/LockScreenHeader.qml
index d75b37c6c..cc2e71a45 100644
--- a/Modules/LockScreen/LockScreenHeader.qml
+++ b/Modules/LockScreen/LockScreenHeader.qml
@@ -118,24 +118,7 @@ Rectangle {
       // Date below
       NText {
         text: {
-          var lang = I18n.locale.name.split("_")[0];
-          var formats = {
-            "de": "dddd, d. MMMM",
-            "en": "dddd, MMMM d",
-            "es": "dddd, d 'de' MMMM",
-            "fr": "dddd d MMMM",
-            "hu": "dddd, MMMM d.",
-            "it": "dddd d MMMM",
-            "ja": "yyyy年M月d日 dddd",
-            "ko": "yyyy년 M월 d일 dddd",
-            "ku": "dddd, dê MMMM",
-            "nl": "dddd d MMMM",
-            "nn": "dddd d. MMMM",
-            "pt": "dddd, d 'de' MMMM",
-            "sv": "dddd d MMMM",
-            "zh": "yyyy年M月d日 dddd"
-          };
-          var dateString = I18n.locale.toString(root.currentDate, formats[lang] || "dddd, d MMMM");
+          var dateString = I18n.locale.toString(root.currentDate, I18n.dateFormat());
           return dateString.charAt(0).toUpperCase() + dateString.slice(1);
         }
         pointSize: Style.fontSizeXL