Merge branch '1.0' into 1.1

* 1.0: [Translations] Updated translations from Crowdin [Docs] Contributing standards enhanced [Docs] Polish the CMS cookbook Fix CMS cookbook Remove some unused methods in Behat pages
ezecosystem · Feb 15, 2018 · 0fc65ec · 0fc65ec
2 parents 17052a0 + f2f0c86
commit 0fc65ec
Show file tree

Hide file tree

Showing 609 changed files with 3,295 additions and 1,074 deletions.
diff --git a/docs/contributing/documentation/standards.rst b/docs/contributing/documentation/standards.rst
@@ -131,7 +131,10 @@ Language Standards
 
     The Vitamins are in my Fresh California Raisins
 
-* Do not use `Serial (Oxford) Commas`_;
+* Please use appropriate, informative, rather formal language;
+* Do not place any kind of advertisements in the documentation;
+* The documentation should be neutral, without judgements, opinions. Make sure you do not favor anyone,
+  our community is great as a whole, there is no need to point who is better than the rest of us;
 * You should use a form of *you* instead of *we* (i.e. avoid the first person
   point of view: use the second instead);
 * When referencing a hypothetical person, such as "a user with a session cookie", gender-neutral

diff --git a/docs/cookbook/shop/cms.rst b/docs/cookbook/shop/cms.rst
@@ -12,8 +12,8 @@ Content management in Sylius
 ----------------------------
 
 Sylius standard app does not come with a content management system. Our community has taken care of it.
-As Sylius does have an awesome dev oriented plugin environment, developers from `BitBag <https://bitbag.shop>`_ decided to develop
-their flexible CMS module. You can find it on `their GitHub <https://github.com/BitBagCommerce/SyliusCmsPlugin>`_.
+As Sylius does have a convenient dev oriented plugin environment, the developers from `BitBag <https://bitbag.shop>`_ decided to develop
+their flexible CMS module. You can find it `here <https://github.com/BitBagCommerce/SyliusCmsPlugin>`_.
 
 .. tip::
 
@@ -28,12 +28,12 @@ Inside the plugin, you will find:
 * Sections which you can use to create a blog, customer information, etc.
 * FAQ module
 
-What is the most awesome thing about this plugin is that you can customize it for your specific needs like you do with each :doc:`Sylius model </customization/model>`.
+A very handy feature of this plugin is that you can customize it for your specific needs like you do with each :doc:`Sylius model </customization/model>`.
 
 Installation & usage
 --------------------
 
-Find out more about how to install the plugin on `GitHub <https://github.com/BitBagCommerce/SyliusCmsPlugin>`_.
+Find out more about how to install the plugin on `GitHub <https://github.com/BitBagCommerce/SyliusCmsPlugin>`_ in the README file.
 
 Learn more
 ----------

diff --git a/docs/cookbook/shop/map.rst.inc b/docs/cookbook/shop/map.rst.inc
@@ -5,3 +5,4 @@
 * :doc:`/cookbook/shop/taxons-menu`
 * :doc:`/cookbook/shop/embedding-products`
 * :doc:`/cookbook/shop/disabling-localised-urls`
+* :doc:`/cookbook/shop/cms`
diff --git a/src/Sylius/Behat/Page/Admin/Product/CreateSimpleProductPage.php b/src/Sylius/Behat/Page/Admin/Product/CreateSimpleProductPage.php
@@ -202,21 +202,6 @@ public function checkChannel($channelName)
         $this->getElement('channel_checkbox', ['%channelName%' => $channelName])->check();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function specifyPriceForChannelAndCurrency($price, ChannelInterface $channel, CurrencyInterface $currency)
-    {
-        $calculatorElement = $this->getElement('calculator');
-        $calculatorElement
-            ->waitFor(5, function () use ($channel, $currency) {
-                return $this->getElement('calculator')->hasField(sprintf('%s %s', $channel->getName(), $currency->getCode()));
-            })
-        ;
-
-        $calculatorElement->fillField(sprintf('%s %s', $channel->getName(), $currency->getCode()), $price);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -279,7 +264,6 @@ protected function getDefinedElements()
             'attribute_delete_button' => '.tab[data-tab="%localeCode%"] .attribute .label:contains("%attributeName%") ~ button',
             'attribute_value' => '.tab[data-tab="%localeCode%"] .attribute .label:contains("%attributeName%") ~ input',
             'attributes_choice' => '#sylius_product_attribute_choice',
-            'calculator' => '#sylius_calculator_container',
             'channel_checkbox' => '.checkbox:contains("%channelName%") input',
             'channel_pricings' => '#sylius_product_variant_channelPricings',
             'code' => '#sylius_product_code',

diff --git a/src/Sylius/Behat/Page/Admin/Product/CreateSimpleProductPageInterface.php b/src/Sylius/Behat/Page/Admin/Product/CreateSimpleProductPageInterface.php
@@ -42,13 +42,6 @@ public function choosePricingCalculator($name);
      */
     public function checkChannel($channelName);
 
-    /**
-     * @param int $price
-     * @param ChannelInterface $channel
-     * @param CurrencyInterface $currency
-     */
-    public function specifyPriceForChannelAndCurrency($price, ChannelInterface $channel, CurrencyInterface $currency);
-
     /**
      * @param string $code
      */

diff --git a/src/Sylius/Behat/Page/Admin/ProductVariant/CreatePage.php b/src/Sylius/Behat/Page/Admin/ProductVariant/CreatePage.php
@@ -85,21 +85,6 @@ public function choosePricingCalculator($name)
         $this->getElement('price_calculator')->selectOption($name);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function specifyPriceForChannelAndCurrency($price, ChannelInterface $channel, CurrencyInterface $currency)
-    {
-        $calculatorElement = $this->getElement('calculator');
-        $calculatorElement
-            ->waitFor(5, function () use ($channel, $currency) {
-                return $this->getElement('calculator')->hasField(sprintf('%s %s', $channel->getName(), $currency->getCode()));
-            })
-        ;
-
-        $calculatorElement->fillField(sprintf('%s %s', $channel->getName(), $currency->getCode()), $price);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -154,7 +139,6 @@ public function setShippingRequired($isShippingRequired)
     protected function getDefinedElements()
     {
         return array_merge(parent::getDefinedElements(), [
-            'calculator' => '#sylius_calculator_container',
             'code' => '#sylius_product_variant_code',
             'depth' => '#sylius_product_variant_depth',
             'form' => 'form[name="sylius_product_variant"]',

diff --git a/src/Sylius/Behat/Page/Admin/ProductVariant/CreatePageInterface.php b/src/Sylius/Behat/Page/Admin/ProductVariant/CreatePageInterface.php
@@ -66,13 +66,6 @@ public function selectOption($optionName, $optionValue);
      */
     public function choosePricingCalculator($name);
 
-    /**
-     * @param int $price
-     * @param ChannelInterface $channel
-     * @param CurrencyInterface $currency
-     */
-    public function specifyPriceForChannelAndCurrency($price, ChannelInterface $channel, CurrencyInterface $currency);
-
     /**
      * @return string
      */

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.af.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.af.yml
@@ -11,6 +11,7 @@ sylius:
             last_name: Van
             postcode: Poskode
             province: Provinsie
+            zone: Area
         country:
             name: Naam
             provinces: Provinsies

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.ar.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.ar.yml
@@ -8,7 +8,7 @@ sylius:
             company: الشركة
             country: البلد
             first_name: الاسم الأول
-            last_name: إسم العائلة
+            last_name: اسم العائلة
             phone_number: رقم الهاتف
             postcode: الرقم البريدي
             street: عنوان الشارع
@@ -35,7 +35,7 @@ sylius:
                 zone: المنطقة
             scope: نطاق
             scopes:
-                all: الكل
+                all: الجميع
             select: اختر
             select_scope: اختر النطاق
         zone_member:

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.be.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.be.yml
@@ -10,7 +10,7 @@ sylius:
             first_name: Імя
             last_name: Прозвішча
             phone_number: Нумар тэлефону
-            postcode: Індэкс
+            postcode: Паштовы код
             street: Вуліца і нумар дома
             province: Вобласць (рэгіён)
             zone: Зона
@@ -21,13 +21,13 @@ sylius:
             select: Выбярыце
             enabled: Уключана
         province:
-            name: Імя
+            name: Назва
             abbreviation: Абрэвіятура вобласці (рэгіёну)
-            select: Выберыце
+            select: Выбярыце
         zone:
             add_member: Дадаць удзельніка
             members: Удзельнікі
-            name: Імя
+            name: Назва
             type: Тып
             types:
                 country: Краіна

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.bg.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.bg.yml
@@ -15,25 +15,25 @@ sylius:
             province: Област
             zone: Зона
         country:
-            add_province: Добавяне на провинция
+            add_province: Добави провинция
             name: Име
             provinces: Области
             select: Изберете
-            enabled: Активно
+            enabled: Активирано
         province:
             name: Име
             abbreviation: Съкращение
             select: Изберете
         zone:
-            add_member: Добавяне на член
+            add_member: Добави член
             members: Членове
             name: Име
             type: Тип
             types:
                 country: Държава
                 province: Област
                 zone: Зона
-            scope: Oбсег
+            scope: Обхват
             scopes:
                 all: Всички
             select: Изберете

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.cs.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.cs.yml
@@ -7,7 +7,7 @@ sylius:
             city: Město
             company: Firma
             country: Země
-            first_name: Křestní jméno
+            first_name: Křestní Jméno
             last_name: Příjmení
             phone_number: Telefonní číslo
             postcode: PSČ

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.es.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.es.yml
@@ -19,7 +19,7 @@ sylius:
             name: Nombre
             provinces: Provincias
             select: Selecciona
-            enabled: Activado
+            enabled: '¿Activado?'
         province:
             name: Nombre
             abbreviation: Abreviatura
@@ -33,10 +33,10 @@ sylius:
                 country: País
                 province: Provincia
                 zone: Zona
-            scope: Alcance
+            scope: Ámbito
             scopes:
                 all: Todos
-            select: Seleccionar
+            select: Selecciona
             select_scope: Seleccione ámbito
         zone_member:
-            select: Seleccionar
+            select: Selecciona
diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.et.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.et.yml
@@ -19,7 +19,7 @@ sylius:
             name: Nimi
             provinces: Provintsid
             select: Vali
-            enabled: Luba
+            enabled: Lubatud
         province:
             name: Nimi
             abbreviation: Lühend
@@ -32,7 +32,7 @@ sylius:
             types:
                 country: Riik
                 province: Provints
-                zone: Tsoon
+                zone: Piirkond
             scope: Ulatus
             scopes:
                 all: Kõik

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.fi.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.fi.yml
@@ -32,7 +32,7 @@ sylius:
             types:
                 country: Maa
                 province: Lääni
-                zone: Alue
+                zone: Vyöhyke
             scope: Alue
             scopes:
                 all: Kaikki

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.fr.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.fr.yml
@@ -4,36 +4,18 @@
 sylius:
     form:
         address:
-            city: Ville
-            company: Société
-            country: Pays
             first_name: Prénom
             last_name: Nom
-            phone_number: Téléphone
-            postcode: Code postal
             street: Voie
-            province: Région
             zone: Zone
         country:
-            add_province: Ajouter une région
-            name: Nom
-            provinces: Etat
             select: Sélectionner
-            enabled: Activé
         province:
-            name: Nom
             abbreviation: Abréviation
             select: Sélectionner
         zone:
-            add_member: Ajouter un membre
-            members: Membres
-            name: Nom
-            type: Type
             types:
-                country: Pays
-                province: Région
                 zone: Zone
-            scope: Champ d'application
             scopes:
                 all: Tous
             select: Sélectionner

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.he.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.he.yml
@@ -19,7 +19,7 @@ sylius:
             name: שם
             provinces: מחוזות
             select: בחירה
-            enabled: מופעל
+            enabled: הופעל
         province:
             name: שם
             abbreviation: ראשי תיבות או שם מקוצר של מחוז
@@ -34,8 +34,6 @@ sylius:
                 province: מחוז
                 zone: איזור
             scope: תחום
-            scopes:
-                all: כל התחומים
             select: בחירה
             select_scope: בחרו תחום
         zone_member:

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.hr.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.hr.yml
@@ -11,16 +11,16 @@ sylius:
             last_name: Prezime
             phone_number: Kontakt telefon
             postcode: Poštanski broj
-            province: Pokrajina
+            province: Županija
             zone: Regija
         country:
             add_province: Dodaj pokrajinu
-            name: Naziv Države
-            provinces: Pokrajine
+            name: Naziv regije
+            provinces: Županije
             select: Odaberite
             enabled: Omogućeno
         province:
-            name: Naziv pokrajine
+            name: Naziv regije
             abbreviation: Skraćeno
             select: Odaberite
         zone:
@@ -30,7 +30,7 @@ sylius:
             type: Vrsta
             types:
                 country: Država
-                province: Pokrajina
+                province: Županija
                 zone: Regija
             scope: Djelokrug
             scopes:

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.hu.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.hu.yml
@@ -23,7 +23,7 @@ sylius:
         province:
             name: Név
             abbreviation: Rövidítés
-            select: Válasszon
+            select: Válassza ki
         zone:
             add_member: Tag hozzáadása
             members: Tagok

diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.id.yml b/src/Sylius/Bundle/AddressingBundle/Resources/translations/messages.id.yml
@@ -7,7 +7,7 @@ sylius:
             city: Kota
             company: Perusahaan
             country: Negara
-            first_name: Nama depan
+            first_name: Nama Depan
             last_name: Nama belakang
             phone_number: Nomor telepon
             postcode: Kode pos