Skip to content

Commit 27c2abc

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'remotes/api/MAGETWO-44239-Text-change-to-Full-Page-Cache-Built-in-Application-option' into API-Bug-Branch
2 parents c563326 + 1129ce2 commit 27c2abc

File tree

8 files changed

+17
-10
lines changed

8 files changed

+17
-10
lines changed

app/code/Magento/PageCache/Model/System/Config/Source/Application.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@ class Application implements \Magento\Framework\Option\ArrayInterface
2323
public function toOptionArray()
2424
{
2525
return [
26-
['value' => \Magento\PageCache\Model\Config::BUILT_IN, 'label' => __('Built-in Application')],
27-
['value' => \Magento\PageCache\Model\Config::VARNISH, 'label' => __('Varnish Caching')]
26+
[
27+
'value' => \Magento\PageCache\Model\Config::BUILT_IN,
28+
'label' => __('Built-in Application (Not Recommended for Production Use)')
29+
],
30+
[
31+
'value' => \Magento\PageCache\Model\Config::VARNISH,
32+
'label' => __('Varnish Caching')
33+
]
2834
];
2935
}
3036

@@ -36,7 +42,8 @@ public function toOptionArray()
3642
public function toArray()
3743
{
3844
return [
39-
\Magento\PageCache\Model\Config::BUILT_IN => __('Built-in Application'),
45+
\Magento\PageCache\Model\Config::BUILT_IN =>
46+
__('Built-in Application (Not Recommended for Production Use)'),
4047
\Magento\PageCache\Model\Config::VARNISH => __('Varnish Caching')
4148
];
4249
}

app/code/Magento/PageCache/i18n/de_DE.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"Export VCL","Export VCL"
22
"Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
3-
"Built-in Application","Built-in Application"
3+
"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
44
"Varnish Caching","Varnish Caching"
55
"Full Page Cache","Full Page Cache"
66
"Caching Application","Caching Application"

app/code/Magento/PageCache/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"Export VCL","Export VCL"
22
"Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
3-
"Built-in Application","Built-in Application"
3+
"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
44
"Varnish Caching","Varnish Caching"
55
"Full Page Cache","Full Page Cache"
66
"Caching Application","Caching Application"

app/code/Magento/PageCache/i18n/es_ES.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"Export VCL","Export VCL"
22
"Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
3-
"Built-in Application","Built-in Application"
3+
"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
44
"Varnish Caching","Varnish Caching"
55
"Full Page Cache","Full Page Cache"
66
"Caching Application","Caching Application"

app/code/Magento/PageCache/i18n/fr_FR.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"Export VCL","Export VCL"
22
"Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
3-
"Built-in Application","Built-in Application"
3+
"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
44
"Varnish Caching","Varnish Caching"
55
"Full Page Cache","Full Page Cache"
66
"Caching Application","Caching Application"

app/code/Magento/PageCache/i18n/nl_NL.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"Export VCL","Export VCL"
22
"Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
3-
"Built-in Application","Built-in Application"
3+
"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
44
"Varnish Caching","Varnish Caching"
55
"Full Page Cache","Full Page Cache"
66
"Caching Application","Caching Application"

app/code/Magento/PageCache/i18n/pt_BR.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"Export VCL","Export VCL"
22
"Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
3-
"Built-in Application","Built-in Application"
3+
"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
44
"Varnish Caching","Varnish Caching"
55
"Full Page Cache","Full Page Cache"
66
"Caching Application","Caching Application"

app/code/Magento/PageCache/i18n/zh_Hans_CN.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"Export VCL","Export VCL"
22
"Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
3-
"Built-in Application","Built-in Application"
3+
"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
44
"Varnish Caching","Varnish Caching"
55
"Full Page Cache","Full Page Cache"
66
"Caching Application","Caching Application"

0 commit comments

Comments
 (0)