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

Improve linking between baseline and working copy #557

Merged
merged 5 commits into from Nov 11, 2019

Conversation

@Nachtalb
Copy link
Member

Nachtalb commented Nov 4, 2019

  • Add a link from working copy to baseline
  • Instead of showing the full URL of the working copy on the baseline, show an a tag with linking to the working copy

DE working copy ==> baseline
image

EN baseline ==> working copy
image

Nachtalb added 3 commits Nov 4, 2019
@Nachtalb Nachtalb requested a review from 4teamwork/plone Nov 4, 2019
@Nachtalb Nachtalb self-assigned this Nov 4, 2019
@jone

This comment has been minimized.

Copy link
Member

jone commented Nov 5, 2019

@Nachtalb tests are failing here

@jone
jone approved these changes Nov 5, 2019
msgstr "Youtube Format: http(s)://youtu.be/VIDEO_ID<br/>Youtube (no-cookie) Format: https://www.youtube-nocookie.com/embed/VIDEO_ID<br/>Vimeo Format: http(s)://vimeo.com/(channels/groups)/VIDEO_ID"
#: ./ftw/simplelayout/contenttypes/contents/videoblock.py:50
msgid "Youtube format: http(s)://youtu.be/VIDEO_ID<br/>Youtube (no-cookie) format: https://www.youtube-nocookie.com/embed/VIDEO_ID<br/>Vimeo format: http(s)://vimeo.com/(channels/groups)/VIDEO_ID"
msgstr ""

This comment has been minimized.

Copy link
@jone

jone Nov 5, 2019

Member

Did you remove the translation on purpose?

This comment has been minimized.

Copy link
@Nachtalb

Nachtalb Nov 6, 2019

Author Member

No, I just ran i18n-build and committed the changes in the locals. But maybe I accidentally deleted this. I'll check it out.

This comment has been minimized.

Copy link
@Nachtalb

Nachtalb Nov 6, 2019

Author Member

Ahh, the i18n-build updated the msgid and removed the msgstrs because they are the same.

This comment has been minimized.

Copy link
@jone

jone Nov 6, 2019

Member

If the msgid has changed, it is a new message, thus empty. Can you add the missing message string here?

Copy link
Member

jone left a comment

tests

@Nachtalb Nachtalb requested a review from jone Nov 6, 2019
Copy link
Member

jone left a comment

translation

@Nachtalb

This comment has been minimized.

Copy link
Member Author

Nachtalb commented Nov 6, 2019

@jone I readded the translation

@jone
jone approved these changes Nov 8, 2019
@Nachtalb Nachtalb merged commit 3163c6f into 1.x Nov 11, 2019
2 checks passed
2 checks passed
CI Governor: test-javascript.cfg Task #464697 succeeded
Details
CI Governor: test-plone-4.3.x.cfg Task #464698 succeeded
Details
@Nachtalb Nachtalb deleted the ne/improve-linking-between-baseline-and-working_copy branch Nov 11, 2019
Nachtalb added a commit that referenced this pull request Nov 11, 2019
…eline-and-working_copy

Improve linking between baseline and working copy
Nachtalb added a commit that referenced this pull request Nov 11, 2019
…en-baseline-working_copy

Port #557 improved linking between baseline working copy to 2.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.