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

Jump to bottom

IBX-7637: [User settings] Enabled/Disabled labels should be in upper case #1176

Merged
merged 3 commits into from
Feb 26, 2024
Merged

IBX-7637: [User settings] Enabled/Disabled labels should be in upper case #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bee5960
IBX-7637: [User settings] Enabled/Disabled labels should be in upper …
GrabowskiM Feb 15, 2024
4562917
fix tests
GrabowskiM Feb 20, 2024
7f7fb42
change undefined to -
GrabowskiM Feb 23, 2024
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
16 changes: 8 additions & 8 deletions src/bundle/Resources/translations/ibexa_user_settings.en.xliff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
<note>key: settings.autosave.value.description</note>
</trans-unit>
<trans-unit id="8d3d9c3a593c29c5ad69cf09b44cc423b27b1b64" resname="settings.autosave.value.disabled">
<source>disabled</source>
<target state="new">disabled</target>
<source>Disabled</source>
<target state="new">Disabled</target>
<note>key: settings.autosave.value.disabled</note>
</trans-unit>
<trans-unit id="5f85d72d00abca8e47ea83a67c9577c3cdb454b8" resname="settings.autosave.value.enabled">
<source>enabled</source>
<target state="new">enabled</target>
<source>Enabled</source>
<target state="new">Enabled</target>
<note>key: settings.autosave.value.enabled</note>
</trans-unit>
<trans-unit id="6e582329e8e54377b58d547389fda8ac2dd2cf5c" resname="settings.autosave.value.title">
Expand Down Expand Up @@ -72,13 +72,13 @@
<note>key: settings.in_context_translation.value.description</note>
</trans-unit>
<trans-unit id="3f33c08a95b774bfdcb67ade54bce7f62bd2ac54" resname="settings.in_context_translation.value.disabled">
<source>disabled</source>
<target state="new">disabled</target>
<source>Disabled</source>
<target state="new">Disabled</target>
<note>key: settings.in_context_translation.value.disabled</note>
</trans-unit>
<trans-unit id="08e33cb64156307a5a8197a0cdb4e254e6c4c5c5" resname="settings.in_context_translation.value.enabled">
<source>enabled</source>
<target state="new">enabled</target>
<source>Enabled</source>
<target state="new">Enabled</target>
<note>key: settings.in_context_translation.value.enabled</note>
</trans-unit>
<trans-unit id="655baeb177f1234a01684cf79c22ccdcaf5bee51" resname="settings.in_context_translation.value.title">
Expand Down
10 changes: 8 additions & 2 deletions src/bundle/Resources/views/themes/admin/ui/component/details/details.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,18 @@
{% set is_field_empty = item.is_field_empty|default(false) %}

<div
class="ibexa-details__item {{ item_inline|default(false) ? 'ibexa-details__item--inline' ~
class="ibexa-details__item {{ item_inline|default(false) ? 'ibexa-details__item--inline' ~
(is_field_empty ? ' ibexa-details__item--hidden') }}"
>
<div class="ibexa-details__item-label {{ item_inline|default(false) ? '' : 'ibexa-label' }}">{{ item.label }}</div>
<div class="ibexa-details__item-content">
{{ item.content_raw is defined ? item.content_raw|raw : item.content }}
{% if item.content_raw is defined %}
{{ item.content_raw|raw }}
{% elseif item.content == 'undefined' %}
-
{% else %}
{{ item.content }}
{% endif %}
</div>
</div>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Behat/Page/UserSettingsPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public function disableAutosave(): void
{
$this->contentActionsMenu->verifyIsLoaded();
$this->getHTMLPage()->find($this->getLocator('autosaveDraftValueDropdown'))->click();
$this->ibexaDropdown->selectOption('disabled');
$this->ibexaDropdown->selectOption('Disabled');
}

protected function getRoute(): string
Expand Down
4 changes: 2 additions & 2 deletions src/lib/UserSetting/Autosave.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ private function getTranslatedDescription(): string
private function getTranslatedOptionEnabled(): string
{
return $this->translator->trans(
/** @Desc("enabled") */
/** @Desc("Enabled") */
'settings.autosave.value.enabled',
[],
'ibexa_user_settings'
Expand All @@ -122,7 +122,7 @@ private function getTranslatedOptionEnabled(): string
private function getTranslatedOptionDisabled(): string
{
return $this->translator->trans(
/** @Desc("disabled") */
/** @Desc("Disabled") */
'settings.autosave.value.disabled',
[],
'ibexa_user_settings'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/UserSetting/InContextTranslation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ private function getTranslatedDescription(): string
private function getTranslatedOptionEnabled(): string
{
return $this->translator->trans(
/** @Desc("enabled") */
/** @Desc("Enabled") */
'settings.in_context_translation.value.enabled',
[],
'ibexa_user_settings'
Expand All @@ -113,7 +113,7 @@ private function getTranslatedOptionEnabled(): string
private function getTranslatedOptionDisabled(): string
{
return $this->translator->trans(
/** @Desc("disabled") */
/** @Desc("Disabled") */
'settings.in_context_translation.value.disabled',
[],
'ibexa_user_settings'
Expand Down
Loading