ソースを参照

Merge branch 'develop'

master^2
Guillaume 3年前
コミット
d22b07ef89
3個のファイルの変更4行の追加1行の削除
  1. +2
    -1
      ShopBundle/Controller/Backend/ProductFamilyController.php
  2. +1
    -0
      ShopBundle/Model/ProductFamily.php
  3. +1
    -0
      ShopBundle/Resources/translations/lcshop.fr.yaml

+ 2
- 1
ShopBundle/Controller/Backend/ProductFamilyController.php ファイルの表示

@@ -139,7 +139,8 @@ class ProductFamilyController extends AdminController
'choices' => array(
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_AB => ProductFamily::PROPERTY_ORGANIC_LABEL_AB,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_NP => ProductFamily::PROPERTY_ORGANIC_LABEL_NP,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_HVE => ProductFamily::PROPERTY_ORGANIC_LABEL_HVE
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_HVE => ProductFamily::PROPERTY_ORGANIC_LABEL_HVE,
'field.ProductFamily.organicLabelOptions.' . ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR => ProductFamily::PROPERTY_ORGANIC_LABEL_TVVR
),
'translation_domain' => 'lcshop',
'multiple' => false,

+ 1
- 0
ShopBundle/Model/ProductFamily.php ファイルの表示

@@ -47,6 +47,7 @@ abstract class ProductFamily extends AbstractDocumentEntity implements ProductPr
const PROPERTY_ORGANIC_LABEL_AB = 'ab';
const PROPERTY_ORGANIC_LABEL_NP = 'nature-progres';
const PROPERTY_ORGANIC_LABEL_HVE = 'hve';
const PROPERTY_ORGANIC_LABEL_TVVR = 'tvvr';

const TYPE_EXPIRATION_DATE_DLC = 'dlc';
const TYPE_EXPIRATION_DATE_DDM = 'ddm';

+ 1
- 0
ShopBundle/Resources/translations/lcshop.fr.yaml ファイルの表示

@@ -385,6 +385,7 @@ field:
ab: Agriculture biologique
hve: Haute valeur environnementale
nature-progres: Nature & progrès
tvvr: "Terra Vitis : Viticulture Responsable"
behaviorExpirationDate: Gèrer
behaviorExpirationDateOptions:
by-product-family: Par produit

読み込み中…
キャンセル
保存