From 58b107648b7c076475ecc11568de9106ab304289 Mon Sep 17 00:00:00 2001
From: Sergey Ivashchenko <sivashchenko@ebay.com>
Date: Sat, 14 Mar 2015 17:10:15 +0200
Subject: [PATCH] MAGETWO-34363: Pull request processing
---
app/code/Magento/Translation/Model/Js/Config.php | 5 +++++
.../Magento/Translation/Model/Js/Config/Source/Strategy.php | 1 +
.../Test/Unit/Model/Js/Config/Source/StrategyTest.php | 1 +
app/code/Magento/Translation/etc/config.xml | 2 +-
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/app/code/Magento/Translation/Model/Js/Config.php b/app/code/Magento/Translation/Model/Js/Config.php
index ec9c8727b28..6dc1abb699d 100644
--- a/app/code/Magento/Translation/Model/Js/Config.php
+++ b/app/code/Magento/Translation/Model/Js/Config.php
@@ -13,6 +13,11 @@ use Magento\Framework\App\Config\ScopeConfigInterface;
*/
class Config extends FrameworkJsConfig
{
+ /**
+ * Both translation strategies are disabled
+ */
+ const NO_TRANSLATION = 'none';
+
/**
* Strategy when all js files are translated while publishing
*/
diff --git a/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php b/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php
index 767e228a82b..30f1b0fe8e9 100644
--- a/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php
+++ b/app/code/Magento/Translation/Model/Js/Config/Source/Strategy.php
@@ -15,6 +15,7 @@ class Strategy implements \Magento\Framework\Option\ArrayInterface
public function toOptionArray()
{
return [
+ ['label' => __('None (Translation is disabled)'), 'value' => Config::NO_TRANSLATION],
['label' => __('Dictionary (Translation on frontend side)'), 'value' => Config::DICTIONARY_STRATEGY],
['label' => __('Embedded (Translation on backend side)'), 'value' => Config::EMBEDDED_STRATEGY]
];
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php b/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php
index 46fbeaf8b7e..0ad31d9d0e7 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php
@@ -24,6 +24,7 @@ class StrategyTest extends \PHPUnit_Framework_TestCase
public function testToOptionArray()
{
$expected = [
+ ['label' => __('None (Translation is disabled)'), 'value' => Config::NO_TRANSLATION],
['label' => 'Dictionary (Translation on frontend side)', 'value' => Config::DICTIONARY_STRATEGY],
['label' => 'Embedded (Translation on backend side)', 'value' => Config::EMBEDDED_STRATEGY]
];
diff --git a/app/code/Magento/Translation/etc/config.xml b/app/code/Magento/Translation/etc/config.xml
index 480f70f3955..19cb337a6b6 100644
--- a/app/code/Magento/Translation/etc/config.xml
+++ b/app/code/Magento/Translation/etc/config.xml
@@ -16,7 +16,7 @@
</invalid_caches>
</translate_inline>
<js>
- <translate_strategy>dictionary</translate_strategy>
+ <translate_strategy>none</translate_strategy>
</js>
</dev>
</default>
--
GitLab