Merge pull request #2909 from jake-mw/crm-14472

[civicrm-core.git] / CRM / Core / Form / Date.php

diff --git a/CRM/Core/Form/Date.php b/CRM/Core/Form/Date.php
index 17dce3f6649d45d126485dbd8fff33395687a6fa..66f25e183439c82a677b8e201b4ab13026e68ee9 100644 (file)
--- a/CRM/Core/Form/Date.php
+++ b/CRM/Core/Form/Date.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -51,7 +51,7 @@ Class CRM_Core_Form_Date {
 
     $dateOptions = array();
 
-    if (CRM_Utils_System::getClassName($form) == 'CRM_Activity_Import_Form_UploadFile') {
+    if (CRM_Utils_System::getClassName($form) == 'CRM_Activity_Import_Form_DataSource') {
       $dateText = ts('yyyy-mm-dd OR yyyy-mm-dd HH:mm OR yyyymmdd OR yyyymmdd HH:mm (1998-12-25 OR 1998-12-25 15:33 OR 19981225 OR 19981225 10:30 OR ( 2008-9-1 OR 2008-9-1 15:33 OR 20080901 15:33)');
     }
     else {
@@ -171,10 +171,12 @@ Class CRM_Core_Form_Date {
         'current.quarter' => ts('Current Quarter to-date'),
         'current.month' => ts('Current Month to-date'),
         'current.week' => ts('Current Week to-date'),
-        'ending.year' => ts('From 12 Months Ago'),
-        'ending.quarter' => ts('From 3 Months Ago'),
-        'ending.month' => ts('From 1 Month Ago'),
-        'ending.week' => ts('From 1 Week Ago'),
+        'ending_3.year' => ts('Last 3 Years'),
+        'ending_2.year' => ts('Last 2 Years'),
+        'ending.year' => ts('Last 12 Months'),
+        'ending.quarter' => ts('Last 3 Months'),
+        'ending.month' => ts('Last Month'),
+        'ending.week' => ts('Last 7 days'),
       );
 
     if (is_array($operators)) {
@@ -194,7 +196,7 @@ Class CRM_Core_Form_Date {
   /**
    * This function is to build the date range - relative or absolute
    *
-   * @param Object  $form   the form object that we are operating on
+   * @param CRM_Core_Form  $form   the form object that we are operating on
    * @param string $fieldName
    * @param Array $selector array of option values to add
    * @param integer $count
@@ -210,8 +212,9 @@ Class CRM_Core_Form_Date {
     $form->add('select',
       "{$fieldName}_relative",
       ts('Relative Date Range'),
-        $selector,
-        $required
+      $selector,
+      $required,
+      array('class' => 'crm-select2')
       );
 
       $form->addDateRange($fieldName, $from, $to, $fromLabel, $dateFormat, FALSE, $displayTime);