Skip to content

Fix multi language feature #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: 2.x
Choose a base branch
from
Open

Fix multi language feature #102

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ebacb3
Switch to closure for translations
Debatty-Tom Oct 10, 2025
d00626a
Allow closure and call them if needed
Debatty-Tom Oct 10, 2025
af001c9
Clarify why closures are resolved lazily in getAttribute() to ensure …
Debatty-Tom Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/AnalyticCookiesCategory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ public function google(string $id, bool $anonymizeIp = true): static
$group->name(static::GOOGLE_ANALYTICS)
->cookie(fn(Cookie $cookie) => $cookie->name('_ga')
->duration(2 * 365 * 24 * 60)
->description(__('cookieConsent::cookies.defaults._ga'))
->setAttribute('description', fn() => $this->translate('defaults._ga'))
)
->cookie(fn(Cookie $cookie) => $cookie->name('_ga_' . strtoupper($key))
->duration(2 * 365 * 24 * 60)
->description(__('cookieConsent::cookies.defaults._ga_ID'))
->setAttribute('description', fn() => $this->translate('defaults._ga_ID'))
)
->cookie(fn(Cookie $cookie) => $cookie->name('_gid')
->duration(24 * 60)
->description(__('cookieConsent::cookies.defaults._gid'))
->setAttribute('description', fn() => $this->translate('defaults._gid'))
)
->cookie(fn(Cookie $cookie) => $cookie->name('_gat')
->duration(1)
->description(__('cookieConsent::cookies.defaults._gat'))
->setAttribute('description', fn() => $this->translate('defaults._gat'))
)
->accepted(fn(Consent $consent) => $consent
->script('<script async src="https://www.googletagmanager.com/gtag/js?id=' . $id . '"></script>')
Expand Down
6 changes: 5 additions & 1 deletion src/Concerns/HasAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Whitecube\LaravelCookieConsent\Concerns;

use Closure;

trait HasAttributes
{
/**
Expand Down Expand Up @@ -54,6 +56,8 @@ public function setAttribute(string $attribute, mixed $value): void
*/
public function getAttribute(string $attribute): mixed
{
return $this->attributes[$attribute] ?? null;
$value = $this->attributes[$attribute] ?? null;

return $value instanceof Closure ? $value() : $value;
}
}
4 changes: 2 additions & 2 deletions src/CookiesCategory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class CookiesCategory
public function __construct(string $key)
{
$this->key = $key;
$this->setAttribute('title', $this->translate('categories.' . $key . '.title', ucfirst($key)));
$this->setAttribute('description', $this->translate('categories.' . $key . '.description'));
$this->setAttribute('title', fn() => $this->translate('categories.' . $key . '.title', ucfirst($key)));
$this->setAttribute('description', fn() => $this->translate('categories.' . $key . '.description'));
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/EssentialCookiesCategory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public function consent(): static
return $this->cookie(function(Cookie $cookie) {
$cookie->name(Config::get('cookieconsent.cookie.name'))
->duration(Config::get('cookieconsent.cookie.duration'))
->description(__('cookieConsent::cookies.defaults.consent'));
->setAttribute('description', fn() => $this->translate('defaults.consent'));
});
}

Expand All @@ -26,7 +26,7 @@ public function session(): static
return $this->cookie(function(Cookie $cookie) {
$cookie->name(Config::get('session.cookie'))
->duration(Config::get('session.lifetime'))
->description(__('cookieConsent::cookies.defaults.session'));
->setAttribute('description', fn() => $this->translate('defaults.session'));
});
}

Expand All @@ -38,7 +38,7 @@ public function csrf(): static
return $this->cookie(function(Cookie $cookie) {
$cookie->name('XSRF-TOKEN')
->duration(Config::get('session.lifetime'))
->description(__('cookieConsent::cookies.defaults.csrf'));
->setAttribute('description', fn() => $this->translate('defaults.csrf'));
});
}
}