MAGETWO-34363: Pull request processing

Author: sivaschenko

app/code/Magento/Translation/Model/Js/Config.php

@@ -13,6 +13,11 @@
  */
 class Config extends FrameworkJsConfig
 {
+    /**
+     * Both translation strategies are disabled
+     */
+    const NO_TRANSLATION = 'none';
+
     /**
      * Strategy when all js files are translated while publishing
      */

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]
         ];

app/code/Magento/Translation/Test/Unit/Model/Js/Config/Source/StrategyTest.php

@@ -24,6 +24,7 @@ protected function setUp()
     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]
         ];

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>