diff --git a/experimental/i18nsync.module b/experimental/i18nsync.module index 4375d911ebfb494e972fa5695f15755542d2cd26..881af9549819e33aa54393444d01cdaca9be94f1 100644 --- a/experimental/i18nsync.module +++ b/experimental/i18nsync.module @@ -139,7 +139,7 @@ function i18nsync_node_translation($node, $translation, $fields) { switch($field) { case 'parent': // Book outlines, translating parent page if exists case 'iid': // Attached image nodes - i18nsync_node_translation_attached_node(&$node, &$translation, $field); + i18nsync_node_translation_attached_node($node, $translation, $field); break; case 'files': // Sync existing attached files diff --git a/i18n.module b/i18n.module index 64eb6fbf816f93dc2296dc94542a7b09ee226ee5..407f755e7bd413c5bcad19284036cecaff472df5 100644 --- a/i18n.module +++ b/i18n.module @@ -70,6 +70,11 @@ function i18n_block($op = 'list', $delta = 0) { */ function i18n_init(){ global $i18n_langpath; + // If not in bootstrap, variable init. This may go before the rest of the code because some variables may need to be loaded + if(!_i18n_is_bootstrap()){ + //include drupal_get_path('module', 'i18n').'/i18n.inc'; + i18n_variable_init(); + } $lang = i18n_get_lang(); $path = _i18n_get_original_path(); // Init selection mode @@ -94,11 +99,7 @@ function i18n_init(){ //search alias with and without lang and remove lang. $_GET['q'] = i18n_get_normal_path($path); } - // If not in bootstrap, variable init - if(!_i18n_is_bootstrap()){ - //include drupal_get_path('module', 'i18n').'/i18n.inc'; - i18n_variable_init(); - } + } /** @@ -117,7 +118,7 @@ function i18n_help($section = 'admin/help#i18n' ) { $output .= '
  • '.t('Support for long locale names').'
  • '; $output .= '
  • '.t('Multilingual menu items').'
  • '; $output .= ''; - $output .= '

    '. t('For more information please read the on-line help pages.', array('@i18n' =>'http://drupal.org/node/31631')) .'

    '; + $output .= '

    '. t('For more information please read the on-line help pages.', array('@i18n' =>'http://drupal.org/node/133977')) .'

    '; return $output; case 'admin/settings/i18n': $output .= '

    '.t('To enable multilingual support for specific content types go to !configure_content_types.', array('!configure_content_types' => l(t('configure content types'), 'admin/content/types'), )).'

    '; diff --git a/i18nblocks/i18nblocks.install b/i18nblocks/i18nblocks.install index 9a5645ce5848f6974cba9611e9680fee5fb5049a..49e556d55c425a22ac43bea19e5a56a831f139e5 100644 --- a/i18nblocks/i18nblocks.install +++ b/i18nblocks/i18nblocks.install @@ -37,6 +37,8 @@ function i18nblocks_install() { module varchar(64) NOT NULL DEFAULT '', delta varchar(32) NOT NULL DEFAULT '0', PRIMARY KEY (bid,language))"); + // Sequences + db_query("CREATE SEQUENCE {i18n_blocks}_delta_seq INCREMENT 1 START 1"); break; } db_query("UPDATE {system} SET weight = 20 WHERE name = 'i18nblocks' AND type = 'module'");