? 385688_related_table_filter_handler.patch
? LICENSE.txt
? date_ambiguous_plural_847496-1.patch
? includes/385688_filter_handler.patch
Index: date_api.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/date_api.module,v
retrieving revision 1.64.2.5.2.105
diff -u -p -r1.64.2.5.2.105 date_api.module
--- date_api.module	13 Aug 2010 14:36:31 -0000	1.64.2.5.2.105
+++ date_api.module	14 Sep 2010 20:00:03 -0000
@@ -593,6 +593,9 @@ function date_t($string, $context, $lang
     case 'datetime_plural':
       $untranslated = array_flip(array('Years', 'Months', 'Days', 'Weeks', 'Hours', 'Minutes', 'Seconds'));  
       break;
+    case 'datetime_ambiguous':
+      $untranslated = array_flip(array('Year(s)', 'Month(s)', 'Day(s)', 'Week(s)', 'Hour(s)', 'Minute(s)', 'Second(s)'));
+      break;
     case 'date_order':
       $untranslated = array_flip(array('Every', 'First', 'Second', 'Third', 'Fourth', 'Fifth'));  
       break;
@@ -621,6 +624,7 @@ function date_t_strings(&$replace, $lang
   $replace[$langcode]['ampm'] = explode('|', trim(t('!ampm-abbreviation am|pm|AM|PM', array('!ampm-abbreviation' => ''), $langcode)));
   $replace[$langcode]['datetime'] = explode('|', trim(t('!datetime Year|Month|Day|Week|Hour|Minute|Second|All Day|All day', array('!datetime' => ''), $langcode)));
   $replace[$langcode]['datetime_plural'] = explode('|', trim(t('!datetime_plural Years|Months|Days|Weeks|Hours|Minutes|Seconds', array('!datetime_plural' => ''), $langcode)));
+  $replace[$langcode]['datetime_ambiguous'] = explode('|', trim(t('!datetime_ambiguous Year(s)|Month(s)|Day(s)|Week(s)|Hour(s)|Minute(s)|Second(s)', array('!datetime_ambiguous' => ''), $langcode)));
   $replace[$langcode]['date_order'] = explode('|', trim(t('!date_order Every|First|Second|Third|Fourth|Fifth', array('!date_order' => ''), $langcode)));
   $replace[$langcode]['date_order_reverse'] = explode('|', trim(t('!date_order |Last|Next to last|Third from last|Fourth from last|Fifth from last', array('!date_order' => ''), $langcode)));
   $replace[$langcode]['date_nav'] = explode('|', trim(t('!date_nav Prev|Next|Today', array('!date_nav' => ''), $langcode)));
Index: date_repeat/date_repeat.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/date_repeat/date_repeat.module,v
retrieving revision 1.30.4.13
diff -u -p -r1.30.4.13 date_repeat.module
--- date_repeat/date_repeat.module	12 Aug 2010 19:41:04 -0000	1.30.4.13
+++ date_repeat/date_repeat.module	14 Sep 2010 20:00:11 -0000
@@ -39,10 +39,10 @@ function date_repeat_theme() {
 function FREQ_options() {
   return array(
     'NONE' => t('-- Period'),
-    'DAILY' => date_t('Days', 'datetime_plural'),
-    'WEEKLY' => date_t('Weeks', 'datetime_plural'),
-    'MONTHLY' => date_t('Months', 'datetime_plural'),
-    'YEARLY' => date_t('Years', 'datetime_plural'),
+    'DAILY' => date_t('Day(s)', 'datetime_ambiguous'),
+    'WEEKLY' => date_t('Week(s)', 'datetime_ambiguous'),
+    'MONTHLY' => date_t('Month(s)', 'datetime_ambiguous'),
+    'YEARLY' => date_t('Year(s)', 'datetime_ambiguous'),
   );
 }
 
Index: includes/date_api_filter_handler.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/date/includes/date_api_filter_handler.inc,v
retrieving revision 1.1.2.47
diff -u -p -r1.1.2.47 date_api_filter_handler.inc
--- includes/date_api_filter_handler.inc	12 Aug 2010 22:32:58 -0000	1.1.2.47
+++ includes/date_api_filter_handler.inc	14 Sep 2010 20:00:20 -0000
@@ -423,6 +423,9 @@ class date_api_filter_handler extends vi
     $this->get_query_fields();
     if (!empty($this->query_fields)) {
       foreach ((array) $this->query_fields as $query_field) {
+        if (!empty($this->related_table_alias)) {
+          $query_field['field']['fullname'] = $this->related_table_alias . "." . $query_field['field']['field_name'];
+        }
         $field = $query_field['field'];
         $sql = '';
         $sql_parts = array();