Projet

Général

Profil

Révision 9d13637e

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

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/addressfield/plugins/format/address.inc
104 104
    '#empty_value' => '',
105 105
    '#size' => 10,
106 106
    '#prefix' => ' ',
107
    '#render_option_value' => $address_format['render_administrative_area_value'],
107 108
    '#attributes' => array(
108 109
      'class' => array('state'),
109 110
      'x-autocompletetype' => 'region',
......
138 139
  }
139 140

  
140 141
  // Country-specific customizations.
141
  if (in_array($address['country'], array('AU', 'NZ', 'RU'))) {
142
  if (in_array($address['country'], array('AU', 'EE', 'LT', 'LV', 'NZ', 'RU'))) {
142 143
    // These countries don't use the "Address 2" line.
143 144
    // Leave it as a precaution, but hide the label to avoid confusing users.
144 145
    $format['street_block']['thoroughfare']['#title'] = t('Address');
......
152 153
  elseif ($address['country'] == 'BR') {
153 154
    $format['locality_block']['dependent_locality']['#suffix'] = $clearfix;
154 155
    $format['locality_block']['dependent_locality']['#tag'] = 'div';
155
    $format['locality_block']['administrative_area']['#render_option_value'] = TRUE;
156 156
    $format['locality_block']['administrative_area']['#suffix'] = $clearfix;
157 157
    $format['locality_block']['postal_code']['#tag'] = 'div';
158 158
    // Change some titles to make translation easier.
......
188 188
    $format['locality_block']['administrative_area']['#size'] = '30';
189 189
  }
190 190
  elseif ($address['country'] == 'ID') {
191
    $format['locality_block']['administrative_area']['#render_option_value'] = TRUE;
192 191
    $format['locality_block']['administrative_area']['#weight'] = 1;
193 192
  }
194 193
  elseif ($address['country'] == 'JP') {
......
198 197
    $format['locality_block']['postal_code']['#size'] = 30;
199 198
    $format['locality_block']['administrative_area']['#weight'] = 20;
200 199
    $format['locality_block']['administrative_area']['#size'] = 30;
201
    $format['locality_block']['administrative_area']['#render_option_value'] = TRUE;
202 200
    $format['locality_block']['locality']['#weight'] = 30;
203 201
    $format['street_block']['#weight'] = 20;
204 202
  }

Formats disponibles : Unified diff