Skip to content

Commit

Permalink
Merge pull request #4845 from getkirby/release/3.8.2
Browse files Browse the repository at this point in the history
3.8.2
  • Loading branch information
bastianallgeier authored Nov 15, 2022
2 parents 04ef75b + 4137ee6 commit f16b0b4
Show file tree
Hide file tree
Showing 80 changed files with 3,439 additions and 1,945 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Kirby 3 core",
"license": "proprietary",
"type": "kirby-cms",
"version": "3.8.1.1",
"version": "3.8.2",
"keywords": [
"kirby",
"cms",
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions config/api/models/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
},
'type' => fn (File $file) => $file->type(),
'url' => fn (File $file) => $file->url(),
'uuid' => fn (File $file) => $file->uuid()?->toString()
],
'type' => 'Kirby\Cms\File',
'views' => [
Expand All @@ -79,14 +80,16 @@
'size',
'template',
'type',
'url'
'url',
'uuid'
],
'compact' => [
'filename',
'id',
'link',
'type',
'url',
'uuid'
],
'panel' => [
'blueprint',
Expand All @@ -109,7 +112,8 @@
'prevWithTemplate' => 'compact',
'template',
'type',
'url'
'url',
'uuid'
]
],
];
10 changes: 7 additions & 3 deletions config/api/models/Page.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,16 @@
'template' => fn (Page $page) => $page->intendedTemplate()->name(),
'title' => fn (Page $page) => $page->title()->value(),
'url' => fn (Page $page) => $page->url(),
'uuid' => fn (Page $page) => $page->uuid()?->toString()
],
'type' => 'Kirby\Cms\Page',
'views' => [
'compact' => [
'id',
'title',
'url',
'num'
'num',
'uuid'
],
'default' => [
'content',
Expand All @@ -57,7 +59,8 @@
'slug',
'template',
'title',
'url'
'url',
'uuid'
],
'panel' => [
'id',
Expand All @@ -71,7 +74,8 @@
'previewUrl',
'slug',
'title',
'url'
'url',
'uuid'
],
'selector' => [
'id',
Expand Down
7 changes: 2 additions & 5 deletions config/api/models/System.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,8 @@
$code = $this->user()?->language() ??
$this->kirby()->panelLanguage();

if ($translation = $this->kirby()->translation($code)) {
return $translation;
}

return $this->kirby()->translation('en');
return $this->kirby()->translation($code) ??
$this->kirby()->translation('en');
},
'kirbytext' => fn () => $this->kirby()->option('panel.kirbytext') ?? true,
'user' => fn () => $this->user(),
Expand Down
10 changes: 7 additions & 3 deletions config/api/models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
'prev' => fn (User $user) => $user->prev(),
'role' => fn (User $user) => $user->role(),
'roles' => fn (User $user) => $user->roles(),
'username' => fn (User $user) => $user->username()
'username' => fn (User $user) => $user->username(),
'uuid' => fn (User $user) => $user->uuid()?->toString()
],
'type' => 'Kirby\Cms\User',
'views' => [
Expand All @@ -39,7 +40,8 @@
'options',
'prev' => 'compact',
'role',
'username'
'username',
'uuid'
],
'compact' => [
'avatar' => 'compact',
Expand All @@ -48,7 +50,8 @@
'language',
'name',
'role' => 'compact',
'username'
'username',
'uuid'
],
'auth' => [
'avatar' => 'compact',
Expand All @@ -72,6 +75,7 @@
'prev' => ['id', 'name'],
'role',
'username',
'uuid'
],
]
];
22 changes: 11 additions & 11 deletions i18n/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@
"paste": "붙여넣기",
"paste.after": "뒤로 붙여넣기",
"pixel": "픽셀",
"plugin": "Plugin",
"plugin": "플러그인",
"plugins": "플러그인",
"prev": "이전",
"preview": "미리 보기",
Expand Down Expand Up @@ -503,15 +503,15 @@
"system.issues.site": "<code>/site</code> 폴더의 권한을 확인하세요.",
"system.issues.vulnerability.kirby": "Your installation might be affected by the following vulnerability ({ severity } severity): { description }",
"system.issues.vulnerability.plugin": "Your installation might be affected by the following vulnerability in the { plugin } plugin ({ severity } severity): { description }",
"system.updateStatus": "Update status",
"system.updateStatus.error": "Could not check for updates",
"system.updateStatus.not-vulnerable": "No known vulnerabilities",
"system.updateStatus": "업데이트 상태",
"system.updateStatus.error": "업데이트를 확인할 수 없습니다.",
"system.updateStatus.not-vulnerable": "알려진 취약성이 없습니다.",
"system.updateStatus.security-update": "Free security update { version } available",
"system.updateStatus.security-upgrade": "Upgrade { version } with security fixes available",
"system.updateStatus.unreleased": "Unreleased version",
"system.updateStatus.up-to-date": "Up to date",
"system.updateStatus.update": "Free update { version } available",
"system.updateStatus.upgrade": "Upgrade { version } available",
"system.updateStatus.unreleased": "출시 전 버전",
"system.updateStatus.up-to-date": "최신 버전입니다.",
"system.updateStatus.update": "{ version } 버전으로 무료 업데이트",
"system.updateStatus.upgrade": "{ version } 버전으로 업그레이드",

"title": "제목",
"template": "\ud15c\ud50c\ub9bf",
Expand Down Expand Up @@ -578,9 +578,9 @@
"users": "사용자",

"version": "버전",
"version.current": "Current version",
"version.latest": "Latest version",
"versionInformation": "Version information",
"version.current": "현재 버전",
"version.latest": "최신 버전",
"versionInformation": "버전 정보",

"view.account": "계정",
"view.installation": "\uc124\uce58",
Expand Down
60 changes: 30 additions & 30 deletions i18n/translations/lt.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"account.changeName": "Change your name",
"account.delete": "Delete your account",
"account.delete.confirm": "Do you really want to delete your account? You will be logged out immediately. Your account cannot be recovered.",
"account.changeName": "Pakeisti savo vardą",
"account.delete": "Panaikinti savo paskyrą",
"account.delete.confirm": "Ar tikrai norite panaikinti savo paskyrą? Jūs iš karto atsijungsite. Paskyros bus neįmanoma atstatyti.",

"add": "Pridėti",
"author": "Author",
"author": "Autorius",
"avatar": "Profilio nuotrauka",
"back": "Atgal",
"cancel": "Atšaukti",
Expand Down Expand Up @@ -49,10 +49,10 @@
"email": "El. paštas",
"email.placeholder": "[email protected]",

"entries": "Entries",
"entry": "Entry",
"entries": "Įrašai",
"entry": "Įrašas",

"environment": "Environment",
"environment": "Aplinka",

"error.access.code": "Neteisinas kodas",
"error.access.login": "Neteisingas prisijungimo vardas",
Expand All @@ -70,7 +70,7 @@
"error.blocks.max.singular": "Jūs galite pridėti daugiausiai vieną bloką",
"error.blocks.min.plural": "Minimalus blokų kiekis: {min}",
"error.blocks.min.singular": "Jūs turite pridėti bent vieną bloką",
"error.blocks.validation": "There's an error on the \"{field}\" field in block {index} using the \"{fieldset}\" block type",
"error.blocks.validation": "Yra klaida laukelyje \"{field}\" bloke {index} naudojant bloko tipą \"{fieldset}\"",

"error.email.preset.notFound": "El. pašto paruoštukas \"{name}\" nerastas",

Expand Down Expand Up @@ -116,7 +116,7 @@

"error.object.validation": "There’s an error in the \"{label}\" field:\n{message}",

"error.offline": "The Panel is currently offline",
"error.offline": "Valdymo pultas dabar yra offline",

"error.page.changeSlug.permission": "Neturite teisės pakeisti \"{slug}\" URL",
"error.page.changeStatus.incomplete": "Puslapis turi klaidų ir negali būti paskelbtas",
Expand Down Expand Up @@ -284,7 +284,7 @@
"field.layout.empty": "Dar nėra eilučių",
"field.layout.select": "Pasirinkite išdėstymą",

"field.object.empty": "No information yet",
"field.object.empty": "Dar nėra informacijos",

"field.pages.empty": "Dar nėra puslapių",

Expand Down Expand Up @@ -346,12 +346,12 @@
"license": "Licenzija",
"license.buy": "Pirkti licenziją",
"license.register": "Registruoti",
"license.manage": "Manage your licenses",
"license.manage": "Valdyti savo licencijas",
"license.register.help": "Licenzijos kodą gavote el. paštu po apmokėjimo. Prašome įterpti čia, kad sistema būtų užregistruota.",
"license.register.label": "Prašome įrašyti jūsų licenzijos kodą",
"license.register.success": "Ačiū, kad palaikote Kirby",
"license.unregistered": "Tai neregistruota Kirby demo versija",
"license.unregistered.label": "Unregistered",
"license.unregistered.label": "Neregistruota",

"link": "Nuoroda",
"link.text": "Nuorodos tekstas",
Expand Down Expand Up @@ -454,8 +454,8 @@
"paste": "Įterpti",
"paste.after": "Įterpti po",
"pixel": "Pikselis",
"plugin": "Plugin",
"plugins": "Plugins",
"plugin": "Įskiepas",
"plugins": "Įskiepai",
"prev": "Ankstesnis",
"preview": "Peržiūra",
"remove": "Pašalinti",
Expand All @@ -482,17 +482,17 @@

"section.required": "Sekcija privaloma",

"security": "Security",
"security": "Saugumas",
"select": "Pasirinkti",
"server": "Server",
"server": "Serveris",
"settings": "Nustatymai",
"show": "Rodyti",
"site.blueprint": "Svetainė neturi blueprint. Jūs galite nustatyti jį <strong>/site/blueprints/site.yml</strong>",
"size": "Dydis",
"slug": "URL pabaiga",
"sort": "Rikiuoti",

"stats.empty": "No reports",
"stats.empty": "Nėra pranešimų",
"system.issues.content": "The content folder seems to be exposed",
"system.issues.eol.kirby": "Your installed Kirby version has reached end-of-life and will not receive further security updates",
"system.issues.eol.plugin": "Your installed version of the { plugin } plugin is has reached end-of-life and will not receive further security updates",
Expand All @@ -503,15 +503,15 @@
"system.issues.site": "The site folder seems to be exposed",
"system.issues.vulnerability.kirby": "Your installation might be affected by the following vulnerability ({ severity } severity): { description }",
"system.issues.vulnerability.plugin": "Your installation might be affected by the following vulnerability in the { plugin } plugin ({ severity } severity): { description }",
"system.updateStatus": "Update status",
"system.updateStatus.error": "Could not check for updates",
"system.updateStatus.not-vulnerable": "No known vulnerabilities",
"system.updateStatus.security-update": "Free security update { version } available",
"system.updateStatus.security-upgrade": "Upgrade { version } with security fixes available",
"system.updateStatus.unreleased": "Unreleased version",
"system.updateStatus.up-to-date": "Up to date",
"system.updateStatus.update": "Free update { version } available",
"system.updateStatus.upgrade": "Upgrade { version } available",
"system.updateStatus": "Atnaujinimų statusas",
"system.updateStatus.error": "Nepavyko patikrinti atnaujinimų",
"system.updateStatus.not-vulnerable": "Nėra žinomų saugumo spragų",
"system.updateStatus.security-update": "Prieinamas nemokamas saugumo atnaujinimas { version }",
"system.updateStatus.security-upgrade": "Prieinama nauja { version } versija su saugumo atnaujinimais",
"system.updateStatus.unreleased": "Neišleista versija",
"system.updateStatus.up-to-date": "Naujausia versija",
"system.updateStatus.update": "Prieinamas nemokamas atnaujinimas { version }",
"system.updateStatus.upgrade": "Prieinamas atnaujinimas { version }",

"title": "Pavadinimas",
"template": "Puslapio šablonas",
Expand Down Expand Up @@ -578,16 +578,16 @@
"users": "Vartotojai",

"version": "Versija",
"version.current": "Current version",
"version.latest": "Latest version",
"versionInformation": "Version information",
"version.current": "Dabartinė versija",
"version.latest": "Naujausia versija",
"versionInformation": "Versijos informacija",

"view.account": "Jūsų paskyra",
"view.installation": "Installation",
"view.languages": "Kalbos",
"view.resetPassword": "Sukurti naują slaptažodį",
"view.site": "Svetainė",
"view.system": "System",
"view.system": "Sistema",
"view.users": "Vartotojai",

"welcome": "Sveiki",
Expand Down
2 changes: 1 addition & 1 deletion panel/dist/css/style.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion panel/dist/js/index.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions panel/dist/js/vendor.js

Large diffs are not rendered by default.

Loading

0 comments on commit f16b0b4

Please sign in to comment.