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.

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

IBX-6314: Applied microcopy guidelines and adjusted translation keys and domains #260

Merged
merged 3 commits into from
Sep 1, 2023
Merged
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
6 changes: 3 additions & 3 deletions data/mysql/cleandata.sql
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ VALUES (1,9,1,2,3,1448889046,'Ibexa Platform',14,1448889046,'9459d3c29e15006e451
(3,1,13,2,3,1033920794,'Editors',14,1033920794,'3c160cca19fb135f83bd02d911f04db2',2,1),
(4,3,14,2,3,1301062024,'Administrator User',14,1033920830,'1bb4fe25487f05527efa8bfd394cecc7',2,1),
(1,1,41,2,3,1060695457,'Media',14,1060695457,'a6e35cbcb7cd6ae4b691f3eee30cd262',3,1),
(3,1,42,2,3,1072180330,'Anonymous Users',14,1072180330,'15b256dbea2ae72418ff5facc999e8f9',2,1),
(3,1,42,2,3,1072180330,'Anonymous users',14,1072180330,'15b256dbea2ae72418ff5facc999e8f9',2,1),
(1,1,49,2,3,1080220197,'Images',14,1080220197,'e7ff633c6b8e0fd3531e74c6e712bead',3,1),
(1,1,50,2,3,1080220220,'Files',14,1080220220,'732a5acd01b51a6fe6eab448ad4138a9',3,1),
(1,1,51,2,3,1080220233,'Multimedia',14,1080220233,'09082deb98662a104f325aaa8c4933d3',3,1);
Expand All @@ -117,7 +117,7 @@ VALUES (0,4,1,NULL,NULL,'Ibexa Platform','ezstring',1,'eng-GB',3,0,'ibexa platfo
(30,12,14,0,0,'','ezuser',30,'eng-GB',3,0,'',3),
(0,4,41,0,0,'Media','ezstring',98,'eng-GB',3,0,'',1),
(0,119,41,0,1045487555,'<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<section xmlns=\"http://docbook.org/ns/docbook\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:ezxhtml=\"http://ibexa.co/xmlns/dxp/docbook/xhtml\" xmlns:ezcustom=\"http://ibexa.co/xmlns/dxp/docbook/custom\" version=\"5.0-variant ezpublish-1.0\"/>\n','ezrichtext',99,'eng-GB',3,0,'',1),
(0,6,42,0,0,'Anonymous Users','ezstring',100,'eng-GB',3,0,'anonymous users',1),
(0,6,42,0,0,'Anonymous users','ezstring',100,'eng-GB',3,0,'anonymous users',1),
(0,7,42,0,0,'User group for the anonymous user','ezstring',101,'eng-GB',3,0,'user group for the anonymous user',1),
(0,155,1,NULL,NULL,'Ibexa Platform','ezstring',102,'eng-GB',3,0,'ibexa platform',9),
(0,155,41,0,0,'','ezstring',103,'eng-GB',3,0,'',1),
Expand Down Expand Up @@ -149,7 +149,7 @@ VALUES ('eng-GB',9,1,2,'Ibexa Platform','eng-GB'),
('eng-GB',1,13,3,'Editors','eng-GB'),
('eng-GB',3,14,3,'Administrator User','eng-GB'),
('eng-GB',1,41,3,'Media','eng-GB'),
('eng-GB',1,42,3,'Anonymous Users','eng-GB'),
('eng-GB',1,42,3,'Anonymous users','eng-GB'),
('eng-GB',1,49,3,'Images','eng-GB'),
('eng-GB',1,50,3,'Files','eng-GB'),
('eng-GB',1,51,3,'Multimedia','eng-GB');
Expand Down
6 changes: 3 additions & 3 deletions data/postgresql/cleandata.sql
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ VALUES (1,9,1,2,3,1448889046,'Ibexa Platform',14,1448889046,'9459d3c29e15006e451
(3,1,13,2,3,1033920794,'Editors',14,1033920794,'3c160cca19fb135f83bd02d911f04db2',2,1),
(4,3,14,2,3,1301062024,'Administrator User',14,1033920830,'1bb4fe25487f05527efa8bfd394cecc7',2,1),
(1,1,41,2,3,1060695457,'Media',14,1060695457,'a6e35cbcb7cd6ae4b691f3eee30cd262',3,1),
(3,1,42,2,3,1072180330,'Anonymous Users',14,1072180330,'15b256dbea2ae72418ff5facc999e8f9',2,1),
(3,1,42,2,3,1072180330,'Anonymous users',14,1072180330,'15b256dbea2ae72418ff5facc999e8f9',2,1),
(1,1,49,2,3,1080220197,'Images',14,1080220197,'e7ff633c6b8e0fd3531e74c6e712bead',3,1),
(1,1,50,2,3,1080220220,'Files',14,1080220220,'732a5acd01b51a6fe6eab448ad4138a9',3,1),
(1,1,51,2,3,1080220233,'Multimedia',14,1080220233,'09082deb98662a104f325aaa8c4933d3',3,1);
Expand All @@ -117,7 +117,7 @@ VALUES (0,4,1,NULL,NULL,'Ibexa Platform','ezstring',1,'eng-GB',3,0,'ibexa platfo
(30,12,14,0,0,'','ezuser',30,'eng-GB',3,0,'',3),
(0,4,41,0,0,'Media','ezstring',98,'eng-GB',3,0,'',1),
(0,119,41,0,1045487555,E'<?xml version="1.0" encoding="UTF-8"?>\n<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" xmlns:ezcustom="http://ibexa.co/xmlns/dxp/docbook/custom" version="5.0-variant ezpublish-1.0"/>\n','ezrichtext',99,'eng-GB',3,0,'',1),
(0,6,42,0,0,'Anonymous Users','ezstring',100,'eng-GB',3,0,'anonymous users',1),
(0,6,42,0,0,'Anonymous users','ezstring',100,'eng-GB',3,0,'anonymous users',1),
(0,7,42,0,0,'User group for the anonymous user','ezstring',101,'eng-GB',3,0,'user group for the anonymous user',1),
(0,155,1,NULL,NULL,'Ibexa Platform','ezstring',102,'eng-GB',3,0,'ibexa platform',9),
(0,155,41,0,0,'','ezstring',103,'eng-GB',3,0,'',1),
Expand Down Expand Up @@ -149,7 +149,7 @@ VALUES ('eng-GB',9,1,2,'Ibexa Platform','eng-GB'),
('eng-GB',1,13,3,'Editors','eng-GB'),
('eng-GB',3,14,3,'Administrator User','eng-GB'),
('eng-GB',1,41,3,'Media','eng-GB'),
('eng-GB',1,42,3,'Anonymous Users','eng-GB'),
('eng-GB',1,42,3,'Anonymous users','eng-GB'),
('eng-GB',1,49,3,'Images','eng-GB'),
('eng-GB',1,50,3,'Files','eng-GB'),
('eng-GB',1,51,3,'Multimedia','eng-GB');
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Core/Features/Context/UserContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ public function assertUserWithNameDoesntExistInGroup($username, $parentGroup)
* Checks that user ':username' does not exist in any of the provided groups. Example:
* | parentGroup |
* | Partners |
* | Anonymous Users |
* | Anonymous users |
* | Editors |
* | Administrator users |
*/
Expand Down
28 changes: 14 additions & 14 deletions src/bundle/Core/Resources/translations/forms.en.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<note>key: role.policy.content.all_functions</note>
</trans-unit>
<trans-unit id="e050709df5ae56b1e9168038182f4c52221ffab9" resname="role.policy.content.cleantrash">
<source>Content / Cleantrash</source>
<target>Content / Cleantrash</target>
<source>Content / Clean trash</source>
<target>Content / Clean trash</target>
<note>key: role.policy.content.cleantrash</note>
</trans-unit>
<trans-unit id="597c25abf1e2d91e50b82d2699f8b85f68c9f305" resname="role.policy.content.create">
Expand Down Expand Up @@ -72,8 +72,8 @@
<note>key: role.policy.content.manage_locations</note>
</trans-unit>
<trans-unit id="0c943bab11cd582ac439e67289d4efd86d8599e7" resname="role.policy.content.pendinglist">
<source>Content / Pendinglist</source>
<target>Content / Pendinglist</target>
<source>Content / Pending list</source>
<target>Content / Pending list</target>
<note>key: role.policy.content.pendinglist</note>
</trans-unit>
<trans-unit id="6f595f392af03d8b2e46449d527530e3e1f8eb94" resname="role.policy.content.publish">
Expand All @@ -97,8 +97,8 @@
<note>key: role.policy.content.restore</note>
</trans-unit>
<trans-unit id="7ad7cd36512ca57f6d6cb31b7de0740d4754961c" resname="role.policy.content.reverserelatedlist">
<source>Content / Reverserelatedlist</source>
<target>Content / Reverserelatedlist</target>
<source>Content / Reverse related list</source>
<target>Content / Reverse related list</target>
<note>key: role.policy.content.reverserelatedlist</note>
</trans-unit>
<trans-unit id="c9a69e432793ed3480c2252f3ca1b4e6564e853e" resname="role.policy.content.translate">
Expand All @@ -117,18 +117,18 @@
<note>key: role.policy.content.unlock</note>
</trans-unit>
<trans-unit id="79ffa7a2f2449d08574ef7c5b1f447b439db97b2" resname="role.policy.content.urltranslator">
<source>Content / Urltranslator</source>
<target>Content / Urltranslator</target>
<source>Content / Url translator</source>
<target>Content / Url translator</target>
<note>key: role.policy.content.urltranslator</note>
</trans-unit>
<trans-unit id="0a641d7ab31b48b6b87a9d2cd4763afae237219d" resname="role.policy.content.versionread">
<source>Content / Versionread</source>
<target>Content / Versionread</target>
<source>Content / Version read</source>
<target>Content / Version read</target>
<note>key: role.policy.content.versionread</note>
</trans-unit>
<trans-unit id="4e615fcc14a6f5b70fb3e7957518c27bc508d92f" resname="role.policy.content.versionremove">
<source>Content / Versionremove</source>
<target>Content / Versionremove</target>
<source>Content / Version remove</source>
<target>Content / Version remove</target>
<note>key: role.policy.content.versionremove</note>
</trans-unit>
<trans-unit id="6ff0bcc1b70d0dbde113af7649393f667612cace" resname="role.policy.role">
Expand Down Expand Up @@ -307,8 +307,8 @@
<note>key: role.policy.user.register</note>
</trans-unit>
<trans-unit id="106b2a3fa38c660c838efe1905c904ce689a2d75" resname="role.policy.user.selfedit">
<source>User / Selfedit</source>
<target>User / Selfedit</target>
<source>User / Self edit</source>
<target>User / Self edit</target>
<note>key: role.policy.user.selfedit</note>
</trans-unit>
<trans-unit id="caaf0c6eabe978a17eefcedf501b2506383a8267" resname="role.policy.user.update">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@
<target>The User does not have the '%function%' '%module%' permission with: %with%</target>
<note>key: The User does not have the '%function%' '%module%' permission with: %with%</note>
</trans-unit>
<trans-unit id="3b2e044f9c9821aef27834972d90f59f28b1a0b4" resname="Token '%tokenType%:%token%' expired on '%when%'">
<source>Token '%tokenType%:%token%' expired on '%when%'</source>
<target>Token '%tokenType%:%token%' expired on '%when%'</target>
<note>key: Token '%tokenType%:%token%' expired on '%when%'</note>
</trans-unit>
<trans-unit id="27a77deaffe8551b169928675adc64ae8450937f" resname="User &quot;%login%&quot; already exists">
<source>User "%login%" already exists</source>
<target>User "%login%" already exists</target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static function getTranslationMessages(): array
(new Message('role.policy.content.all_functions', self::TRANSLATION_DOMAIN))
->setDesc('Content / All functions'),
(new Message('role.policy.content.cleantrash', self::TRANSLATION_DOMAIN))
->setDesc('Content / Cleantrash'),
->setDesc('Content / Clean trash'),
(new Message('role.policy.content.create', self::TRANSLATION_DOMAIN))
->setDesc('Content / Create'),
(new Message('role.policy.content.diff', self::TRANSLATION_DOMAIN))
Expand All @@ -38,7 +38,7 @@ public static function getTranslationMessages(): array
(new Message('role.policy.content.manage_locations', self::TRANSLATION_DOMAIN))
->setDesc('Content / Manage locations'),
(new Message('role.policy.content.pendinglist', self::TRANSLATION_DOMAIN))
->setDesc('Content / Pendinglist'),
->setDesc('Content / Pending list'),
(new Message('role.policy.content.publish', self::TRANSLATION_DOMAIN))
->setDesc('Content / Publish'),
(new Message('role.policy.content.read', self::TRANSLATION_DOMAIN))
Expand All @@ -48,19 +48,19 @@ public static function getTranslationMessages(): array
(new Message('role.policy.content.restore', self::TRANSLATION_DOMAIN))
->setDesc('Content / Restore'),
(new Message('role.policy.content.reverserelatedlist', self::TRANSLATION_DOMAIN))
->setDesc('Content / Reverserelatedlist'),
->setDesc('Content / Reverse related list'),
(new Message('role.policy.content.translate', self::TRANSLATION_DOMAIN))
->setDesc('Content / Translate'),
(new Message('role.policy.content.translations', self::TRANSLATION_DOMAIN))
->setDesc('Content / Translations'),
(new Message('role.policy.content.unlock', self::TRANSLATION_DOMAIN))
->setDesc('Content / Unlock'),
(new Message('role.policy.content.urltranslator', self::TRANSLATION_DOMAIN))
->setDesc('Content / Urltranslator'),
->setDesc('Content / Url translator'),
(new Message('role.policy.content.versionread', self::TRANSLATION_DOMAIN))
->setDesc('Content / Versionread'),
->setDesc('Content / Version read'),
(new Message('role.policy.content.versionremove', self::TRANSLATION_DOMAIN))
->setDesc('Content / Versionremove'),
->setDesc('Content / Version remove'),

(new Message('role.policy.class', self::TRANSLATION_DOMAIN))
->setDesc('Content Type'),
Expand Down Expand Up @@ -138,7 +138,7 @@ public static function getTranslationMessages(): array
(new Message('role.policy.user.register', self::TRANSLATION_DOMAIN))
->setDesc('User / Register'),
(new Message('role.policy.user.selfedit', self::TRANSLATION_DOMAIN))
->setDesc('User / Selfedit'),
->setDesc('User / Self edit'),

(new Message('role.policy.user', self::TRANSLATION_DOMAIN))
->setDesc('User'),
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/Core/Repository/SearchServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ public function getFilterContentSearches()
'filter' => new Criterion\Field(
'name',
Criterion\Operator::IN,
['Members', 'Anonymous Users']
['Members', 'Anonymous users']
),
'sortClauses' => [new SortClause\ContentId()],
],
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/Core/Repository/UserServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2304,7 +2304,7 @@ public function testUnAssignUserFromUserGroup()
$anonymousGroupId = $this->generateId('group', 42);

/* BEGIN: Use Case */
// $anonymousGroupId is the ID of the "Anonymous Users" group in an Ibexa
// $anonymousGroupId is the ID of the "Anonymous users" group in an Ibexa
// Publish demo installation

$user = $this->createUserVersion1();
Expand All @@ -2321,14 +2321,14 @@ public function testUnAssignUserFromUserGroup()
$userService->loadUserGroup($editorsGroupId)
);

// This array will contain "Anonymous Users"
// This array will contain "Anonymous users"
$userGroupNames = [];
foreach ($userService->loadUserGroupsOfUser($user) as $userGroup) {
$userGroupNames[] = $userGroup->getFieldValue('name');
}
/* END: Use Case */

$this->assertEquals(['Anonymous Users'], $userGroupNames);
$this->assertEquals(['Anonymous users'], $userGroupNames);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
2 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
1 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
6 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
5 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
[
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
[
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
1 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
7 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => 0.0,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
6 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
3 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
[
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
6 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
6 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
10 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
10 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
4 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
6 => SearchHit::__set_state([
'valueObject' => [
'id' => 42,
'title' => 'Anonymous Users',
'title' => 'Anonymous users',
],
'score' => null,
'index' => null,
Expand Down
Loading