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.

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

Jump to bottom

Nested content config: Add help translations #6909

Merged
merged 5 commits into from
Jan 14, 2020
Merged

Nested content config: Add help translations #6909

merged 5 commits into from
Jan 14, 2020

Conversation

BatJan
Copy link
Contributor

@BatJan BatJan commented Oct 27, 2019

Prerequisites

  • I have added steps to test this contribution in the description below

Description

I added some missing translations when one hits the "?" icon in the nested config section.

poornimanayar
poornimanayar approved these changes Oct 29, 2019
View reviewed changes
Copy link
Contributor

@poornimanayar poornimanayar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi there again @BatJan,

All working well!

Poornima

@poornimanayar
Copy link
Contributor

@BatJan ,

can you fix the merge conflicts against v8/contrib please?

kjac
kjac requested changes Jan 6, 2020
View reviewed changes
Copy link
Contributor

@kjac kjac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BatJan I think you accidentally used the same localization key (content_nestedContentTemplateHelpTextPart1) twice in the view changes instead of using both of the added localization keys. Could you please fix?

@kjac kjac changed the base branch from v8/dev to v8/contrib January 14, 2020 15:07
@kjac
Copy link
Contributor

kjac commented Jan 14, 2020

Indeed it was an error.... it looked like this:

image

I have merged from v8/contrib and corrected the error.

@kjac kjac merged commit 9847b99 into umbraco:v8/contrib Jan 14, 2020
@kjac
Copy link
Contributor

kjac commented Jan 14, 2020

All merged. Thanks again, @BatJan 🎉

@kjac kjac added community/pr hacktoberfest/contrib-2019 release/8.6.0 release/no-notes This is too small to add to the release notes or fixed after a beta/RC type/feature labels Jan 14, 2020
@nul800sebastiaan nul800sebastiaan removed the release/no-notes This is too small to add to the release notes or fixed after a beta/RC label Mar 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjac kjac kjac approved these changes

@poornimanayar poornimanayar poornimanayar approved these changes

Assignees
No one assigned
Labels
community/pr hacktoberfest/contrib-2019 release/8.6.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BatJan @poornimanayar @kjac @nul800sebastiaan