Projet

Général

Profil

Révision b720ea3e

Ajouté par Assos Assos il y a plus de 8 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/date/date.field.inc
19 19
        'multiple_from' => '',
20 20
        'multiple_to' => '',
21 21
        'fromto' => 'both',
22
        'show_remaining_days' => FALSE,
22 23
      ),
23 24
    ),
24 25
    'format_interval' => array(
......
48 49
    case 'format_interval':
49 50
      $form = date_interval_formatter_settings_form($field, $instance, $view_mode, $form, $form_state);
50 51
      break;
52

  
51 53
    default:
52 54
      $form = date_default_formatter_settings_form($field, $instance, $view_mode, $form, $form_state);
53 55
      break;
......
72 74
    case 'format_interval':
73 75
      $summary = date_interval_formatter_settings_summary($field, $instance, $view_mode);
74 76
      break;
77

  
75 78
    default:
76 79
      $summary = date_default_formatter_settings_summary($field, $instance, $view_mode);
77 80
      break;
......
169 172
            $element[$delta] = array('#markup' => $item['value']);
170 173
          }
171 174
          else {
172
            $element[$delta] = array('#markup' => t('!start-date to !end-date', array('!start-date' => $item['value'], '!end-date' => $item['value2'])));
175
            $element[$delta] = array(
176
              '#markup' => t('!start-date to !end-date', array(
177
                '!start-date' => $item['value'],
178
                '!end-date' => $item['value2']
179
              )));
173 180
          }
174 181
        }
175 182
      }
176 183
      break;
184

  
177 185
    case 'format_interval':
178 186
      foreach ($items as $delta => $item) {
179 187
        if (!empty($entity->date_id) && !in_array($delta, $selected_deltas)) {
......
188 196
        }
189 197
      }
190 198
      break;
199

  
191 200
    default:
192 201
      foreach ($items as $delta => $item) {
193 202
        if (!empty($entity->date_id) && !in_array($delta, $selected_deltas)) {
......
198 207
          $variables['item'] = $item;
199 208
          $variables['dates'] = date_formatter_process($formatter, $entity_type, $entity, $field, $instance, $langcode, $item, $display);
200 209
          $variables['attributes'] = !empty($rdf_mapping) ? rdf_rdfa_attributes($rdf_mapping, $item['value']) : array();
210
          $variables['show_remaining_days'] = $display['settings']['show_remaining_days'];
201 211
          $output = theme('date_display_combination', $variables);
202 212
          if (!empty($output)) {
203 213
            $element[$delta] = array('#markup' => $output);
......
231 241
 * Implements hook_field_info().
232 242
 */
233 243
function date_field_info() {
244
  $granularity = array('year', 'month', 'day', 'hour', 'minute');
234 245
  $settings = array(
235 246
    'settings' => array(
236 247
      'todate' => '',
237
      'granularity' => drupal_map_assoc(array('year', 'month', 'day', 'hour', 'minute')),
248
      'granularity' => drupal_map_assoc($granularity),
238 249
      'tz_handling' => 'site',
239 250
      'timezone_db' => 'UTC',
240 251
    ),
......
250 261
  );
251 262
  return array(
252 263
    'datetime' => array(
253
      'label' => 'Date',
264
      'label' => t('Date'),
254 265
      'description' => t('Store a date in the database as a datetime field, recommended for complete dates and times that may need timezone conversion.'),
255 266
      'default_widget' => 'date_select',
256 267
      'default_formatter' => 'date_default',
257 268
      'default_token_formatter' => 'date_plain',
258
      ) + $settings,
269
    ) + $settings,
259 270
    'date' => array(
260
      'label' => 'Date (ISO format)',
271
      'label' => t('Date (ISO format)'),
261 272
      'description' => t('Store a date in the database as an ISO date, recommended for historical or partial dates.'),
262 273
      'default_widget' => 'date_select',
263 274
      'default_formatter' => 'date_default',
264 275
      'default_token_formatter' => 'date_plain',
265
      ) + $settings,
276
    ) + $settings,
266 277
    'datestamp' => array(
267
      'label' => 'Date (Unix timestamp)',
278
      'label' => t('Date (Unix timestamp)'),
268 279
      'description' => t('Store a date in the database as a timestamp, deprecated format to support legacy data.'),
269 280
      'default_widget' => 'date_select',
270 281
      'default_formatter' => 'date_default',
271 282
      'default_token_formatter' => 'date_plain',
272
      ) + $settings,
283
    ) + $settings,
273 284
  );
274 285
}
275 286

  
......
294 305

  
295 306
  $info = array(
296 307
    'date_select' => array(
297
      'label' =>  t('Select list'),
308
      'label' => t('Select list'),
298 309
      'field types' => array('date', 'datestamp', 'datetime'),
299 310
    ) + $settings,
300 311
    'date_text' => array(
301
      'label' =>  t('Text field'),
312
      'label' => t('Text field'),
302 313
      'field types' => array('date', 'datestamp', 'datetime'),
303
     ) + $settings,
314
    ) + $settings,
304 315
  );
305 316

  
306 317
  if (module_exists('date_popup')) {
307 318
    $info['date_popup'] = array(
308
      'label' =>  t('Pop-up calendar'),
319
      'label' => t('Pop-up calendar'),
309 320
      'field types' => array('date', 'datestamp', 'datetime'),
310 321
    ) + $settings;
311 322
  }

Formats disponibles : Unified diff