[4.0] Translate stages via language files #21506

bembelimen · 2018-08-09T19:14:42Z

Pull Request for Issue #21476 (comment).

Summary of Changes

Now one can use languages constants to have multilingual states

Testing Instructions

Create a state called "JPUBLISHED" and check it everywhere in the system (state list, article edit form, article list, transition edit form, ...)

Expected result

The language constant will be translated

Actual result

No translation at all

…-states-via-language-files # Conflicts: # administrator/components/com_workflow/tmpl/states/default.php # administrator/components/com_workflow/tmpl/transitions/default.php

brianteeman · 2018-08-09T19:17:48Z

administrator/components/com_workflow/tmpl/states/default.php

 defined('_JEXEC') or die;

-use Joomla\CMS\Language\Text;
+use Joomla\CMS\Factory;


Factory already exists a few lines down. Adding it twice will fail.

Strange, I thought I solved it with the conflict, thanks for the pointer!

infograf768 · 2018-08-10T06:10:51Z

administrator/components/com_workflow/tmpl/states/default.php

 									<th scope="row">
 										<?php if ($canEdit) : ?>
 											<?php $editIcon = '<span class="fa fa-pencil-square mr-2" aria-hidden="true"></span>'; ?>
 											<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape(addslashes($item->title)); ?>">


need also a Text:: for the title
escape(addslashes($item->title)) to escape(addslashes(Text::_($item->title)))

infograf768 · 2018-08-10T07:21:17Z

Also:
same corrections should be done for Transitions
Using maybe the existing strings
JTOOLBAR_UNPUBLISH, etc. or new specific COM_WORKFLOW strings

To obtain (here for French. just modified for unpublished)

In both cases Modifier Non Publié for the title is not very nice phrasing. Maybe add a : between.

…-states-via-language-files

bembelimen · 2018-08-10T10:40:51Z

@infograf768 I'll create a new PR for this, but thanks for the suggestion!

infograf768 · 2018-08-13T15:36:31Z

Can conflicts be solved?
And obviously adapted to the new stage name instead of state

bembelimen · 2018-08-13T15:37:59Z

Sure, I waited for #21566

infograf768 · 2018-08-13T15:39:35Z

I think that also Joomla! Default should be a string btw.

…-states-via-language-files # Conflicts: # administrator/components/com_content/tmpl/articles/default.php # administrator/components/com_workflow/forms/transition.xml # administrator/components/com_workflow/tmpl/transitions/default.php # installation/sql/mysql/joomla.sql # libraries/src/Form/Field/TransitionField.php # libraries/src/Form/Field/WorkflowStageField.php

infograf768 · 2018-08-14T10:23:35Z

libraries/src/Form/Field/WorkflowStageField.php

 			}

-			$workflowStages[$workflowStageKey][] = HTMLHelper::_('select.option', $stage->workflow_stage_id, $stage->workflow_stage_title);
+			$workflowStates[$workflowStateKey][] = HTMLHelper::_('select.option', $state->workflow_stage_id, Text::_($state->workflow_stage_title));


$state or $stage?

Should be $stage

infograf768 · 2018-08-14T10:24:06Z

Also conflict with new file name.

infograf768 · 2018-08-14T10:30:24Z

And I foresee issues with #21520 as the sql does not use string constants.

Joomv · 2018-08-17T20:31:39Z

libraries/src/Form/Field/TransitionField.php

 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\Workflow\Workflow;
+use Joomla\CMS\Form\Field\ListField;


You don't need to import this as it's in the same namespace

Joomv · 2018-08-17T20:32:53Z

administrator/components/com_workflow/tmpl/stages/default.php

 $user      = Factory::getUser();
 $userId    = $user->id;

+$lang		= Factory::getLanguage();


You aren't using this property

Joomv

Also requires conflicts fixing as well as comments

Deleted useless hashtag here... (JM)

…-states-via-language-files # Conflicts: # installation/sql/mysql/joomla.sql

infograf768 · 2018-08-23T15:32:31Z

Missing Text:: line 118 of tmpl/transitions/default.php to get
<a href="<?php echo $edit; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo Text::_($this->escape(addslashes($item->title))); ?>">

Otherwise good first step for me

Fedik · 2018-08-23T15:38:21Z

administrator/components/com_content/tmpl/articles/default.php

 										<?php endif; ?>
 										</div>
-										<div class="mr-auto"><?php echo $this->escape($item->stage_title); ?></div>
+										<div class="mr-auto"><?php echo Text::_($this->escape($item->stage_title)); ?></div>


I think correct would be do escape() after translation, not before 😉

You're right, thx

ghost · 2018-08-24T05:15:53Z

I have tested this item ✅ successfully on 9d0ba73

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/21506.}

ghost · 2018-08-24T05:16:09Z

Ready to Commit after two successful tests.

alikon · 2018-08-24T05:17:07Z

https://github.com/joomla/joomla-cms/pull/21506/files#diff-135c6f58583408312a709459b19594c7
it lacks the upgrade path and obviously postgresql

done in bembelimen#22

alikon · 2018-08-24T05:19:21Z

question:
should we do the same on the #__workflow_transitions ?

ghost · 2018-08-24T05:20:15Z

Status back on "Pending".

infograf768 · 2018-08-24T05:27:10Z

@alikon
I thought we could do that after the follow-up on this.
I explain:

We also need to translate the transitions. I.e. enter in db some string for the actions
Unpublish, Publish, etc.
Then translate the titles in transitions Manager with something like

										<?php echo $editIcon; ?><?php echo Text::_($item->title); ?>
											</a>
										<?php else: ?>
											<?php echo Text::_($item->title); ?>
										<?php endif; ?>

so basically we would have something like

INSERT INTO `#__workflow_transitions` (`id`, `asset_id`, `published`, `ordering`, `workflow_id`, `title`, `description`, `from_stage_id`, `to_stage_id`) VALUES
(1, 0, 1, 1, 1, 'JUNPUBLISH', '', -1, 1),
(2, 0, 1, 2, 1, 'JPUBLISH', '', -1, 2),
(3, 0, 1, 3, 1, 'JTRASH', '', -1, 3),
(4, 0, 1, 4, 1, 'JARCHIVE', '', -1, 4);

And add the new lang strings.
Is it worth changing now db or do it in the next PR?

infograf768 · 2018-08-24T05:27:59Z

Or do it in this PR?

alikon · 2018-08-24T05:56:36Z

Yes we can do in a next PR, Il ven 24 ago 2018, 07:28 infograf768 <[email protected]> ha scritto:

…

Or do it in this PR? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#21506 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AALFsUncU2NFikLUdWpf3BuGOLrdUC2Gks5uT47fgaJpZM4V2Qbn> .

infograf768 · 2018-08-24T05:59:11Z

@bembelimen
Your decision. If you do transitions in next PR, let's not forget @alikon necessary updated patch.

postgresql & update

bembelimen · 2018-08-24T22:50:13Z

Thanks @alikon for the PR

I would do the translation in a new PR, so we have small code changes.

infograf768 · 2018-08-25T09:05:33Z

Drone error is unrelated to this PR.

@wilsonge Please merge.

infograf768 · 2018-08-25T09:06:01Z

rtc

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/21506.}

brianteeman · 2018-08-25T09:08:46Z

Whoever merges can you directly fix the drone error

wilsonge · 2018-08-31T20:03:03Z

Thanks guys!

bembelimen added 2 commits August 9, 2018 21:05

Make states translatable

3940166

Merge branch '4.0-dev' of github.com:joomla/joomla-cms into translate…

0af8bae

…-states-via-language-files # Conflicts: # administrator/components/com_workflow/tmpl/states/default.php # administrator/components/com_workflow/tmpl/transitions/default.php

joomla-cms-bot added the PR-4.0-dev label Aug 9, 2018

bembelimen changed the title ~~Translate states via language files~~ [4.0] Translate states via language files Aug 9, 2018

brianteeman reviewed Aug 9, 2018

View reviewed changes

Fix double factory

e827c3e

infograf768 reviewed Aug 10, 2018

View reviewed changes

bembelimen added 2 commits August 10, 2018 12:34

Merge branch '4.0-dev' of github.com:joomla/joomla-cms into translate…

ddf6681

…-states-via-language-files

Fix missing translations Thanks @infograf768

6f0199a

brianteeman added the New Feature Workflow label Aug 11, 2018

bembelimen changed the title ~~[4.0] Translate states via language files~~ [4.0] Translate stages via language files Aug 13, 2018

infograf768 reviewed Aug 14, 2018

View reviewed changes

Joomv reviewed Aug 17, 2018

View reviewed changes

Joomv suggested changes Aug 17, 2018

View reviewed changes

bembelimen added 3 commits August 17, 2018 23:48

Merge branch '4.0-dev' of github.com:joomla/joomla-cms into translate…

422c1df

…-states-via-language-files # Conflicts: # installation/sql/mysql/joomla.sql

Clean up variables + use

9da4a31

state => stage

ebfea2b

infograf768 mentioned this pull request Aug 23, 2018

[4.0] Workflows not multilingual #21825

Closed

Fedik reviewed Aug 23, 2018

View reviewed changes

Merge branch '4.0-dev' into translate-states-via-language-files

8519f9f

alikon added 2 commits August 24, 2018 07:12

postgresql & update

d0cb812

update mysql

f984b17

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Aug 24, 2018

update postgresql

59ae2a2

alikon mentioned this pull request Aug 24, 2018

postgresql & update bembelimen/joomla-cms#22

Merged

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 24, 2018

bembelimen added 2 commits August 25, 2018 00:48

Merge branch '4.0-dev' into translate-states-via-language-files

796e7f9

Merge pull request #22 from alikon/patch-108

228e057

postgresql & update

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Aug 25, 2018

Merge branch '4.0-dev' into translate-states-via-language-files

f2038ac

wilsonge merged commit 4314e47 into joomla:4.0-dev Aug 31, 2018

wilsonge added this to the Joomla 4.0 milestone Aug 31, 2018

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Aug 31, 2018

This was referenced Aug 31, 2018

[4.0] Translate workflows via language file #21939

Merged

[4.0] Make the new stage from a new workflow translateable #21940

Closed

bembelimen deleted the translate-states-via-language-files branch September 10, 2018 13:50

Uh oh!

[4.0] Translate stages via language files #21506

[4.0] Translate stages via language files #21506

Uh oh!

Conversation

bembelimen commented Aug 9, 2018

Summary of Changes

Testing Instructions

Expected result

Actual result

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

infograf768 commented Aug 10, 2018

Uh oh!

bembelimen commented Aug 10, 2018

Uh oh!

infograf768 commented Aug 13, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bembelimen commented Aug 13, 2018

Uh oh!

infograf768 commented Aug 13, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bembelimen Aug 17, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

infograf768 commented Aug 14, 2018

Uh oh!

infograf768 commented Aug 14, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Joomv left a comment • edited by infograf768 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

infograf768 commented Aug 23, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost commented Aug 24, 2018

Uh oh!

ghost commented Aug 24, 2018

Uh oh!

alikon commented Aug 24, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alikon commented Aug 24, 2018

Uh oh!

ghost commented Aug 24, 2018

Uh oh!

infograf768 commented Aug 24, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

infograf768 commented Aug 24, 2018

Uh oh!

alikon commented Aug 24, 2018 via email

Uh oh!

infograf768 commented Aug 24, 2018

Uh oh!

bembelimen commented Aug 24, 2018

Uh oh!

infograf768 commented Aug 25, 2018

Uh oh!

infograf768 commented Aug 25, 2018

infograf768 commented Aug 13, 2018 •

edited

Loading

bembelimen Aug 17, 2018 •

edited

Loading

Joomv left a comment •

edited by infograf768

Loading

infograf768 commented Aug 23, 2018 •

edited

Loading

alikon commented Aug 24, 2018 •

edited

Loading

infograf768 commented Aug 24, 2018 •

edited

Loading