From: Vincent Vanwaelscappel Date: Thu, 23 Nov 2023 18:07:57 +0000 (+0100) Subject: fix #5750 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a9ce18a2aa450048e32a759eb5679f832bce99e2;p=fluidbook-toolbox.git fix #5750 @0.25 --- diff --git a/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelImportOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelImportOperation.php index 62fdbcff3..38108883d 100644 --- a/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelImportOperation.php +++ b/app/Http/Controllers/Admin/Operations/FluidbookTranslate/ExcelImportOperation.php @@ -68,6 +68,6 @@ trait ExcelImportOperation FluidbookTranslate::updateFluidbookTranslation($locale, $translations); Alert::success('' . $updated . ' translations were updated (' . $count . ' total)')->flash(); } - return redirect($this->crud->route . '/1/edit/?locale=' . $locale); + return redirect($this->crud->route . '/1/edit/?_locale=' . $locale); } } diff --git a/app/Models/FluidbookHealthIssues.php b/app/Models/FluidbookHealthIssues.php index 7abdc5e57..adc072d5d 100644 --- a/app/Models/FluidbookHealthIssues.php +++ b/app/Models/FluidbookHealthIssues.php @@ -64,7 +64,7 @@ class FluidbookHealthIssues extends ToolboxModel /* * __('Le chemin ":path" est introuvable') * __('Le QRcode du lien :uid (page :page) n\'a pas pu être décodé') - * __(''Ce fluidbook mobile first a le paramètre "Identifiant du fluidbook Mobile first" défini. Ce paramètre est réservé aux fluidbooks Desktop') + * __('Ce fluidbook mobile first a le paramètre "Identifiant du fluidbook Mobile first" défini. Ce paramètre est réservé aux fluidbooks Desktop') * */ return [ diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php index 45986eef0..eac04ce2e 100644 --- a/app/Models/Traits/PublicationSettings.php +++ b/app/Models/Traits/PublicationSettings.php @@ -1754,10 +1754,10 @@ trait PublicationSettings protected function _mobileFirst() { $this->addSettingField('section_mobilefirst', FormSection::class, $this->__('Mobile first')); - $this->addSettingField('mobilefirstFluidbookId', LongText::class, 'Identifiant du fluidbook "Mobile first"', [ + $this->addSettingField('mobilefirstFluidbookId', LongText::class, __('Identifiant du fluidbook "Mobile first"'), [ 'v2' => '{"type":"text","default":"","editable":true,"label":"Identifiant du fluidbook \\"Mobile first\\"","grade":5}', ]); - $this->addSettingField('mobilefirstBreakpoint', LongText::class, 'Breakpoint du passage à la version "Mobile first" (en pixels)', [ + $this->addSettingField('mobilefirstBreakpoint', LongText::class, __('Breakpoint du passage à la version "Mobile first" (en pixels)'), [ 'v2' => '{"type":"text","default":"640","editable":true,"label":"Breakpoint du passage \\u00e0 la version \\"Mobile first\\" (en pixels)","grade":5}', 'default' => '640', ]); @@ -1781,7 +1781,7 @@ trait PublicationSettings 'accept' => self::$acceptHTML, 'hint' => __('Laisser vide pour utiliser le template par défaut'), ]); - $this->addSettingField('secureClientSidePasswordCredentials', Textarea::class, 'Utilisateurs / mots de passe', [ + $this->addSettingField('secureClientSidePasswordCredentials', Textarea::class, __('Utilisateurs / mots de passe'), [ 'v2' => '{"type":"textarea","label":"Utilisateurs \\/ mots de passe","editable":true,"default":"","grade":3,"hint":"Format user:password par ligne"}', 'hint' => __('Format user:password par ligne'), ]);