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

EZP-29249: Changed texts in relation fields #1183

Merged
merged 2 commits into from
Jan 16, 2020

Conversation

GrabowskiM
Copy link
Contributor

@GrabowskiM GrabowskiM commented Jan 8, 2020

Question Answer
Tickets https://jira.ez.no/browse/EZP-29249
Bug fix? yes
New feature? no
BC breaks? no
Tests pass? yes
Doc needed? no
License GPL-2.0

Added and changed texts in relations fields.

Checklist:

  • Coding standards ($ composer fix-cs)
  • Ready for Code Review

@GrabowskiM GrabowskiM requested review from dew326 and lucasOsti January 8, 2020 14:04
@@ -50,6 +50,11 @@
&__hidden-column {
display: none;
}

&__helper {
Copy link
Member

Choose a reason for hiding this comment

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

I would name it __helper-text

@@ -6,5 +6,6 @@
{% set limit = 1 %}
{% set default_location = form.vars.default_location ? form.vars.default_location.id : null %}
{% set allowed_content_type_identifiers = form.parent.vars.value.fieldDefinition.fieldSettings.selectionContentTypes %}
{% set helper = 'ezobjectrelation.helper'|trans|desc('Stores a relation to a content object.') %}
Copy link
Member

Choose a reason for hiding this comment

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

Please extract translations.

@@ -6,5 +6,6 @@
{% set limit = 1 %}
{% set default_location = form.vars.default_location ? form.vars.default_location.id : null %}
{% set allowed_content_type_identifiers = form.parent.vars.value.fieldDefinition.fieldSettings.selectionContentTypes %}
{% set helper = 'ezobjectrelation.helper'|trans|desc('Stores a relation to a content object.') %}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
{% set helper = 'ezobjectrelation.helper'|trans|desc('Stores a relation to a content object.') %}
{% set helper = 'ezobjectrelation.helper'|trans|desc('Stores a Relation to a Content item.') %}

@@ -6,5 +6,6 @@
{% set limit = form.parent.vars.value.fieldDefinition.validatorConfiguration.RelationListValueValidator.selectionLimit %}
{% set default_location = form.vars.default_location ? form.vars.default_location.id : null %}
{% set allowed_content_type_identifiers = form.parent.vars.value.fieldDefinition.fieldSettings.selectionContentTypes %}
{% set helper = 'ezobjectrelationlist.helper'|trans|desc('Stores relations to other content objects.') %}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
{% set helper = 'ezobjectrelationlist.helper'|trans|desc('Stores relations to other content objects.') %}
{% set helper = 'ezobjectrelationlist.helper'|trans|desc('Stores Relations to other Content items.') %}

{% if limit != 0 %}
{{ 'ezobjectrelationlist.cta.limit'|trans({'%limit%': limit})|desc('Set up multiple relations with up to %limit% content items') }}
{% if limit != 1 %}
{{ 'ezobjectrelationlist.cta.limit.multi'|trans|desc('Set up multiple relations with one or several content items') }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
{{ 'ezobjectrelationlist.cta.limit.multi'|trans|desc('Set up multiple relations with one or several content items') }}
{{ 'ezobjectrelationlist.cta.limit.multi'|trans|desc('Set up multiple Relations with one or several Content items') }}

{% if limit != 1 %}
{{ 'ezobjectrelationlist.cta.limit.multi'|trans|desc('Set up multiple relations with one or several content items') }}
{% else %}
{{ 'ezobjectrelationlist.cta.limit.single'|trans|desc('Set up a relation with one content item') }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
{{ 'ezobjectrelationlist.cta.limit.single'|trans|desc('Set up a relation with one content item') }}
{{ 'ezobjectrelationlist.cta.limit.single'|trans|desc('Set up a Relation with one Content item') }}

@GrabowskiM GrabowskiM requested review from dew326 and DominikaK January 9, 2020 08:55
@lserwatka lserwatka merged commit 6a1c12d into ezsystems:1.5 Jan 16, 2020
@lserwatka
Copy link
Member

@GrabowskiM could you merge it up?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

6 participants