Skip to content

Commit

Permalink
Merge pull request #4441 from getkirby/release/3.7.0.1
Browse files Browse the repository at this point in the history
3.7.0.1
  • Loading branch information
bastianallgeier authored Jun 28, 2022
2 parents d210f26 + 4d325a3 commit eccee2a
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 26 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.7.0",
"version": "3.7.0.1",
"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.

4 changes: 3 additions & 1 deletion config/tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@

// render KirbyText in caption
if ($tag->caption) {
$tag->caption = [$tag->kirby()->kirbytext($tag->caption, [], true)];
$options = ['markdown' => ['inline' => true]];
$caption = $tag->kirby()->kirbytext($tag->caption, $options);
$tag->caption = [$caption];
}

return Html::figure([ $link($image) ], $tag->caption, [
Expand Down
4 changes: 2 additions & 2 deletions i18n/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"create": "Créer",

"date": "Date",
"date.select": "Choisissez une date",
"date.select": "Choisir une date",

"day": "Jour",
"days.fri": "Ven",
Expand Down Expand Up @@ -340,7 +340,7 @@
"license": "Licence",
"license.buy": "Acheter une licence",
"license.register": "S’enregistrer",
"license.manage": "Manage your licenses",
"license.manage": "Gérer vos licences",
"license.register.help": "Vous avez reçu votre numéro de licence par courriel après l'achat. Veuillez le copier et le coller ici pour l'enregistrer.",
"license.register.label": "Veuillez saisir votre numéro de licence",
"license.register.success": "Merci pour votre soutien à Kirby",
Expand Down
26 changes: 13 additions & 13 deletions i18n/translations/sv_SE.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
"email": "E-postadress",
"email.placeholder": "[email protected]",

"entries": "Entries",
"entry": "Entry",
"entries": "Poster",
"entry": "Post",

"environment": "Miljö",

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

"error.template.default.notFound": "Standardmallen existerar inte",

"error.unexpected": "An unexpected error occurred! Enable debug mode for more info: https://getkirby.com/docs/reference/system/options/debug",
"error.unexpected": "Ett oväntat fel uppstod! Aktivera felsökningsläge för mer information: https://getkirby.com/docs/reference/system/options/debug",

"error.user.changeEmail.permission": "Du har inte behörighet att ändra e-postadressen för användaren \"{name}\"",
"error.user.changeLanguage.permission": "Du har inte behörighet att ändra språket för användaren \"{name}\"",
Expand Down Expand Up @@ -340,12 +340,12 @@
"license": "Licens",
"license.buy": "Köp en licens",
"license.register": "Registrera",
"license.manage": "Manage your licenses",
"license.manage": "Hantera dina licenser",
"license.register.help": "Du fick din licenskod via e-post efter inköpet. Kopiera och klistra in den för att registrera licensen.",
"license.register.label": "Ange din licenskod",
"license.register.success": "Tack för att du stödjer Kirby",
"license.unregistered": "Detta är en oregistrerad demo av Kirby",
"license.unregistered.label": "Unregistered",
"license.unregistered.label": "Oregistrerad",

"link": "L\u00e4nk",
"link.text": "L\u00e4nktext",
Expand Down Expand Up @@ -475,7 +475,7 @@

"section.required": "Sektionen krävs",

"security": "Security",
"security": "Säkerhet",
"select": "Välj",
"server": "Server",
"settings": "Inställningar",
Expand All @@ -485,13 +485,13 @@
"slug": "URL-appendix",
"sort": "Sortera",

"stats.empty": "No reports",
"system.issues.content": "The content folder seems to be exposed",
"system.issues.debug": "Debugging must be turned off in production",
"system.issues.git": "The .git folder seems to be exposed",
"system.issues.https": "We recommend HTTPS for all your sites",
"system.issues.kirby": "The kirby folder seems to be exposed",
"system.issues.site": "The site folder seems to be exposed",
"stats.empty": "Inga rapporter",
"system.issues.content": "Mappen content verkar vara exponerad",
"system.issues.debug": "Felsökningsläget måste vara avstängt i produktion",
"system.issues.git": "Mappen .git verkar vara exponerad",
"system.issues.https": "Vi rekommenderar HTTPS för alla dina webbplatser",
"system.issues.kirby": "Mappen kirby verkar vara exponerad",
"system.issues.site": "Mappen site verkar vara exponerad",

"title": "Titel",
"template": "Mall",
Expand Down
2 changes: 1 addition & 1 deletion i18n/translations/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@
"license": "Lisans",
"license.buy": "Bir lisans satın al",
"license.register": "Kayıt Ol",
"license.manage": "Manage your licenses",
"license.manage": "Lisanslarınızı yönetin",
"license.register.help": "Satın alma işleminden sonra e-posta yoluyla lisans kodunuzu aldınız. Lütfen kayıt olmak için kodu kopyalayıp yapıştırın.",
"license.register.label": "Lütfen lisans kodunu giriniz",
"license.register.success": "Kirby'yi desteklediğiniz için teşekkürler",
Expand Down
2 changes: 1 addition & 1 deletion panel/dist/js/index.js

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions panel/src/components/Navigation/OptionsDropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,12 @@ export default {
},
methods: {
onAction(action, item, itemIndex) {
this.$emit("action", action, item, itemIndex);
this.$emit("option", action, item, itemIndex);
if (typeof action === "function") {
action.call(this);
} else {
this.$emit("action", action, item, itemIndex);
this.$emit("option", action, item, itemIndex);
}
},
toggle() {
this.$refs.options.toggle();
Expand Down
8 changes: 4 additions & 4 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php return array(
'root' => array(
'name' => 'getkirby/cms',
'pretty_version' => '3.7.0',
'version' => '3.7.0.0',
'pretty_version' => '3.7.0.1',
'version' => '3.7.0.1',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand All @@ -29,8 +29,8 @@
'dev_requirement' => false,
),
'getkirby/cms' => array(
'pretty_version' => '3.7.0',
'version' => '3.7.0.0',
'pretty_version' => '3.7.0.1',
'version' => '3.7.0.1',
'reference' => NULL,
'type' => 'kirby-cms',
'install_path' => __DIR__ . '/../../',
Expand Down

0 comments on commit eccee2a

Please sign in to comment.