Merge branch 'master' of github.com:spryker/spryker into bugfix/te-5099-attribute-edit

Author: kraal-spryker

assets/Zed/js/modules/product-attribute.js

@@ -124,7 +124,10 @@ function AttributeManager() {
         key = key.replace(/([^a-z0-9\_\-\:]+)/gi, '').toLowerCase();
 
         if (key === '' || !idAttribute) {
-            alert('Please select attribute key first');
+            var $messageInput = $('#empty-attribute-key-message');
+
+            alert($messageInput ? $messageInput.val() : 'Please select attribute key first');
+
             return false;
         }
 

data/translation/Zed/de_DE.csv

@@ -38,7 +38,7 @@ number,number
 "Product attributes saved","Produktattribute gespeichert"
 Save,Speichern
 select,select
-"Super attribute",Superattribute
+"Super attribute",Superattribut
 text,text
 textarea,textarea
 time,time
@@ -48,3 +48,8 @@ time,time
 Values,Werte
 "View Attribute","Attribute ansehen"
 "You can add new values by pressing ""Enter"" after each element","Sie können neue Werte hinzufügen, indem Sie nach jedem Element ""Enter"" drücken"
+Remove,Entfernen
+"Edit Product Attribute","Produktattribut bearbeiten"
+"Edit Attribute Translations","Attributübersetzungen bearbeiten"
+"Predefined Values","Vordefinierte Werte"
+"Please select attribute key first","Wählen Sie zuerst einen Attributschlüssel aus."

data/translation/Zed/en_US.csv

@@ -48,3 +48,8 @@ time,time
 Values,Values
 "View Attribute","View Attribute"
 "You can add new values by pressing ""Enter"" after each element","You can add new values by pressing ""Enter"" after each element"
+Remove,Remove
+"Edit Product Attribute","Edit Product Attribute"
+"Edit Attribute Translations","Edit Attribute Translations"
+"Predefined Values","Predefined Values"
+"Please select attribute key first","Please select attribute key first."

src/Spryker/Zed/ProductAttributeGui/Communication/ProductAttributeGuiCommunicationFactory.php

@@ -150,7 +150,7 @@ public function createAttributeTranslationFormCollectionDataProvider()
     }
 
     /**
-     * @deprecated Use `getAttributeTranslationFormCollection` instead.
+     * @deprecated Use {@link getAttributeTranslationFormCollection()} instead.
      *
      * @param array $data
      * @param array $options

src/Spryker/Zed/ProductAttributeGui/Presentation/View/_partials/add-attribute-form.twig

@@ -11,6 +11,7 @@
             <td style="padding-top: 15px"><input type="button" onclick="return false" class="btn btn-primary" value="{{ 'Add' | trans }}"  id="addButton" /></td>
         </tr>
         </table>
+        <input id="empty-attribute-key-message" type="hidden" value="{{ 'Please select attribute key first' | trans }}"/>
         {{ form_end(form) }}
     {% endblock %}
-{% endembed %}
+{% endembed %}c