Projet

Général

Profil

Révision 76df55b7

Ajouté par Benjamin Luce il y a presque 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/i18n/i18n.info
8 8
files[] = i18n.test
9 9
configure = admin/config/regional/i18n
10 10

  
11
; Information added by Drupal.org packaging script on 2015-01-26
12
version = "7.x-1.12"
11
; Information added by Drupal.org packaging script on 2015-05-07
12
version = "7.x-1.13"
13 13
core = "7.x"
14 14
project = "i18n"
15
datestamp = "1422286982"
15
datestamp = "1430999922"
16 16

  
drupal7/sites/all/modules/i18n/i18n.test
362 362
  function resetCaches() {
363 363
    drupal_static_reset('locale_url_outbound_alter');
364 364
    drupal_static_reset('language_list');
365
    drupal_language_initialize();
365 366
  }
366 367

  
367 368
  /**
drupal7/sites/all/modules/i18n/i18n_block/i18n_block.info
8 8
files[] = i18n_block.test
9 9

  
10 10

  
11
; Information added by Drupal.org packaging script on 2015-01-26
12
version = "7.x-1.12"
11
; Information added by Drupal.org packaging script on 2015-05-07
12
version = "7.x-1.13"
13 13
core = "7.x"
14 14
project = "i18n"
15
datestamp = "1422286982"
15
datestamp = "1430999922"
16 16

  
drupal7/sites/all/modules/i18n/i18n_contact/i18n_contact.info
5 5
package = Multilingual - Internationalization
6 6
core = 7.x
7 7

  
8
; Information added by Drupal.org packaging script on 2015-01-26
9
version = "7.x-1.12"
8
; Information added by Drupal.org packaging script on 2015-05-07
9
version = "7.x-1.13"
10 10
core = "7.x"
11 11
project = "i18n"
12
datestamp = "1422286982"
12
datestamp = "1430999922"
13 13

  
drupal7/sites/all/modules/i18n/i18n_field/i18n_field.info
6 6
core = 7.x
7 7
files[] = i18n_field.inc
8 8
files[] = i18n_field.test
9
; Information added by Drupal.org packaging script on 2015-01-26
10
version = "7.x-1.12"
9
; Information added by Drupal.org packaging script on 2015-05-07
10
version = "7.x-1.13"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1422286982"
13
datestamp = "1430999922"
14 14

  
drupal7/sites/all/modules/i18n/i18n_forum/i18n_forum.info
7 7
core = 7.x
8 8
files[] = i18n_forum.test
9 9

  
10
; Information added by Drupal.org packaging script on 2015-01-26
11
version = "7.x-1.12"
10
; Information added by Drupal.org packaging script on 2015-05-07
11
version = "7.x-1.13"
12 12
core = "7.x"
13 13
project = "i18n"
14
datestamp = "1422286982"
14
datestamp = "1430999922"
15 15

  
drupal7/sites/all/modules/i18n/i18n_menu/i18n_menu.info
10 10
files[] = i18n_menu.inc
11 11
files[] = i18n_menu.test
12 12

  
13
; Information added by Drupal.org packaging script on 2015-01-26
14
version = "7.x-1.12"
13
; Information added by Drupal.org packaging script on 2015-05-07
14
version = "7.x-1.13"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1422286982"
17
datestamp = "1430999922"
18 18

  
drupal7/sites/all/modules/i18n/i18n_menu/i18n_menu.module
588 588
    // If the title callback is 't' and the link title matches the router title
589 589
    // it will be localized by core, not by i18n_menu.
590 590
    if (!$router ||
591
        (empty($router['title_callback']) || $router['title_callback'] != 't') ||
591
        (empty($router['title_callback']) || ($router['title_callback'] != 't' || !empty($link['customized']))) ||
592 592
        (empty($router['title']) || $router['title'] != $link['link_title'])
593 593
    ) {
594 594
      $props[] = 'title';
......
597 597
  if (!empty($link['options']['attributes']['title'])) {
598 598
    // If the description matches the router description, it will be localized
599 599
    // by core.
600
    if (!$router || empty($router['description']) || $router['description'] != $link['options']['attributes']['title']) {
600
    if (!$router || empty($router['description']) || ($router['description'] != $link['options']['attributes']['title']) || !empty($link['customized'])) {
601 601
      $props[] = 'description';
602 602
    }
603 603
  }
drupal7/sites/all/modules/i18n/i18n_node/i18n_node.info
9 9
files[]=i18n_node.test
10 10
files[]=i18n_node.variable.inc
11 11

  
12
; Information added by Drupal.org packaging script on 2015-01-26
13
version = "7.x-1.12"
12
; Information added by Drupal.org packaging script on 2015-05-07
13
version = "7.x-1.13"
14 14
core = "7.x"
15 15
project = "i18n"
16
datestamp = "1422286982"
16
datestamp = "1430999922"
17 17

  
drupal7/sites/all/modules/i18n/i18n_path/i18n_path.info
6 6

  
7 7
files[] = i18n_path.inc
8 8
files[] = i18n_path.test
9
; Information added by Drupal.org packaging script on 2015-01-26
10
version = "7.x-1.12"
9
; Information added by Drupal.org packaging script on 2015-05-07
10
version = "7.x-1.13"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1422286982"
13
datestamp = "1430999922"
14 14

  
drupal7/sites/all/modules/i18n/i18n_redirect/i18n_redirect.info
4 4
package = Multilingual - Internationalization
5 5
core = 7.x
6 6

  
7
; Information added by Drupal.org packaging script on 2015-01-26
8
version = "7.x-1.12"
7
; Information added by Drupal.org packaging script on 2015-05-07
8
version = "7.x-1.13"
9 9
core = "7.x"
10 10
project = "i18n"
11
datestamp = "1422286982"
11
datestamp = "1430999922"
12 12

  
drupal7/sites/all/modules/i18n/i18n_select/i18n_select.info
6 6
configure = admin/config/regional/i18n/select
7 7
files[] = i18n_select.test
8 8

  
9
; Information added by Drupal.org packaging script on 2015-01-26
10
version = "7.x-1.12"
9
; Information added by Drupal.org packaging script on 2015-05-07
10
version = "7.x-1.13"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1422286982"
13
datestamp = "1430999922"
14 14

  
drupal7/sites/all/modules/i18n/i18n_string/i18n_string.info
10 10
files[] = i18n_string.test
11 11
configure = admin/config/regional/i18n/strings
12 12

  
13
; Information added by Drupal.org packaging script on 2015-01-26
14
version = "7.x-1.12"
13
; Information added by Drupal.org packaging script on 2015-05-07
14
version = "7.x-1.13"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1422286982"
17
datestamp = "1430999922"
18 18

  
drupal7/sites/all/modules/i18n/i18n_string/i18n_string.install
29 29
    i18n_string_update_7001();
30 30
  }
31 31
  // Create new index in {locales_source}, performance improvement in sites with i18n.
32
  db_add_index('locales_source', 'textgroup_context', array('textgroup', 'context'));
32
  if (!db_index_exists('locales_source', 'textgroup_context')) {
33
    db_add_index('locales_source', 'textgroup_context', array('textgroup', array('context', 50)));
34
  }
33 35
}
34 36

  
35 37
/**
......
106 108
    ),
107 109
    'primary key' => array('lid'),
108 110
    'indexes' => array(
109
      'group_context' => array('textgroup', 'context'),
111
      'group_context' => array('textgroup', array('context', 50)),
110 112
    ),
111 113
  );
112 114
  return $schema;
......
238 240
 *  Create new index in {locales_source}, performance improvement in sites with i18n.
239 241
 */
240 242
function i18n_string_update_7002() {
241
  db_add_index('locales_source', 'textgroup_context', array('textgroup', 'context'));
243
  if (!db_index_exists('locales_source', 'textgroup_context')) {
244
    db_add_index('locales_source', 'textgroup_context', array('textgroup', array('context', 50)));
245
  }
242 246
}
243 247

  
244 248

  
......
269 273
 * Node type
270 274
 *  nodetype:type:[type]:[property] -> node:type:[type]:[property]
271 275
 *  Property names: title -> title_label
272
 */
276
 */
drupal7/sites/all/modules/i18n/i18n_string/i18n_string.test
53 53
        $this->assertEqual($translation, $translations[$key][$language->language], "The right $language->name ($language->language) translation has been retrieved for $name, $translation");
54 54
      }
55 55
    }
56

  
57
    // Test that regular strings can be translated. Use 'Built-in interface' as
58
    // filter, and translate first one.
59
    $search = array(
60
      'language' => 'all',
61
      'translation' => 'all',
62
      'group' => 'default',
63
      'string' => '',
64
    );
65
    $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
66
    $this->clickLink(t('edit'));
67
    // Just add a random translation.
68
    $translation = $this->randomString();
69
    $edit = array();
70
    foreach ($this->getOtherLanguages() as $language) {
71
      $langcode = $language->language;
72
      $edit["translations[$langcode]"] = $translation;
73
    }
74
    $this->drupalPost(NULL, $edit, t('Save translations'));
75
    $this->assertText(t('The string has been saved.'), t('The string has been saved.'));
76
    $this->assertEqual($this->getUrl(), url('admin/config/regional/translate/translate', array('absolute' => TRUE)), t('Correct page redirection.'));
77

  
56 78
  }
57 79

  
58 80
  /**
drupal7/sites/all/modules/i18n/i18n_sync/i18n_sync.info
10 10
files[] = i18n_sync.module.inc
11 11
files[] = i18n_sync.node.inc
12 12
files[] = i18n_sync.test
13
; Information added by Drupal.org packaging script on 2015-01-26
14
version = "7.x-1.12"
13
; Information added by Drupal.org packaging script on 2015-05-07
14
version = "7.x-1.13"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1422286982"
17
datestamp = "1430999922"
18 18

  
drupal7/sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.info
11 11
files[] = i18n_taxonomy.admin.inc
12 12
files[] = i18n_taxonomy.test
13 13

  
14
; Information added by Drupal.org packaging script on 2015-01-26
15
version = "7.x-1.12"
14
; Information added by Drupal.org packaging script on 2015-05-07
15
version = "7.x-1.13"
16 16
core = "7.x"
17 17
project = "i18n"
18
datestamp = "1422286982"
18
datestamp = "1430999922"
19 19

  
drupal7/sites/all/modules/i18n/i18n_translation/i18n_translation.info
6 6

  
7 7
files[] = i18n_translation.inc
8 8

  
9
; Information added by Drupal.org packaging script on 2015-01-26
10
version = "7.x-1.12"
9
; Information added by Drupal.org packaging script on 2015-05-07
10
version = "7.x-1.13"
11 11
core = "7.x"
12 12
project = "i18n"
13
datestamp = "1422286982"
13
datestamp = "1430999922"
14 14

  
drupal7/sites/all/modules/i18n/i18n_user/i18n_user.info
4 4
package = Multilingual - Internationalization
5 5
dependencies[] = i18n_variable
6 6

  
7
; Information added by Drupal.org packaging script on 2015-01-26
8
version = "7.x-1.12"
7
; Information added by Drupal.org packaging script on 2015-05-07
8
version = "7.x-1.13"
9 9
core = "7.x"
10 10
project = "i18n"
11
datestamp = "1422286982"
11
datestamp = "1430999922"
12 12

  
drupal7/sites/all/modules/i18n/i18n_user/i18n_user.module
54 54
 */
55 55
function i18n_user_user_pass_reset_url($account) {
56 56
  $timestamp = REQUEST_TIME;
57
  return url("user/reset/$account->uid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE, 'language' => i18n_language($account->language)));
57
  return url("user/reset/$account->uid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid), array('absolute' => TRUE, 'language' => i18n_language($account->language)));
58 58
}
59 59

  
60 60
/**
......
65 65
 */
66 66
function i18n_user_user_cancel_url($account) {
67 67
  $timestamp = REQUEST_TIME;
68
  return url("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE, 'language' => i18n_language($account->language)));
68
  return url("user/$account->uid/cancel/confirm/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login, $account->uid), array('absolute' => TRUE, 'language' => i18n_language($account->language)));
69 69
}
drupal7/sites/all/modules/i18n/i18n_variable/i18n_variable.info
10 10
files[] = i18n_variable.class.inc
11 11
files[] = i18n_variable.test
12 12

  
13
; Information added by Drupal.org packaging script on 2015-01-26
14
version = "7.x-1.12"
13
; Information added by Drupal.org packaging script on 2015-05-07
14
version = "7.x-1.13"
15 15
core = "7.x"
16 16
project = "i18n"
17
datestamp = "1422286982"
17
datestamp = "1430999922"
18 18

  
drupal7/sites/all/modules/i18n/tests/i18n_test.info
7 7
core = 6.x
8 8
hidden = TRUE
9 9

  
10
; Information added by Drupal.org packaging script on 2015-01-26
11
version = "7.x-1.12"
10
; Information added by Drupal.org packaging script on 2015-05-07
11
version = "7.x-1.13"
12 12
core = "7.x"
13 13
project = "i18n"
14
datestamp = "1422286982"
14
datestamp = "1430999922"
15 15

  

Formats disponibles : Unified diff