From afebc005c781da412b1de83ecf3e6d009115235d Mon Sep 17 00:00:00 2001
From: Miguel Ribeiro <k.d.mintnick@gmail.com>
Date: Mon, 27 Apr 2026 22:23:51 +0200
Subject: [PATCH] fix: improve date formatting with IntlDateFormatter fallback
 (b2c565f) fix: missing year for subscription next payment display (ca5823d)

---
 includes/i18n/getlang.php        | 4 ++++
 includes/i18n/{jp.php => ja.php} | 0
 includes/i18n/languages.php      | 6 +++++-
 includes/version.php             | 2 +-
 migrations/000045.php            | 4 ++++
 scripts/i18n/{jp.js => ja.js}    | 0
 6 files changed, 14 insertions(+), 2 deletions(-)
 rename includes/i18n/{jp.php => ja.php} (100%)
 create mode 100644 migrations/000045.php
 rename scripts/i18n/{jp.js => ja.js} (100%)

diff --git a/includes/i18n/getlang.php b/includes/i18n/getlang.php
index a80f93eef..c26f8b19c 100644
--- a/includes/i18n/getlang.php
+++ b/includes/i18n/getlang.php
@@ -4,6 +4,10 @@
 if (isset($_COOKIE['language'])) {
     $selectedLanguage = $_COOKIE['language'];
 
+    if (array_key_exists($selectedLanguage, $langname_corrections)) {
+        $selectedLanguage = $langname_corrections[$selectedLanguage];
+    }
+
     if (array_key_exists($selectedLanguage, $languages)) {
         $lang = $selectedLanguage;
     }
diff --git a/includes/i18n/jp.php b/includes/i18n/ja.php
similarity index 100%
rename from includes/i18n/jp.php
rename to includes/i18n/ja.php
diff --git a/includes/i18n/languages.php b/includes/i18n/languages.php
index 38ea19803..1135e2991 100644
--- a/includes/i18n/languages.php
+++ b/includes/i18n/languages.php
@@ -13,7 +13,7 @@
     "fr" => ["name" => "Français", "dir" => "ltr"],
     "id" => ["name" => "bahasa indonesia", "dir" => "ltr"],
     "it" => ["name" => "Italiano", "dir" => "ltr"],
-    "jp" => ["name" => "日本語", "dir" => "ltr"],
+    "ja" => ["name" => "日本語", "dir" => "ltr"],
     "ko" => ["name" => "한국어", "dir" => "ltr"],
     "nl" => ["name" => "Nederlands", "dir" => "ltr"], 
     "pl" => ["name" => "Polski", "dir" => "ltr"],
@@ -29,4 +29,8 @@
     "vi" => ["name" => "Tiếng Việt", "dir" => "ltr"],
     "zh_cn" => ["name" => "简体中文", "dir" => "ltr"],
     "zh_tw" => ["name" => "繁體中文", "dir" => "ltr"],
+];
+
+$langname_corrections = [
+    "jp" => "ja",
 ];
\ No newline at end of file
diff --git a/includes/version.php b/includes/version.php
index aafe20b80..20aea75f2 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-$version = "v4.8.3";
+$version = "v4.8.4";
 ?>
diff --git a/migrations/000045.php b/migrations/000045.php
new file mode 100644
index 000000000..dcfa05c97
--- /dev/null
+++ b/migrations/000045.php
@@ -0,0 +1,4 @@
+<?php
+// This migration corrects the Japanese language code from 'jp' to 'ja' in the user table.
+
+$db->exec("UPDATE user SET language = 'ja' WHERE language = 'jp'");
\ No newline at end of file
diff --git a/scripts/i18n/jp.js b/scripts/i18n/ja.js
similarity index 100%
rename from scripts/i18n/jp.js
rename to scripts/i18n/ja.js