Merge remote-tracking branch '31231/MTWO-5' into marcomprs

Author: engcom-Charlie

app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\SalesRule\Model\Rule\Condition;
 
@@ -23,7 +23,7 @@ protected function _addSpecialAttributes(array &$attributes)
         $attributes['quote_item_price'] = __('Price in cart');
         $attributes['quote_item_row_total'] = __('Row total in cart');
 
-        $attributes['parent::category_ids'] = __('Category (Parent only)');
+        $attributes['parent::category_ids'] = __('Category (Parent Only)');
         $attributes['children::category_ids'] = __('Category (Children Only)');
     }
 
@@ -72,8 +72,8 @@ public function loadAttributeOptions()
             }
             $frontLabel = $attribute->getFrontendLabel();
             $attributes[$attribute->getAttributeCode()] = $frontLabel;
-            $attributes['parent::' . $attribute->getAttributeCode()] = $frontLabel . __('(Parent Only)');
-            $attributes['children::' . $attribute->getAttributeCode()] = $frontLabel . __('(Children Only)');
+            $attributes['parent::' . $attribute->getAttributeCode()] = __('%1 (Parent Only)', $frontLabel);
+            $attributes['children::' . $attribute->getAttributeCode()] = __('%1 (Children Only)', $frontLabel);
         }
 
         $this->_addSpecialAttributes($attributes);

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

@@ -174,3 +174,7 @@ Apply,Apply
 "Code Quantity Limit","Code Quantity Limit"
 "For better performance max value allowed is 250,000. Set 0 to disable it.","For better performance max value allowed is 250,000. Set 0 to disable it."
 "coupon exceeds usage limit.","coupon exceeds usage limit."
+"Category (Parent Only)","Category (Parent Only)"
+"Category (Children Only)","Category (Children Only)"
+"%1 (Parent Only)","%1 (Parent Only)"
+"%1 (Children Only)","%1 (Children Only)"