From e7ce1632ab407b3779ba3c4be98cbcaa2ad64d53 Mon Sep 17 00:00:00 2001 From: Robert Riebisch <15858666+bttrx@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:00:14 +0100 Subject: [PATCH 1/3] Fixes i18n and unordered list --- system/admin/admin.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/admin/admin.php b/system/admin/admin.php index b3642a6..e0633e2 100644 --- a/system/admin/admin.php +++ b/system/admin/admin.php @@ -44,7 +44,7 @@ function session($user, $pass) { $user_file = 'config/users/' . $user . '.ini'; if (!file_exists($user_file)) { - return $str = '
'; + return $str = '
'; } $user_enc = user('encryption', $user); @@ -60,7 +60,7 @@ function session($user, $pass) $_SESSION[config("site.url")]['user'] = $user; header('location: admin'); } else { - return $str = '
'; + return $str = '
'; } } else if (old_password_verify($pass, $user_enc, $user_pass)) { if (session_status() == PHP_SESSION_NONE) session_start(); @@ -68,7 +68,7 @@ function session($user, $pass) $_SESSION[config("site.url")]['user'] = $user; header('location: admin'); } else { - return $str = '
'; + return $str = '
'; } } @@ -1002,4 +1002,4 @@ function replace_key($arr, $oldkey, $newkey) { return array_combine($keys, $arr); } return $arr; -} \ No newline at end of file +} From 301b5d19ae23fbfccc54c293e8b2bb4701ce7011 Mon Sep 17 00:00:00 2001 From: Robert Riebisch <15858666+bttrx@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:15:23 +0100 Subject: [PATCH 2/3] More i18n [1/2] --- system/admin/admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/admin/admin.php b/system/admin/admin.php index e0633e2..e4af206 100644 --- a/system/admin/admin.php +++ b/system/admin/admin.php @@ -854,7 +854,7 @@ function get_feed($feed_url, $credit) } elseif (!empty($descriptionB)) { $content = preg_replace('##i', "\n", $descriptionB); } else { - return $str = '
  • Can not read the feed content.
  • '; + return $str = '
  • ' . i18n('Cannot_read_feed_content') . '
  • '; } $time = new DateTime($entry->pubDate); $timestamp = $time->format("Y-m-d H:i:s"); @@ -872,7 +872,7 @@ function get_feed($feed_url, $credit) migrate($title, $time, $tags, $content, $url, $user, $source); } } else { - return $str = '
  • Unsupported feed.
  • '; + return $str = '
  • ' . i18n('Unknown_feed_format') . '
  • '; } } From f547f535c61a438527aea9ac0e12200b0155373e Mon Sep 17 00:00:00 2001 From: Robert Riebisch <15858666+bttrx@users.noreply.github.com> Date: Sat, 9 Dec 2023 22:16:48 +0100 Subject: [PATCH 3/3] More i18n [2/2] --- lang/en_US.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lang/en_US.ini b/lang/en_US.ini index 783184b..eab2eea 100644 --- a/lang/en_US.ini +++ b/lang/en_US.ini @@ -287,3 +287,6 @@ Archive_page_for = "Archive page for" Posts_with_type = "Posts with type" ;Search Search_results_for = "Search results for" +;Feed +Cannot_read_feed_content = "Cannot read feed content" +Unknown_feed_format = "Unknown feed format"