]> git.agnieray.net Git - galette.git/commitdiff
Add pre_footer in replacements; closes #1808
authorJohan Cwiklinski <johan@x-tnd.be>
Sat, 23 Mar 2024 17:21:43 +0000 (18:21 +0100)
committerJohan Cwiklinski <johan@x-tnd.be>
Sat, 23 Mar 2024 17:56:47 +0000 (18:56 +0100)
galette/docs/CHANGES
galette/lib/Galette/Features/Replacements.php
tests/Galette/Core/tests/units/Preferences.php
tests/Galette/Entity/tests/units/PdfModel.php

index 63cb13e2157a21947f0aa4f569c77a5d0ea3a718..3e24efb46f8d375034c1da6b4bf8e4326025ccfb 100644 (file)
@@ -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
 
index 31fb5ad74def6c73461e34f31ed9bd73c4b53285..391f1907fe50253c8b44c7574b3ad99338dd2891 100644 (file)
@@ -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
             )
         );
 
index 5b92752ef4acf36b309c09c12691f50ddb3c773a..ba6fa8fc7b14a523b468ad79bf1b84b1e03c1428 100644 (file)
@@ -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(
             [
index 9221379cd1f79bb3750beb22395f0781fdcbe735..fe2718310026eea0652dacba86e400aefef4cf49 100644 (file)
@@ -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']);