From: Johan Cwiklinski Date: Sat, 23 Mar 2024 17:21:43 +0000 (+0100) Subject: Add pre_footer in replacements; closes #1808 X-Git-Url: https://git.agnieray.net/?p=galette.git;a=commitdiff_plain;h=6ac6e166ed7343b445b1ca3471e00540497c38e8 Add pre_footer in replacements; closes #1808 --- diff --git a/galette/docs/CHANGES b/galette/docs/CHANGES index 63cb13e21..3e24efb46 100644 --- a/galette/docs/CHANGES +++ b/galette/docs/CHANGES @@ -12,6 +12,7 @@ Changes - Fix redirection when dynamic file does not exists - Menu horizontal scroll when name is too long - Should not select a member as its own parent +- Add preferences footer in replacements 1.0.2 -> 1.0.3 diff --git a/galette/lib/Galette/Features/Replacements.php b/galette/lib/Galette/Features/Replacements.php index 31fb5ad74..391f1907f 100644 --- a/galette/lib/Galette/Features/Replacements.php +++ b/galette/lib/Galette/Features/Replacements.php @@ -236,6 +236,10 @@ trait Replacements 'login_uri' => [ 'title' => _T("Galette's login URI"), 'pattern' => '/{LOGIN_URI}/' + ], + 'asso_footer' => [ + 'title' => trim(trim(_T("Footer text:"), ':')), + 'pattern' => '/{ASSO_FOOTER}/' ] ]; } @@ -522,6 +526,7 @@ trait Replacements //TRANS: see https://www.php.net/manual/datetime.format.php 'date_now' => date(_T('Y-m-d')), 'login_uri' => $this->preferences->getURL() . $this->routeparser->urlFor('login'), + 'asso_footer' => $this->preferences->pref_footer ) ); diff --git a/tests/Galette/Core/tests/units/Preferences.php b/tests/Galette/Core/tests/units/Preferences.php index 5b92752ef..ba6fa8fc7 100644 --- a/tests/Galette/Core/tests/units/Preferences.php +++ b/tests/Galette/Core/tests/units/Preferences.php @@ -626,7 +626,7 @@ class Preferences extends TestCase { $legend = $this->preferences->getLegend(); $this->assertCount(2, $legend); - $this->assertCount(8, $legend['main']['patterns']); + $this->assertCount(9, $legend['main']['patterns']); $this->assertCount(10, $legend['socials']['patterns']); $this->assertSame( [ diff --git a/tests/Galette/Entity/tests/units/PdfModel.php b/tests/Galette/Entity/tests/units/PdfModel.php index 9221379cd..fe2718310 100644 --- a/tests/Galette/Entity/tests/units/PdfModel.php +++ b/tests/Galette/Entity/tests/units/PdfModel.php @@ -127,7 +127,8 @@ class PdfModel extends GaletteTestCase 'asso_website' => '/{ASSO_WEBSITE}/', 'asso_logo' => '/{ASSO_LOGO}/', 'date_now' => '/{DATE_NOW}/', - 'login_uri' => '/{LOGIN_URI}/' + 'login_uri' => '/{LOGIN_URI}/', + 'asso_footer' => '/{ASSO_FOOTER}/', ]; $this->assertSame($main_expected, $model->getPatterns()); @@ -363,7 +364,7 @@ Au milieu $this->assertArrayHasKey('member', $legend); $this->assertArrayHasKey('contribution', $legend); - $this->assertCount(8, $legend['main']['patterns']); + $this->assertCount(9, $legend['main']['patterns']); $this->assertCount(28, $legend['member']['patterns']); $this->assertTrue(isset($legend['member']['patterns']['label_dynfield_' . $adf->getId() . '_adh'])); $this->assertCount(14, $legend['contribution']['patterns']);