Convert function to view

6 files changed, 26 insertions, 18 deletions

diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php
index e8d7c9824c..7004c79c37 100644
--- a/app/Functions/FunctionsEdit.php
+++ b/app/Functions/FunctionsEdit.php
@@ -87,24 +87,13 @@ class FunctionsEdit
      * Function edit_language_checkboxes
      *
      * @param string        $parameter_name
-     * @param array<string> $accepted_languages
+     * @param array<string> $languages
      *
      * @return string
      */
-    public static function editLanguageCheckboxes($parameter_name, $accepted_languages): string
+    public static function editLanguageCheckboxes($parameter_name, $languages): string
     {
-        $html = '';
-        foreach (I18N::activeLocales() as $locale) {
-            $html .= '<div class="form-check">';
-            $html .= '<label title="' . $locale->languageTag() . '">';
-            $html .= '<input type="checkbox" name="' . $parameter_name . '[]" value="' . $locale->languageTag() . '"';
-            $html .= in_array($locale->languageTag(), $accepted_languages, true) ? ' checked>' : '> ';
-            $html .= $locale->endonym();
-            $html .= '</label>';
-            $html .= '</div>';
-        }
-
-        return '<div style="columns: auto 12rem">' . $html . '</div>';
+        return view('edit/language-checkboxes', ['languages' => $languages]);
     }
 
     /**
diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php
index f304d1e053..09f1826e26 100644
--- a/app/Module/HtmlBlockModule.php
+++ b/app/Module/HtmlBlockModule.php
@@ -169,7 +169,7 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface
         $title = $this->html_service->sanitize($params['title']);
         $html  = $this->html_service->sanitize($params['html']);
 
-        $languages = $params['lang'] ?? [];
+        $languages = $params['languages'] ?? [];
 
         $this->setBlockSetting($block_id, 'title', $title);
         $this->setBlockSetting($block_id, 'html', $html);
diff --git a/resources/views/edit/language-checkboxes.phtml b/resources/views/edit/language-checkboxes.phtml
new file mode 100644
index 0000000000..7cfcd72d32
--- /dev/null
+++ b/resources/views/edit/language-checkboxes.phtml
@@ -0,0 +1,19 @@
+<?php
+
+use Fisharebest\Webtrees\I18N;
+
+/**
+ * @var array<string> $languages - Currently selected languages
+ */
+
+?>
+<div style="columns: auto 12rem">
+    <?php foreach (I18N::activeLocales() as $locale) : ?>
+        <div class="form-check">
+            <label title="<?= e($locale->languageTag()) ?>">
+                <input type="checkbox" name="languages[]" value="<?= e($locale->languageTag()) ?>" <?= in_array($locale->languageTag(), $languages, true) ? 'checked' : '' ?>>
+                <?= $locale->endonym() ?>
+            </label>
+        </div>
+    <?php endforeach ?>
+</div>
diff --git a/resources/views/modules/faq/edit.phtml b/resources/views/modules/faq/edit.phtml
index e8c0584ec4..76c83bf033 100644
--- a/resources/views/modules/faq/edit.phtml
+++ b/resources/views/modules/faq/edit.phtml
@@ -42,7 +42,7 @@ use Fisharebest\Webtrees\I18N;
         </label>
 
         <div class="col-sm-9">
-            <?= FunctionsEdit::editLanguageCheckboxes('languages', $languages) ?>
+            <?= view('edit/language-checkboxes', ['languages' => $languages]) ?>
         </div>
     </div>
 
diff --git a/resources/views/modules/html/config.phtml b/resources/views/modules/html/config.phtml
index beba5d0cc6..08955deabc 100644
--- a/resources/views/modules/html/config.phtml
+++ b/resources/views/modules/html/config.phtml
@@ -56,7 +56,7 @@ use Fisharebest\Webtrees\View;
             <?= I18N::translate('Show this block for which languages') ?>
         </legend>
         <div class="col-sm-9">
-            <?= FunctionsEdit::editLanguageCheckboxes('lang', $languages) ?>
+            <?= view('edit/language-checkboxes', ['languages' => $languages]) ?>
         </div>
     </div>
 </fieldset>
diff --git a/resources/views/modules/stories/edit.phtml b/resources/views/modules/stories/edit.phtml
index f69a07643a..3d60162e0f 100644
--- a/resources/views/modules/stories/edit.phtml
+++ b/resources/views/modules/stories/edit.phtml
@@ -49,7 +49,7 @@ use Fisharebest\Webtrees\I18N;
             <?= I18N::translate('Show this block for which languages') ?>
         </label>
         <div class="col-sm-9">
-            <?= FunctionsEdit::editLanguageCheckboxes('languages', $languages) ?>
+            <?= view('edit/language-checkboxes', ['languages' => $languages]) ?>
         </div>
     </div>