Skip to content
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

fix: unclear distinction between sign-up list and field name fields #1971

Merged
merged 1 commit into from
Jan 11, 2025
Merged

fix: unclear distinction between sign-up list and field name fields #1971

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
4 changes: 2 additions & 2 deletions module/Activity/src/Form/SignupList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(private readonly Translator $translator)
'name' => 'name',
'type' => Text::class,
'options' => [
'label' => $this->translator->translate('Name'),
'label' => $this->translator->translate('Sign-up List Name'),
],
],
);
Expand All @@ -42,7 +42,7 @@ public function __construct(private readonly Translator $translator)
'name' => 'nameEn',
'type' => Text::class,
'options' => [
'label' => $this->translator->translate('Name'),
'label' => $this->translator->translate('Sign-up List Name'),
],
],
);
Expand Down
4 changes: 2 additions & 2 deletions module/Activity/src/Form/SignupListField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function __construct(private readonly Translator $translator)
'name' => 'name',
'type' => Text::class,
'options' => [
'label' => $this->translator->translate('Name'),
'label' => $this->translator->translate('Field Name'),
],
],
);
Expand All @@ -53,7 +53,7 @@ public function __construct(private readonly Translator $translator)
'name' => 'nameEn',
'type' => Text::class,
'options' => [
'label' => $this->translator->translate('Name'),
'label' => $this->translator->translate('Field Name'),
],
],
);
Expand Down
12 changes: 6 additions & 6 deletions module/Activity/view/partial/admin-approval/signuplists.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ use Laminas\View\Renderer\PhpRenderer;
<div class="col-md-12">
<div class="row">
<div class="col-md-2 overview-sidebar">
<strong><?= $this->translate('Name') ?></strong>
<strong><?= $this->translate('Sign-up List Name') ?></strong>
</div>
<div class="col-md-5">
<span class="approvable-property">
<span class="flag-icon flag-icon-nl"></span>
<strong><?= $this->translate('Name') ?>:</strong>
<strong><?= $this->translate('Sign-up List Name') ?>:</strong>
</span>
<?= $this->escapeHtml($signupList->getName()->getValueNL()) ?>
</div>
<div class="col-md-5">
<span class="approvable-property">
<span class="flag-icon flag-icon-en"></span>
<strong><?= $this->translate('Name') ?>:</strong>
<strong><?= $this->translate('Sign-up List Name') ?>:</strong>
</span>
<?= $this->escapeHtml($signupList->getName()->getValueEN()) ?>
</div>
Expand Down Expand Up @@ -99,19 +99,19 @@ use Laminas\View\Renderer\PhpRenderer;
<hr>
</div>
<div class="col-md-2 overview-sidebar">
<strong><?= $this->translate('Name') ?></strong>
<strong><?= $this->translate('Field Name') ?></strong>
</div>
<div class="col-md-5">
<span class="approvable-property">
<span class="flag-icon flag-icon-nl"></span>
<strong><?= $this->translate('Name') ?>:</strong>
<strong><?= $this->translate('Field Name') ?>:</strong>
</span>
<?= $this->escapeHtml($field->getName()->getValueNL()) ?>
</div>
<div class="col-md-5">
<span class="approvable-property">
<span class="flag-icon flag-icon-en"></span>
<strong><?= $this->translate('Name') ?>:</strong>
<strong><?= $this->translate('Field Name') ?>:</strong>
</span>
<?= $this->escapeHtml($field->getName()->getValueEN()) ?>
</div>
Expand Down
4 changes: 2 additions & 2 deletions module/Activity/view/partial/signuplist.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ use Laminas\View\Renderer\PhpRenderer;
?>
<div class="form-group <?= $this->bootstrapElementError($name) ?>">
<label for="<?= $name->getAttribute('id') ?>" class="control-label">
<?= $this->translate('Name') ?>
<?= $name->getLabel() ?>
<span class="flag-icon flag-icon-nl"></span>
</label>
<?= $this->formText($name) ?>
Expand All @@ -67,7 +67,7 @@ use Laminas\View\Renderer\PhpRenderer;
?>
<div class="form-group <?= $this->bootstrapElementError($nameEn) ?>">
<label for="<?= $nameEn->getAttribute('id') ?>" class="control-label">
<?= $this->translate('Name') ?>
<?= $name->getLabel() ?>
<span class="flag-icon flag-icon-en"></span>
</label>
<?= $this->formText($nameEn) ?>
Expand Down
14 changes: 8 additions & 6 deletions module/Application/language/en.po
View file
Open in desktop

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

14 changes: 8 additions & 6 deletions module/Application/language/gewisweb.pot
View file
Open in desktop

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

15 changes: 8 additions & 7 deletions module/Application/language/nl.po
View file
Open in desktop

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

Loading