Skip to content
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

Fix casts on initialization of HasTranslation #486

Merged
merged 8 commits into from
Feb 3, 2025
Merged

Fix casts on initialization of HasTranslation #486

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6e8729
Add support for nested key translations
thaqebon Jan 25, 2025
c0fc6dc
Enable mutators for nested fields
thaqebon Jan 26, 2025
6b471a7
Refactor test to use new Attribute() instead of Attribute::make()
thaqebon Jan 27, 2025
099a209
Update README to include nested key translation support
thaqebon Jan 27, 2025
ccb707f
Merge branch 'spatie:main' into main
thaqebon Jan 31, 2025
5353869
fix casts on initialization of HasTranslation
thaqebon Jan 31, 2025
e1786c0
Handle null values for nested key
thaqebon Jan 31, 2025
f596f72
Remove duplicate merging; `mergeCasts()` now handles the merge correc…
thaqebon Jan 31, 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
9 changes: 5 additions & 4 deletions src/HasTranslations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ trait HasTranslations

public function initializeHasTranslations(): void
{
$this->mergeCasts(array_merge(
$this->getCasts(),
$this->mergeCasts(
array_fill_keys($this->getTranslatableAttributes(), 'array'),
));
);
}

public static function usingLocale(string $locale): self
Expand Down Expand Up @@ -82,7 +81,9 @@ public function getTranslation(string $key, string $locale, bool $useFallbackLoc

$translations = $this->getTranslations($key);

$translation = is_null(self::getAttributeFromArray($key)) ? null : $translations[$normalizedLocale] ?? '';
$baseKey = Str::before($key, '->'); // get base key in case it is JSON nested key

$translation = is_null(self::getAttributeFromArray($baseKey)) ? null : $translations[$normalizedLocale] ?? '';

$translatableConfig = app(Translatable::class);

Expand Down
Loading