Skip to content

[4.0] Make transitions translateable #35457

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

Merged
wilsonge merged 7 commits into from
Sep 11, 2021
Merged

[4.0] Make transitions translateable #35457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d112583
Make transitions translateable
bembelimen Sep 1, 2021
85d982e
Fix update files
bembelimen Sep 1, 2021
013138c
Revert "Fix update files"
bembelimen Sep 4, 2021
e99ac9e
Update existing strings in the database of workflow transitions to ma…
bembelimen Sep 4, 2021
c091084
Add empty line at file
bembelimen Sep 4, 2021
c80f541
Rename update SQL
richard67 Sep 11, 2021
556ec2d
Merge branch '4.0-dev' into 4.0/workflow-translation
richard67 Sep 11, 2021
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
7 changes: 7 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/4.0.3-2021-09-05.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
UPDATE `#__workflow_transitions` SET `title` = 'PUBLISH' WHERE `title`= 'Publish';
UPDATE `#__workflow_transitions` SET `title` = 'UNPUBLISH' WHERE `title`= 'Unpublish';
UPDATE `#__workflow_transitions` SET `title` = 'TRASH' WHERE `title`= 'Trash';
UPDATE `#__workflow_transitions` SET `title` = 'ARCHIVE' WHERE `title`= 'Archive';
UPDATE `#__workflow_transitions` SET `title` = 'FEATURE' WHERE `title`= 'Feature';
UPDATE `#__workflow_transitions` SET `title` = 'UNFEATURE' WHERE `title`= 'Unfeature';
UPDATE `#__workflow_transitions` SET `title` = 'PUBLISH_AND_FEATURE' WHERE `title`= 'Publish & Feature';
7 changes: 7 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/4.0.3-2021-09-05.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
UPDATE "#__workflow_transitions" SET "title" = 'PUBLISH' WHERE "title"= 'Publish';
UPDATE "#__workflow_transitions" SET "title" = 'UNPUBLISH' WHERE "title"= 'Unpublish';
UPDATE "#__workflow_transitions" SET "title" = 'TRASH' WHERE "title"= 'Trash';
UPDATE "#__workflow_transitions" SET "title" = 'ARCHIVE' WHERE "title"= 'Archive';
UPDATE "#__workflow_transitions" SET "title" = 'FEATURE' WHERE "title"= 'Feature';
UPDATE "#__workflow_transitions" SET "title" = 'UNFEATURE' WHERE "title"= 'Unfeature';
UPDATE "#__workflow_transitions" SET "title" = 'PUBLISH_AND_FEATURE' WHERE "title"= 'Publish & Feature';
3 changes: 3 additions & 0 deletions administrator/components/com_content/src/Model/ArticlesModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Factory;
use Joomla\CMS\Language\Associations;
use Joomla\CMS\Language\Text;
use Joomla\CMS\MVC\Model\ListModel;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Table\Table;
Expand Down Expand Up @@ -664,6 +665,8 @@ public function getTransitions()
{
unset($transitions[$key]);
}

$transitions[$key]['text'] = Text::_($transition['text']);
}

$this->cache[$store] = $transitions;
Expand Down
3 changes: 3 additions & 0 deletions administrator/language/en-GB/joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,8 +1139,11 @@ JTABLE_OPTIONS_ORDERING="Order by:"
; States assets translations
ARCHIVE="Archive"
ARCHIVED="Archived"
FEATURE="Feature"
UNFEATURE="Unfeature"
PUBLISH="Publish"
PUBLISHED="Published"
PUBLISH_AND_FEATURE="Publish & Feature"
TRASH="Trash"
TRASHED="Trashed"
UNPUBLISH="Unpublish"
Expand Down
14 changes: 7 additions & 7 deletions installation/sql/mysql/base.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,10 +1161,10 @@ CREATE TABLE IF NOT EXISTS `#__workflow_transitions` (
--

INSERT INTO `#__workflow_transitions` (`id`, `asset_id`, `published`, `ordering`, `workflow_id`, `title`, `description`, `from_stage_id`, `to_stage_id`, `options`) VALUES
(1, 58, 1, 1, 1, 'Unpublish', '', -1, 1, '{"publishing":"0"}'),
(2, 59, 1, 2, 1, 'Publish', '', -1, 1, '{"publishing":"1"}'),
(3, 60, 1, 3, 1, 'Trash', '', -1, 1, '{"publishing":"-2"}'),
(4, 61, 1, 4, 1, 'Archive', '', -1, 1, '{"publishing":"2"}'),
(5, 62, 1, 5, 1, 'Feature', '', -1, 1, '{"featuring":"1"}'),
(6, 63, 1, 6, 1, 'Unfeature', '', -1, 1, '{"featuring":"0"}'),
(7, 64, 1, 7, 1, 'Publish & Feature', '', -1, 1, '{"publishing":"1","featuring":"1"}');
(1, 58, 1, 1, 1, 'UNPUBLISH', '', -1, 1, '{"publishing":"0"}'),
(2, 59, 1, 2, 1, 'PUBLISH', '', -1, 1, '{"publishing":"1"}'),
(3, 60, 1, 3, 1, 'TRASH', '', -1, 1, '{"publishing":"-2"}'),
(4, 61, 1, 4, 1, 'ARCHIVE', '', -1, 1, '{"publishing":"2"}'),
(5, 62, 1, 5, 1, 'FEATURE', '', -1, 1, '{"featuring":"1"}'),
(6, 63, 1, 6, 1, 'UNFEATURE', '', -1, 1, '{"featuring":"0"}'),
(7, 64, 1, 7, 1, 'PUBLISH_AND_FEATURE', '', -1, 1, '{"publishing":"1","featuring":"1"}');
14 changes: 7 additions & 7 deletions installation/sql/postgresql/base.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,12 +1180,12 @@ CREATE INDEX "#__workflow_transitions_idx_workflow_id" ON "#__workflow_transitio
CREATE INDEX "#__workflow_transitions_idx_checked_out" ON "#__workflow_transitions" ("checked_out");

INSERT INTO "#__workflow_transitions" ("id", "asset_id", "published", "ordering", "workflow_id", "title", "description", "from_stage_id", "to_stage_id", "options") VALUES
(1, 58, 1, 1, 1, 'Unpublish', '', -1, 1, '{"publishing":"0"}'),
(2, 59, 1, 2, 1, 'Publish', '', -1, 1, '{"publishing":"1"}'),
(3, 60, 1, 3, 1, 'Trash', '', -1, 1, '{"publishing":"-2"}'),
(4, 61, 1, 4, 1, 'Archive', '', -1, 1, '{"publishing":"2"}'),
(5, 62, 1, 5, 1, 'Feature', '', -1, 1, '{"featuring":"1"}'),
(6, 63, 1, 6, 1, 'Unfeature', '', -1, 1, '{"featuring":"0"}'),
(7, 64, 1, 7, 1, 'Publish & Feature', '', -1, 1, '{"publishing":"1","featuring":"1"}');
(1, 58, 1, 1, 1, 'UNPUBLISH', '', -1, 1, '{"publishing":"0"}'),
(2, 59, 1, 2, 1, 'PUBLISH', '', -1, 1, '{"publishing":"1"}'),
(3, 60, 1, 3, 1, 'TRASH', '', -1, 1, '{"publishing":"-2"}'),
(4, 61, 1, 4, 1, 'ARCHIVE', '', -1, 1, '{"publishing":"2"}'),
(5, 62, 1, 5, 1, 'FEATURE', '', -1, 1, '{"featuring":"1"}'),
(6, 63, 1, 6, 1, 'UNFEATURE', '', -1, 1, '{"featuring":"0"}'),
(7, 64, 1, 7, 1, 'PUBLISH_AND_FEATURE', '', -1, 1, '{"publishing":"1","featuring":"1"}');

SELECT setval('#__workflow_transitions_id_seq', 8, false);
13 changes: 13 additions & 0 deletions language/en-GB/joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,3 +507,16 @@ JTABLE_OPTIONS_ORDERING="Order by:"
JGLOBAL_READ_MORE="Read more ..."
JGLOBAL_READ_MORE_TITLE="Read more: %s"
JGLOBAL_REGISTER_TO_READ_MORE="Register to read more ..."

; States assets translations
ARCHIVE="Archive"
ARCHIVED="Archived"
FEATURE="Feature"
UNFEATURE="Unfeature"
PUBLISH="Publish"
PUBLISHED="Published"
PUBLISH_AND_FEATURE="Publish & Feature"
TRASH="Trash"
TRASHED="Trashed"
UNPUBLISH="Unpublish"
UNPUBLISHED="Unpublished"
6 changes: 4 additions & 2 deletions libraries/src/Form/Field/TransitionField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ function ($item) use ($user, $component)
}
);

// Sort by transition name
$items = ArrayHelper::sortObjects($items, 'value', 1, true, true);
foreach ($items as $item)
{
$item->text = Text::_($item->text);
}
}

// Get workflow stage title
Expand Down