From e1479b4a6a098ea0bdadee6a349f09eaf165c8ca Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 9 Jan 2024 11:26:22 +0100 Subject: [PATCH 1/2] list/history: Use intl's default locale to format time and date --- .../application/views/scripts/partials/event-history.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/application/views/scripts/partials/event-history.phtml b/modules/monitoring/application/views/scripts/partials/event-history.phtml index b81c95d30b..b47e73dd4a 100644 --- a/modules/monitoring/application/views/scripts/partials/event-history.phtml +++ b/modules/monitoring/application/views/scripts/partials/event-history.phtml @@ -30,7 +30,7 @@ $history->limit($limit * $page); ?>
translate('Flapping with a %.2f%% state change rate'); $rowAction = Url::fromPath('monitoring/event/show'); From ab3c9f326dc5bc841ebf52a8413ca48ec2d05a48 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 7 Aug 2024 13:19:11 +0200 Subject: [PATCH 2/2] Require ipl version which provides i18n v0.2.2 --- application/views/scripts/error/error.phtml | 2 +- doc/02-Installation.md | 2 +- modules/setup/library/Setup/WebWizard.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml index 5f4579ac62..cb87b1d42e 100644 --- a/application/views/scripts/error/error.phtml +++ b/application/views/scripts/error/error.phtml @@ -23,7 +23,7 @@ $modReason = []; if (isset($requiredVendor, $requiredProject) && $requiredVendor && $requiredProject) { // TODO: I don't like this, can we define requirements somewhere else? - $coreDeps = ['icinga-php-library' => '>= 0.13', 'icinga-php-thirdparty' => '>= 0.12']; + $coreDeps = ['icinga-php-library' => '>= 0.13.2', 'icinga-php-thirdparty' => '>= 0.12']; foreach ($coreDeps as $libraryName => $requiredVersion) { if (! $libraries->has($libraryName)) { diff --git a/doc/02-Installation.md b/doc/02-Installation.md index 6bf9ee097d..b13bc9833d 100644 --- a/doc/02-Installation.md +++ b/doc/02-Installation.md @@ -395,7 +395,7 @@ You will need to install certain dependencies depending on your setup: monitor your infrastructure * A web server, e.g. Apache or Nginx * PHP version ≥ 7.2 -* [Icinga PHP Library (ipl)](https://github.com/Icinga/icinga-php-library) (≥ 0.13) +* [Icinga PHP Library (ipl)](https://github.com/Icinga/icinga-php-library) (≥ 0.13.2) * [Icinga PHP Thirdparty](https://github.com/Icinga/icinga-php-thirdparty) (≥ 0.12) * The following PHP modules must be installed: cURL, json, gettext, fileinfo, intl, dom, OpenSSL and xml * The [pdfexport](https://github.com/Icinga/icingaweb2-module-pdfexport) module (≥0.10) is required for the diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php index f3b5557c89..5063ee83f9 100644 --- a/modules/setup/library/Setup/WebWizard.php +++ b/modules/setup/library/Setup/WebWizard.php @@ -602,7 +602,7 @@ public function getRequirements($skipModules = false) ))); $set->add(new WebLibraryRequirement(array( - 'condition' => ['icinga-php-library', '>=', '0.13.0'], + 'condition' => ['icinga-php-library', '>=', '0.13.2'], 'alias' => 'Icinga PHP library', 'description' => mt( 'setup',