Skip to content

Add support for translate: false fields in multilang setups #3

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
johannschopplich wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for translate: false fields in multilang setups #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/DatabaseStorage/DatabasePage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public static function fromRow(Site|Page $parent, Obj $row): static
// the storage would need to read the same row twice
VersionCache::set(
$page->version(),
Language::ensure('default'),
Language::ensure($row->language()),
$row->toArray()
);

Expand Down
89 changes: 66 additions & 23 deletions src/DatabaseStorage/DatabasePages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,76 @@
use Kirby\Cms\Page;
use Kirby\Cms\Pages;
use Kirby\Cms\Site;
use Kirby\Toolkit\Obj;

class DatabasePages extends Pages
{
public static function fromRows(
Page|Site $parent,
string $model,
bool $draft = false,
): static {
$pages = new static([], $parent);
$database = DatabaseConnection::for($model);
$table = $model::DATABASE_TABLE;

$rows = $database
->table($table)
->where([
'language' => Language::ensure('default')->code(),
'parent' => $parent->uuid()->id(),
'version' => 'latest',
'draft' => $draft === true ? 1 : 0,
])
public static function fromRows(
Page|Site $parent,
string $model,
bool $draft = false,
): static {
$pages = new static([], $parent);
$database = DatabaseConnection::for($model);
$table = $model::DATABASE_TABLE;

$defaultLanguage = Language::ensure('default');
$currentLanguage = Language::ensure('current');

$languages = [$defaultLanguage->code()];
if ($currentLanguage->code() !== $defaultLanguage->code()) {
$languages[] = $currentLanguage->code();
}

$rows = $database->table($table)
->where('language', 'in', $languages)
->where([
'parent' => $parent->uuid()->id(),
'version' => 'latest',
'draft' => $draft === true ? 1 : 0,
])
->order('num ASC, title ASC')
->all();
->all();


$databaseFields = $model::DATABASE_FIELDS;
$pageRows = [];
$rowsBySlug = [];

foreach ($rows as $row) {
$rowsBySlug[$row->slug()][$row->language()] = $row;
}

// merge untranslated fields from default language into current language
foreach ($rowsBySlug as $slug => $languageRows) {
$currentRow = $languageRows[$currentLanguage->code()] ?? null;
$defaultRow = $languageRows[$defaultLanguage->code()] ?? null;

$targetRow = $currentRow ?? $defaultRow;

if (!$targetRow) {
continue;
}

$rowData = $targetRow->toArray();

if ($currentRow && $defaultRow && $currentLanguage->code() !== $defaultLanguage->code()) {
$defaultRowData = $defaultRow->toArray();

foreach ($databaseFields as $field) {
if (empty($rowData[$field]) && !empty($defaultRowData[$field])) {
$rowData[$field] = $defaultRowData[$field];
}
}
}

$pageRows[] = new Obj($rowData);
}

foreach ($rows as $row) {
$pages->add($model::fromRow($parent, $row));
}
foreach ($pageRows as $row) {
$pages->add($model::fromRow($parent, $row));
}

return $pages;
}
return $pages;
}
}