-
Notifications
You must be signed in to change notification settings - Fork 78
Feature presidecms 3020 email layout config item missing i18n and label #1573
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
Open
s-ven-315
wants to merge
6
commits into
pixl8:stable
Choose a base branch
from
s-ven-315:feature-PRESIDECMS-3020_email_layout_config_item_missing_i18n_and_label
base: stable
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7616b57
[twgit] Init feature 'feature-PRESIDECMS-3020_email_layout_config_ite…
s-ven-315 021676b
PRESIDECMS-3020 add i18n and label for email_layout_config_item
s-ven-315 9f0c9fa
PRESIDECMS-3020 use i18n for label prefix
s-ven-315 b102f36
PRESIDE-3020 use label formula field
s-ven-315 bc42d63
PRESIDECMS-3020 use label renderer
s-ven-315 a6fcb50
PRESIDECMS-3020 use renderLabel instead of label field
s-ven-315 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
24 changes: 24 additions & 0 deletions
24
system/handlers/renderers/labels/email_layout_config_item.cfc
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| component { | ||
| private array function _selectFields( event, rc, prc ) { | ||
| return [ | ||
| "email_template.name as template_name" | ||
| , "email_blueprint.name as blueprint_name" | ||
| , "item" | ||
| ]; | ||
| } | ||
|
|
||
| private string function _renderLabel( event, rc, prc ) { | ||
| var template_name = arguments.template_name ?: ""; | ||
| var blueprint_name = arguments.blueprint_name ?: ""; | ||
| var item = arguments.item ?: ""; | ||
|
|
||
| var label = [ item ]; | ||
| if( Len( template_name ) ){ | ||
| ArrayPrepend( label, "Template: #template_name#" ); | ||
| } else if( Len( blueprint_name ) ){ | ||
| ArrayPrepend( label, "Blueprint: #blueprint_name#" ); | ||
| } | ||
|
|
||
| return ArrayToList( label, " - " ); | ||
| } | ||
| } | ||
9 changes: 9 additions & 0 deletions
9
system/i18n/preside-objects/email_layout_config_item.properties
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| title=Email layout config items | ||
| title.singular=Email layout config item | ||
|
|
||
| field.layout.title=Layout | ||
| field.email_template.title=Email template | ||
| field.email_blueprint.title=Email blueprint | ||
| field.custom_layout.title=Custom layout | ||
| field.item.title=Item | ||
| field.value.title=Value |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need i18n for Template: and Blueprint: please