浏览代码

added date labels

Pat Haggerty 13 年之前
父节点
当前提交
7583846afa
共有 3 个文件被更改,包括 34 次插入14 次删除
  1. 1 1
      Form/Type/Filter/DateRangeType.php
  2. 7 7
      Form/Type/Filter/DateType.php
  3. 26 6
      Resources/translations/SonataAdminBundle.en.xliff

+ 1 - 1
Form/Type/Filter/DateRangeType.php

@@ -45,7 +45,7 @@ class DateRangeType extends AbstractType
     public function buildForm(FormBuilder $builder, array $options)
     {
         $choices = array(
-            self::TYPE_RANGE            => $this->translator->trans('label_type_range', array(), 'SonataAdminBundle'),
+            self::TYPE_RANGE            => $this->translator->trans('label_date_type_range', array(), 'SonataAdminBundle'),
         );
 
         $builder

+ 7 - 7
Form/Type/Filter/DateType.php

@@ -58,13 +58,13 @@ class DateType extends AbstractType
     public function buildForm(FormBuilder $builder, array $options)
     {
         $choices = array(
-            self::TYPE_EQUAL            => $this->translator->trans('label_type_equal', array(), 'SonataAdminBundle'),
-            self::TYPE_GREATER_EQUAL    => $this->translator->trans('label_type_greater_equal', array(), 'SonataAdminBundle'),
-            self::TYPE_GREATER_THAN     => $this->translator->trans('label_type_greater_than', array(), 'SonataAdminBundle'),
-            self::TYPE_LESS_EQUAL       => $this->translator->trans('label_type_less_equal', array(), 'SonataAdminBundle'),
-            self::TYPE_LESS_THAN        => $this->translator->trans('label_type_less_than', array(), 'SonataAdminBundle'),
-            self::TYPE_NULL             => $this->translator->trans('label_type_null', array(), 'SonataAdminBundle'),
-            self::TYPE_NOT_NULL         => $this->translator->trans('label_type_not_null', array(), 'SonataAdminBundle'),
+            self::TYPE_EQUAL            => $this->translator->trans('label_date_type_equal', array(), 'SonataAdminBundle'),
+            self::TYPE_GREATER_EQUAL    => $this->translator->trans('label_date_type_greater_equal', array(), 'SonataAdminBundle'),
+            self::TYPE_GREATER_THAN     => $this->translator->trans('label_date_type_greater_than', array(), 'SonataAdminBundle'),
+            self::TYPE_LESS_EQUAL       => $this->translator->trans('label_date_type_less_equal', array(), 'SonataAdminBundle'),
+            self::TYPE_LESS_THAN        => $this->translator->trans('label_date_type_less_than', array(), 'SonataAdminBundle'),
+            self::TYPE_NULL             => $this->translator->trans('label_date_type_null', array(), 'SonataAdminBundle'),
+            self::TYPE_NOT_NULL         => $this->translator->trans('label_date_type_not_null', array(), 'SonataAdminBundle'),
         );
 
         $builder

+ 26 - 6
Resources/translations/SonataAdminBundle.en.xliff

@@ -222,16 +222,36 @@
               <source>label_type_less_than</source>
               <target>&lt;</target>
             </trans-unit>
-            <trans-unit id="label_type_null">
-              <source>label_type_null</source>
+            <trans-unit id="label_date_type_equal">
+              <source>label_date_type_equal</source>
+              <target>=</target>
+            </trans-unit>
+            <trans-unit id="label_date_type_greater_equal">
+              <source>label_date_type_greater_equal</source>
+              <target>&gt;=</target>
+            </trans-unit>
+            <trans-unit id="label_date_type_greater_than">
+              <source>label_date_type_greater_than</source>
+              <target>&gt;</target>
+            </trans-unit>
+            <trans-unit id="label_date_type_less_equal">
+              <source>label_date_type_less_equal</source>
+              <target>&lt;=</target>
+            </trans-unit>
+            <trans-unit id="label_date_type_less_than">
+              <source>label_date_type_less_than</source>
+              <target>&lt;</target>
+            </trans-unit>
+            <trans-unit id="label_date_type_null">
+              <source>label_date_type_null</source>
               <target>is empty</target>
             </trans-unit>
-            <trans-unit id="label_type_not_null">
-              <source>label_type_not_null</source>
+            <trans-unit id="label_date_type_not_null">
+              <source>label_date_type_not_null</source>
               <target>is not empty</target>
             </trans-unit>
-            <trans-unit id="label_type_range">
-              <source>label_type_range</source>
+            <trans-unit id="label_date_type_range">
+              <source>label_date_type_range</source>
               <target>range of dates</target>
             </trans-unit>
             <trans-unit id="label_filters">