Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 features/standard/UserCreation.feature
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Feature: User management
And I set content fields for user
| label | Username | Password | Confirm password | Email | Enabled |
| User account | testuser | Test1234pw | Test1234pw | test@test.com | Yes |
And I perform the "Create" action
And I perform the "Save and close" action
Then I should be on Content view Page for "Users/testuser lastname"
And content attributes equal
| label | value |
Expand All @@ -39,7 +39,7 @@ Feature: User management
And I set content fields for user
| label | Username | Password | Confirm password | Email |
| User account | testuser | Test123456 | Test123456 | test@test.org |
And I perform the "Update" action
And I perform the "Save and close" action
Then I should be on Content view Page for "Users/testuseredited lastnameedited"
And content attributes equal
| label | value |
Expand Down
4 changes: 2 additions & 2 deletions features/standard/UserProfile.feature
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Feature: User profile management
And I set content fields for user
| label | Username | Password | Confirm password | Email | Enabled |
| User account | testeditor | Test1234pw | Test1234pw | test@test.com | Yes |
And I perform the "Create" action
And I perform the "Save and close" action
Then I should be on Content view Page for "/Users/Editors/EditorFirstName EditorLastName"
And content attributes equal
| label | value |
Expand Down Expand Up @@ -43,7 +43,7 @@ Feature: User profile management
| Job Title | TestJobTitle |
| Department | TestDepartment |
| Location | TestLocation |
And I perform the "Update" action
And I perform the "Save and close" action
Then I should be on "User profile" page
And I should see a user profile summary with values
| Full name | Email | Job Title | Department | Location |
Expand Down
16 changes: 8 additions & 8 deletions src/bundle/Resources/translations/ibexa_menu.en.xliff
Original file line number Diff line number Diff line change
Expand Up @@ -557,23 +557,23 @@
<note>key: user__settings</note>
</trans-unit>
<trans-unit id="40679174821cfa2ce3d3a4dc046f0ef65df6f483" resname="user_create__sidebar_right__cancel">
<source>Cancel</source>
<target state="new">Cancel</target>
<source>Discard</source>
<target state="new">Discard</target>
<note>key: user_create__sidebar_right__cancel</note>
</trans-unit>
<trans-unit id="e2f3f27b94662872c5f39dbf8b26b489deb14f8c" resname="user_create__sidebar_right__create">
<source>Create</source>
<target state="new">Create</target>
<source>Save and close</source>
<target state="new">Save and close</target>
<note>key: user_create__sidebar_right__create</note>
</trans-unit>
<trans-unit id="5eac585c3d7a63e58780b7939ee2a8e70e290436" resname="user_edit__sidebar_right__cancel">
<source>Cancel</source>
<target state="new">Cancel</target>
<source>Discard changes</source>
<target state="new">Discard changes</target>
<note>key: user_edit__sidebar_right__cancel</note>
</trans-unit>
<trans-unit id="5a09908619e3d8e6b30af8af8c14abd416b485fa" resname="user_edit__sidebar_right__update">
<source>Update</source>
<target state="new">Update</target>
<source>Save and close</source>
<target state="new">Save and close</target>
<note>key: user_edit__sidebar_right__update</note>
</trans-unit>
<trans-unit id="d79a55ddd58ecf56b4edb39c794c858d649481e2" resname="user_password_change__sidebar_right__cancel">
Expand Down
4 changes: 2 additions & 2 deletions src/lib/Menu/UserCreateRightSidebarBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public function createStructure(array $options): ItemInterface
public static function getTranslationMessages(): array
{
return [
(new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Create'),
(new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'),
(new Message(self::ITEM__CREATE, 'ibexa_menu'))->setDesc('Save and close'),
(new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard'),
];
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/Menu/UserEditRightSidebarBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ public function createStructure(array $options): ItemInterface
public static function getTranslationMessages(): array
{
return [
(new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Update'),
(new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Cancel'),
(new Message(self::ITEM__UPDATE, 'ibexa_menu'))->setDesc('Save and close'),
(new Message(self::ITEM__CANCEL, 'ibexa_menu'))->setDesc('Discard changes'),
];
}
}
Expand Down
Loading