diff --git a/i18n.install b/i18n.install index 4752a8f..7b7a81d 100644 --- a/i18n.install +++ b/i18n.install @@ -7,7 +7,7 @@ /** - * Implements hook_install() + * Implements hook_install(). */ function i18n_install() { // Set module weight for it to run after core modules @@ -15,7 +15,7 @@ function i18n_install() { } /** - * Implements hook_uninstall() + * Implements hook_uninstall(). */ function i18n_uninstall() { variable_del('i18n_drupal6_update'); @@ -30,7 +30,7 @@ function i18n_install_create_fields($table, $fields) { if (!empty($schema['fields'][$field]) && !db_field_exists($table, $field)) { db_add_field($table, $field, $schema['fields'][$field]); } - } + } } /** diff --git a/i18n.module b/i18n.module index b0ac098..8b63bba 100644 --- a/i18n.module +++ b/i18n.module @@ -12,7 +12,7 @@ * @author Jose A. Reyero, 2004 */ -// All multilingual options disabled +// All multilingual options disabled define('I18N_LANGUAGE_DISABLED', 0); // Language list will include all enabled languages define('I18N_LANGUAGE_ENABLED', 1); @@ -35,7 +35,7 @@ define('I18N_MODE_TRANSLATE', 4); define('I18N_MODE_MULTIPLE', I18N_MODE_LOCALIZE | I18N_MODE_TRANSLATE); /** - * Implements hook_boot() + * Implements hook_boot(). */ function i18n_boot() { // Just make sure the module is loaded for boot and the API is available. @@ -43,7 +43,7 @@ function i18n_boot() { /** * Get global language object, make sure it is initialized - * + * * @param $language * Language code or language object to convert to valid language object */ @@ -62,7 +62,7 @@ function i18n_language($language = NULL) { // We don't have language yet, initialize the language system and retry drupal_bootstrap(DRUPAL_BOOTSTRAP_LANGUAGE); } - return $GLOBALS['language']; + return $GLOBALS['language']; } } @@ -105,7 +105,7 @@ function i18n_language_field_extra() { /** * Get full language list - * + * * @todo See about creating a permission for seeing disabled languages */ function i18n_language_list($field = 'name', $mode = NULL) { @@ -115,7 +115,7 @@ function i18n_language_list($field = 'name', $mode = NULL) { /** * Get language name for any defined (enabled or not) language - * + * * @see locale_language_list() */ function i18n_language_name($lang) { @@ -138,7 +138,7 @@ function i18n_language_name($lang) { * Get valid language code for current page or check whether the code is a defined language */ function i18n_langcode($langcode = NULL) { - return $langcode && $langcode !== LANGUAGE_NONE ? $langcode : i18n_language()->language; + return $langcode && $langcode !== LANGUAGE_NONE ? $langcode : i18n_language()->language; } /** @@ -147,24 +147,24 @@ function i18n_langcode($langcode = NULL) { function i18n_help($path = 'admin/help#i18n', $arg) { switch ($path) { case 'admin/help#i18n' : - $output = '

'. t('This module improves support for multilingual content in Drupal sites:') .'

'; + $output = '

' . t('This module improves support for multilingual content in Drupal sites:') . '

'; $output .= ''; - $output .= '

'. t('This is the base module for several others adding different features:') .'

'; + $output .= '

' . t('This is the base module for several others adding different features:') . '

'; $output .= ''; - $output .= '

'. t('For more information, see the online handbook entry for Internationalization module.', array('@i18n' => 'http://drupal.org/node/133977')) .'

'; + $output .= '

' . t('For more information, see the online handbook entry for Internationalization module.', array('@i18n' => 'http://drupal.org/node/133977')) . '

'; return $output; case 'admin/config/language/i18n': $output = ''; return $output; } @@ -196,18 +196,18 @@ function i18n_menu() { /** * Switch select Mode on off if enabled - * + * * Usage for disabling content selection for a while then return to previous state - * + * * // Disable selection, but store previous mode * $previous = i18n_select(FALSE); - * + * * // Other code to be run without content selection here * .......................... - * + * * // Return to previous mode * i18n_select($previous); - * + * * @param $value * Optional, enable/disable selection: TRUE/FALSE * @return boolean @@ -280,7 +280,7 @@ function i18n_string($name, $string, $options = array()) { /** * Get language from context. - * + * * Depending on the page content we may need to use a different language for some operations. */ function i18n_context_language() { @@ -295,7 +295,7 @@ function i18n_context_language() { /** * Get object language code - * + * * @param $object * Object or array having language field or plain language field * @param $default diff --git a/i18n.test b/i18n.test index 5b02ec5..7cc60d6 100644 --- a/i18n.test +++ b/i18n.test @@ -1,5 +1,4 @@ getLanguage($langcode); if ($language->enabled) { $this->i18nGet($language, $path); - $this->assertRaw($text, $message . ' ' . $language->name . ': '. check_plain($text)); + $this->assertRaw($text, $message . ' ' . $language->name . ': ' . check_plain($text)); } } } @@ -376,7 +375,8 @@ class Drupali18nTestCase extends DrupalWebTestCase { } if (!empty($rows)) { $output .= theme('table', array('header' => $header, 'rows' => $rows)); - } else { + } + else { $output .= ' No rows'; } $output .= '
'; diff --git a/i18n.variable.inc b/i18n.variable.inc index 5a2aff4..f9c82f4 100644 --- a/i18n.variable.inc +++ b/i18n.variable.inc @@ -5,20 +5,20 @@ */ /** - * Implements hook_variable_group_info() + * Implements hook_variable_group_info(). */ function i18n_variable_group_info() { $groups['i18n'] = array( 'title' => t('Multilingual settings'), 'description' => t('Mixed options for multilingual sites.'), 'access' => 'administer site configuration', - 'path' => 'admin/config/regional/i18n', + 'path' => 'admin/config/regional/i18n', ); return $groups; } /** - * Implements hook_variable_info() + * Implements hook_variable_info(). */ function i18n_variable_info($options = array()) { $variables['i18n_language_list'] = array( @@ -33,7 +33,7 @@ function i18n_variable_info($options = array()) { } /** - * Implements hook_variable_type_info() + * Implements hook_variable_type_info(). */ function i18n_variable_type_info() { // Multiple variable per language options diff --git a/i18n_block/i18n_block.install b/i18n_block/i18n_block.install index d49cb2e..98234c6 100644 --- a/i18n_block/i18n_block.install +++ b/i18n_block/i18n_block.install @@ -6,7 +6,7 @@ */ /** - * Implements hook_install() + * Implements hook_install(). */ function i18n_block_install() { module_load_install('i18n'); @@ -20,7 +20,7 @@ function i18n_block_install() { } /** - * Implements hook_uninstall() + * Implements hook_uninstall(). */ function i18n_block_uninstall() { db_drop_field('block', 'i18n_mode'); @@ -63,7 +63,7 @@ function i18n_block_schema() { /** * Implements hook_schema_alter(). - * + * * Add block table i18n_mode field */ function i18n_block_schema_alter(&$schema) { diff --git a/i18n_block/i18n_block.module b/i18n_block/i18n_block.module index 9a01905..421cc36 100644 --- a/i18n_block/i18n_block.module +++ b/i18n_block/i18n_block.module @@ -126,7 +126,7 @@ function i18n_block_block_list_alter(&$blocks) { } /** - * Implements hook_block_view() + * Implements hook_block_view(). */ function i18n_block_block_view_alter(&$data, $block) { if (!empty($block->i18n_mode)) { @@ -157,7 +157,7 @@ function i18n_block_help($path, $arg) { } /** - * Implements hook_i18n_string_info() + * Implements hook_i18n_string_info(). */ function i18n_block_i18n_string_info() { $groups['blocks'] = array( @@ -170,7 +170,7 @@ function i18n_block_i18n_string_info() { } /** - * Implements hook_i18n_string_list() + * Implements hook_i18n_string_list(). */ function i18n_block_i18n_string_list($group) { if ($group == 'blocks' || $group == 'all') { @@ -340,7 +340,7 @@ function i18n_block_form_block_custom_block_delete_submit($form, &$form_state) { module_invoke('i18n_strings', 'remove', array('blocks', 'block', $form_state['values']['bid']), array('title', 'body') - ); + ); } /** diff --git a/i18n_contact/i18n_contact.module b/i18n_contact/i18n_contact.module index a9ff6f6..93053e7 100644 --- a/i18n_contact/i18n_contact.module +++ b/i18n_contact/i18n_contact.module @@ -88,7 +88,7 @@ function i18n_contact_i18n_string_info() { } /** - * Implements hook_i18n_string_list() + * Implements hook_i18n_string_list(). */ function i18n_contact_i18n_string_list($group) { if ($group == 'contact' || $group == 'all') { @@ -146,7 +146,7 @@ function i18n_contact_form_contact_category_edit_form_submit(&$form, $form_state * Implements hook_form_FORM_ID_alter(). */ function i18n_contact_form_contact_site_form_alter(&$form, &$form_state) { - foreach($form['cid']['#options'] as $key => $label) { + foreach ($form['cid']['#options'] as $key => $label) { $form['cid']['#options'][$key] = i18n_string("contact:category:$key:category", $label); } } diff --git a/i18n_field/i18n_field.install b/i18n_field/i18n_field.install index 88d08ab..d0e6348 100644 --- a/i18n_field/i18n_field.install +++ b/i18n_field/i18n_field.install @@ -6,18 +6,18 @@ */ /** - * Implements hook_install() + * Implements hook_install(). */ function i18n_field_install() { // If updating from D6, module changed name if (variable_get('i18n_drupal6_update')) { i18n_field_update_7000(); - } + } } /** - * Implements hook_i18n_drupal6_update - * + * Implements hook_i18n_drupal6_update(). + * * Update old string names */ function i18n_field_update_7000() { @@ -49,7 +49,7 @@ function i18n_field_update_7000() { // @todo Handle field options $string->objectid = '#allowed_values'; } - else { // + else { $string->objectid = 'user'; // Bundle for profile fields i18n_string_install_update_string($string); } @@ -59,16 +59,16 @@ function i18n_field_update_7000() { /** * Old strings to update. All these will be handled by i18n_field module - * + * * 'cck:field:'. $content_type .'-'. $field_name .':widget_label' * --> 'field:$field_name:$bundle:label' (though not used atm) * 'cck:field:'. $content_type .'-'. $field_name .':widget_description' * --> 'field:$field_name:$bundle:description' * 'cck:fieldgroup:'. $content_type .'-'. $group_name .':display_description' - * 'cck:fieldgroup:'. $content_type .'-'. $group_name .':form_description', $group['settings']['form']['description']); - * + * 'cck:fieldgroup:'. $content_type .'-'. $group_name .':form_description', $group['settings']['form']['description']); + * * Profile: * profile:field:$field_name:title|explanation|options * "profile:category", $field->category - * + * */ \ No newline at end of file diff --git a/i18n_field/i18n_field.module b/i18n_field/i18n_field.module index c36dbb0..fc73d7e 100644 --- a/i18n_field/i18n_field.module +++ b/i18n_field/i18n_field.module @@ -3,17 +3,17 @@ /** * @file * Internationalization (i18n) module - Field handling - * + * * Notes: * - Field titles are already translated with t(), which is a pity, but nothing to do here - * + * * For string keys we use: * - field:[field_name]:[bundle]:property, when it is an instance property (linked to bundle) * - field:[field_name]:#property..., when it is a field property (that may have multiple values) */ /** - * Implements hook_i18n_string_info() + * Implements hook_i18n_string_info(). */ function i18n_field_i18n_string_info() { $groups['field'] = array( @@ -26,15 +26,15 @@ function i18n_field_i18n_string_info() { } /** - * Implements hook_i18n_string_list() + * Implements hook_i18n_string_list(). */ function i18n_field_i18n_string_list($group) { if ($group == 'field' || $group == 'all') { $strings = array(); foreach (field_read_fields() as $field) { if (!empty($field['settings']['allowed_values']) && i18n_field_type_info($field['type'], 'translate_options')) { - $strings['field'][$field['field_name']]['#allowed_values'] = $field['settings']['allowed_values']; - } + $strings['field'][$field['field_name']]['#allowed_values'] = $field['settings']['allowed_values']; + } } foreach (field_read_instances() as $instance) { $add = array( @@ -46,19 +46,19 @@ function i18n_field_i18n_string_list($group) { if (isset($instance['default_value']) && i18n_field_type_info($field['type'], 'translate_default')) { $format = isset($instance['default_value'][0]['format']) ? $instance['default_value'][0]['format'] : NULL; $add['default_value'] = array( - 'string' => $instance['default_value'][0]['value'], - 'format' => $format, + 'string' => $instance['default_value'][0]['value'], + 'format' => $format, ); } $strings['field'][$instance['field_name']][$instance['bundle']] = $add; } return $strings; - } + } } /** * Implements hook_field_attach_form(). - * + * * After the form fields are built */ function i18n_field_field_attach_form($entity_type, $entity, $form, $form_state, $langcode) { @@ -66,7 +66,7 @@ function i18n_field_field_attach_form($entity_type, $entity, $form, $form_state, /** * Implements hook_field_info_alter(). - * + * * Cached, invoked only after field info is rebuilt */ function i18n_field_field_info_alter(&$info) { @@ -122,8 +122,8 @@ function i18n_field_field_formatter_view($entity_type, $entity, $field, $instanc } /** - * Implements hook_field_widget_info_alter() - * + * Implements hook_field_widget_info_alter(). + * * Cached, invoked only after widget info is rebuilt */ function i18n_field_field_widget_info_alter(&$info) { @@ -131,7 +131,7 @@ function i18n_field_field_widget_info_alter(&$info) { /** * Implements hook_field_widget_properties_alter(). - * + * * This is called for the entity edit form and for the fields edit form */ function i18n_field_field_widget_properties_alter(&$widget, $context) { @@ -148,7 +148,7 @@ function i18n_field_field_extra_fields_display_alter(&$displays, $context) { /** * Implements hook_field_display_alter(). - * + * * Called only when refreshing cache */ function i18n_field_field_display_alter(&$display, $context) { @@ -161,7 +161,7 @@ function i18n_field_field_storage_info_alter(&$info) { /** * Field API callback to rewrite field element - * + * * Translate: * - Description (help) * - Default value @@ -170,7 +170,7 @@ function i18n_field_field_storage_info_alter(&$info) { function i18n_field_field_widget_form($form, $form_state, $field, $instance, $langcode, $items, $delta, $element) { global $language; // The field language may affect some variables (default) but not others (description will be in current page language) - $langcode = empty($element['#language']) || $element['#language'] == LANGUAGE_NONE ? $language->language : $element['#language']; + $langcode = empty($element['#language']) || $element['#language'] == LANGUAGE_NONE ? $language->language : $element['#language']; $delta = $element['#delta']; $translate = array( @@ -179,12 +179,12 @@ function i18n_field_field_widget_form($form, $form_state, $field, $instance, $la ); foreach ($translate as $property => $options) { - + } // Translate field description if set if (!empty($instance['description'])) { $element['#description'] = i18n_field_translate_property($instance, 'description'); - } + } // Translate default value if exists and the current value is the default if (($translate = i18n_field_type_info($field['type'], 'translate_default')) && !empty($instance['default_value'][$delta]['value']) && !empty($items[$delta]['value']) && $instance['default_value'][$delta]['value'] === $items[$delta]['value']) { $items[$delta]['value'] = $translate($instance, $items[$delta]['value'], $langcode); @@ -203,21 +203,21 @@ function i18n_field_field_widget_form($form, $form_state, $field, $instance, $la } /** - * Implements hook_field_create_field() + * Implements hook_field_create_field(). */ function i18n_field_field_create_field($field) { i18n_field_field_update_strings($field); } /** - * Implements hook_field_create_instance(); + * Implements hook_field_create_instance(). */ function i18n_field_field_create_instance($instance) { i18n_field_instance_update_strings($instance); } /** - * Implements hook_field_delete_instance(); + * Implements hook_field_delete_instance(). */ function i18n_field_field_delete_instance($instance) { foreach (array('description', 'default_value') as $property) { @@ -226,14 +226,14 @@ function i18n_field_field_delete_instance($instance) { } /** - * Implements hook_field_update_instance(); + * Implements hook_field_update_instance(). */ function i18n_field_field_update_instance($instance, $prior_instance) { i18n_field_instance_update_strings($instance); } /** - * Implements hook_field_update_field() + * Implements hook_field_update_field(). */ function i18n_field_field_update_field($field) { i18n_field_field_update_strings($field); @@ -245,8 +245,8 @@ function i18n_field_field_update_field($field) { function i18n_field_field_update_strings($field) { // For select fields field:field_name if (!empty($field['settings']['allowed_values']) && i18n_field_type_info($field['type'], 'translate_options')) { - i18n_string_update(array('field', $field['field_name'],'#allowed_values'), $field['settings']['allowed_values']); - } + i18n_string_update(array('field', $field['field_name'], '#allowed_values'), $field['settings']['allowed_values']); + } } /** @@ -322,7 +322,7 @@ function i18n_field_type_info($type = NULL, $property = NULL) { } /** - * Implements hook_i18n_field_info() + * Implements hook_i18n_field_info(). */ function i18n_field_i18n_field_info() { $info['text'] = $info['text_long'] = $info['text_with_summary'] = array( diff --git a/i18n_menu/i18n_menu.admin.inc b/i18n_menu/i18n_menu.admin.inc index 5ab44bf..a830305 100644 --- a/i18n_menu/i18n_menu.admin.inc +++ b/i18n_menu/i18n_menu.admin.inc @@ -34,7 +34,7 @@ function i18n_menu_translation_form($form, $form_state, $menu = NULL, $item = NU $translations[$lang] = $item; } $item = $item ? $item : array('mlid' => 0, 'menu_name' => '', 'plid' => 0); - $item_lang = i18n_object_langcode($item); + $item_lang = i18n_object_langcode($item); $form['title'] = array( '#title' => t('Title'), '#type' => 'textfield', @@ -70,7 +70,7 @@ function i18n_menu_translation_form($form, $form_state, $menu = NULL, $item = NU '#default_value' => $default, '#options' => $options, '#description' => t('The maximum depth for a link and all its children is fixed at !maxdepth. Some menu links may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)), - '#attributes' => array('class' => array('menu-title-select')), + '#attributes' => array('class' => array('menu-title-select')), ); } } diff --git a/i18n_menu/i18n_menu.install b/i18n_menu/i18n_menu.install index 2609700..3c4e5ca 100644 --- a/i18n_menu/i18n_menu.install +++ b/i18n_menu/i18n_menu.install @@ -17,11 +17,11 @@ function i18n_menu_install() { // If updating from D6, module changed name if (variable_get('i18n_drupal6_update')) { i18n_menu_update_7000(); - } + } } /** - * Implements hook_uninstall() + * Implements hook_uninstall(). */ function i18n_menu_uninstall() { db_drop_field('menu_links', 'language'); @@ -31,11 +31,11 @@ function i18n_menu_uninstall() { } /** - * Implements hook_schema_alter() + * Implements hook_schema_alter(). */ function i18n_menu_schema_alter(&$schema) { $schema['menu_links']['fields']['language'] = array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => LANGUAGE_NONE); - $schema['menu_links']['fields']['i18n_tsid'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0); + $schema['menu_links']['fields']['i18n_tsid'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0); $schema['menu_custom']['fields']['i18n_mode'] = array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0); $schema['menu_custom']['fields']['language'] = array('type' => 'varchar', 'length' => 12, 'not null' => TRUE, 'default' => LANGUAGE_NONE); } diff --git a/i18n_node/i18n_node.features.inc b/i18n_node/i18n_node.features.inc index 0f77aaa..a04cae8 100644 --- a/i18n_node/i18n_node.features.inc +++ b/i18n_node/i18n_node.features.inc @@ -5,12 +5,12 @@ */ /** - * Implements hook_features_pipe_node_alter() + * Implements hook_features_pipe_node_alter(). */ function i18n_node_features_pipe_node_alter(&$pipe, $data, $export) { if (!empty($data) && module_exists('variable')) { variable_include(); - foreach(variable_list_module('i18n_node') as $variable) { + foreach (variable_list_module('i18n_node') as $variable) { if (isset($variable['multiple']) && $variable['multiple'] === 'node_type') { $children = variable_build($variable['name']); if (!empty($children['children'])) { diff --git a/i18n_node/i18n_node.install b/i18n_node/i18n_node.install index f4ef74f..e7900e4 100644 --- a/i18n_node/i18n_node.install +++ b/i18n_node/i18n_node.install @@ -12,23 +12,23 @@ function i18n_node_install() { // If updating from D6, module changed name if (variable_get('i18n_drupal6_update')) { i18n_node_update_7000(); - } + } } /** - * Implements hook_uninstall() + * Implements hook_uninstall(). */ function i18n_node_uninstall() { variable_del('i18n_hide_translation_links'); variable_del('i18n_selection_mode'); foreach (array_keys(node_type_get_types()) as $type) { - variable_del('i18n_node_'. $type); + variable_del('i18n_node_' . $type); } } /** - * Implements hook_i18n_update_drupal6 - * + * Implements hook_i18n_update_drupal6(). + * * Update old string names */ function i18n_node_update_7000() { diff --git a/i18n_node/i18n_node.pages.inc b/i18n_node/i18n_node.pages.inc index c46867e..0977d82 100644 --- a/i18n_node/i18n_node.pages.inc +++ b/i18n_node/i18n_node.pages.inc @@ -55,7 +55,7 @@ function i18n_node_translation_overview($node) { if ($langcode == LANGUAGE_NONE) { // Never show language neutral on the overview. continue; - } + } $options = array(); if (isset($translations[$langcode])) { // Existing translation in the translation set: display status. @@ -223,7 +223,7 @@ function i18n_node_autocomplete($type, $language, $string = '') { $matches = array(); foreach (_i18n_node_references($string, 'contains', $params) as $id => $row) { // Add a class wrapper for a few required CSS overrides. - $matches[$row['title'] ." [nid:$id]"] = '
'. $row['rendered'] . '
'; + $matches[$row['title'] . " [nid:$id]"] = '
' . $row['rendered'] . '
'; } drupal_json_output($matches); } @@ -233,7 +233,7 @@ function i18n_node_autocomplete($type, $language, $string = '') { */ function i18n_node_nid2autocomplete($nid) { if ($node = node_load($nid)) { - return check_plain($node->title) . ' [nid:' . $nid .']'; + return check_plain($node->title) . ' [nid:' . $nid . ']'; } else { return t('Not found'); @@ -284,7 +284,7 @@ function i18n_node_autocomplete2nid($name, $field = NULL, $type, $language) { */ function _i18n_node_references($string, $match = 'contains', $params = array(), $limit = 10) { $query = db_select('node', 'n') - ->fields('n', array('nid', 'title' ,'type')) + ->fields('n', array('nid', 'title' , 'type')) ->orderBy('n.title') ->orderBy('n.type') ->range(0, $limit); diff --git a/i18n_node/i18n_node.variable.inc b/i18n_node/i18n_node.variable.inc index 58d2c3c..a8c64f5 100644 --- a/i18n_node/i18n_node.variable.inc +++ b/i18n_node/i18n_node.variable.inc @@ -5,7 +5,7 @@ */ /** - * Implements hook_variable_info() + * Implements hook_variable_info(). */ function i18n_node_variable_info($options = array()) { $variables['i18n_hide_translation_links'] = array( @@ -57,5 +57,5 @@ function i18n_node_variable_extended_options($variable, $options) { I18N_LANGUAGE_ENABLED => t('Normal - All enabled languages will be allowed.', array(), $options), I18N_LANGUAGE_EXTENDED => t('Extended - All defined languages will be allowed.', array(), $options), I18N_LANGUAGE_EXTENDED | I18N_LANGUAGE_HIDDEN => t('Extended, but not displayed - All defined languages will be allowed for input, but not displayed in links.', array(), $options), - ); + ); } \ No newline at end of file diff --git a/i18n_path/i18n_path.admin.inc b/i18n_path/i18n_path.admin.inc index ba8f291..891ccb2 100644 --- a/i18n_path/i18n_path.admin.inc +++ b/i18n_path/i18n_path.admin.inc @@ -133,5 +133,5 @@ function i18n_path_save_translations($paths, $tpid = NULL) { } lock_release('i18n_path'); return $tpid; - } + } } \ No newline at end of file diff --git a/i18n_path/i18n_path.inc b/i18n_path/i18n_path.inc index 20735e2..ce8a38b 100644 --- a/i18n_path/i18n_path.inc +++ b/i18n_path/i18n_path.inc @@ -6,7 +6,7 @@ class i18n_path_translation_set extends i18n_translation_set { /** * Clean path translations. - * + * * Unlike other translation sets this actually deletes paths */ public function clean_translations() { diff --git a/i18n_path/i18n_path.install b/i18n_path/i18n_path.install index 83458f9..91e9efd 100644 --- a/i18n_path/i18n_path.install +++ b/i18n_path/i18n_path.install @@ -6,14 +6,14 @@ */ /** - * Implements hook_install() + * Implements hook_install(). */ function i18n_path_install() { - + } /** - * Implements hook_schema() + * Implements hook_schema(). */ function i18n_path_schema() { $schema['i18n_path'] = array( diff --git a/i18n_select/i18n_select.admin.inc b/i18n_select/i18n_select.admin.inc index abd5d21..fc7fea1 100644 --- a/i18n_select/i18n_select.admin.inc +++ b/i18n_select/i18n_select.admin.inc @@ -1,5 +1,10 @@ 'variable_fieldset', @@ -20,4 +25,3 @@ function i18n_select_admin_settings() { ); return system_settings_form($form); } - diff --git a/i18n_select/i18n_select.test b/i18n_select/i18n_select.test index db8077f..f4555a2 100644 --- a/i18n_select/i18n_select.test +++ b/i18n_select/i18n_select.test @@ -41,7 +41,7 @@ class i18nSelectTestCase extends Drupali18nTestCase { // Create some content and check selection modes $this->drupalLogin($this->translator); - + // variable_set('language_content_type_story', 1); $neutral = $this->drupalCreateNode(array('type' => 'page', 'promote' => 1)); $source = $this->createNode('page', $this->randomName(), $this->randomString(20), language_default('language'), array('field_tags[und]' => $tag_name = $this->randomName())); diff --git a/i18n_select/i18n_select.variable.inc b/i18n_select/i18n_select.variable.inc index f560375..5543e78 100644 --- a/i18n_select/i18n_select.variable.inc +++ b/i18n_select/i18n_select.variable.inc @@ -5,7 +5,7 @@ */ /** - * Implements hook_variable_info() + * Implements hook_variable_info(). */ function i18n_select_variable_info($options = array()) { $variables['i18n_select_nodes'] = array( @@ -30,7 +30,7 @@ function i18n_select_variable_info($options = array()) { } else { $title = t('Pages', array(), $options); - } + } $variables['i18n_select_page_mode'] = array( 'type' => 'select', 'options callback' => 'i18n_select_variable_option_list', @@ -69,5 +69,5 @@ function i18n_select_variable_option_list($variable, $options = array()) { if (module_exists('php')) { $options += array(I18N_SELECT_PAGE_PHP => t('Pages on which this PHP code returns TRUE (experts only)')); } - return $options; + return $options; } \ No newline at end of file diff --git a/i18n_string/i18n_string.admin.inc b/i18n_string/i18n_string.admin.inc index 14b3324..30f0d86 100644 --- a/i18n_string/i18n_string.admin.inc +++ b/i18n_string/i18n_string.admin.inc @@ -1,5 +1,10 @@ 'submit', '#value' => t('Refresh strings'), - '#suffix' => '

'. t('This will create all the missing strings for the selected text groups.') .'

', + '#suffix' => '

' . t('This will create all the missing strings for the selected text groups.') . '

', ); // Get all languages, except default language. $languages = locale_language_list('name', TRUE); @@ -40,7 +45,7 @@ function i18n_string_admin_refresh_form() { $form['update'] = array( '#type' => 'submit', '#value' => t('Update translations'), - '#suffix' => '

'. t('This will fetch all existing translations from the localization tables for the selected text groups and languages.') .'

', + '#suffix' => '

' . t('This will fetch all existing translations from the localization tables for the selected text groups and languages.') . '

', ); return $form; } @@ -85,15 +90,15 @@ function i18n_string_admin_update($language, $groups) { $result = $query->execute()->fetchAll(PDO::FETCH_OBJ); $count = 0; - foreach($result as $string) { + foreach ($result as $string) { // Just update strings when no text format, otherwise it could be dangerous under some circumstances. if (empty($string->format) && !empty($string->translation)) { $count++; db_insert(locales_target) ->fields(array( 'translation' => $string->translation, - 'lid' => $string->lid, - 'language' => $language, + 'lid' => $string->lid, + 'language' => $language, )) ->execute(); } @@ -204,7 +209,7 @@ function i18n_string_refresh_string_list($strings) { } i18n_string_update(array($textgroup, $type, $id, $key), $string, array('format' => $format)); $count++; - } + } } } } @@ -213,7 +218,7 @@ function i18n_string_refresh_string_list($strings) { /** * Create batch for refreshing strings - * + * * @param $groups * Array of text groups to refresh * @param $delete @@ -225,8 +230,8 @@ function i18n_string_refresh_batch($groups, $delete = FALSE) { $operations[] = array('_i18n_string_batch_refresh_prepare', array($group)); // First try to find string list $operations[] = array('_i18n_string_batch_refresh_list', array($group)); - // Then invoke refresh callback - $operations[] = array('_i18n_string_batch_refresh_callback', array($group)); + // Then invoke refresh callback + $operations[] = array('_i18n_string_batch_refresh_callback', array($group)); if ($delete) { $operations[] = array('_i18n_string_batch_refresh_cleanup', array($group)); } @@ -295,7 +300,7 @@ function _i18n_string_batch_refresh_summary($group, &$context) { drupal_set_message(t("Successfully refreshed @count strings for %group", array('@count' => $context['results'][$group]['refresh'], '%group' => i18n_string_group_info($group, 'title')))); if (!empty($context['results'][$group]['deleted'])) { drupal_set_message(t('Deleted @count left over strings.', array('@count' => $context['results'][$group]['deleted']))); - } + } } else { drupal_set_message(t("Cannot refresh strings for %group.", array('%group' => i18n_string_group_info($group, 'title'))), 'warning'); diff --git a/i18n_string/i18n_string.inc b/i18n_string/i18n_string.inc index 150276e..549a348 100644 --- a/i18n_string/i18n_string.inc +++ b/i18n_string/i18n_string.inc @@ -27,7 +27,7 @@ class i18n_string_default { */ public function build_string($context, $source, $options = array()) { // Set at least the default language to translate to - $string = new Stdclass(); + $string = new stdClass(); $string->textgroup = $this->textgroup; $string->source = $source; if (is_array($context)) { @@ -707,7 +707,7 @@ function i18n_string_l10n_client_save_string() { l10n_client_save_string(); } elseif (isset($_POST['source']) && isset($_POST['target']) && !empty($_POST['form_token']) && drupal_valid_token($_POST['form_token'], 'l10n_client_form')) { - $translation = new Stdclass(); + $translation = new stdClass(); $translation->language = $language->language; $translation->source = $_POST['source']; $translation->translation = $_POST['target']; diff --git a/i18n_string/i18n_string.install b/i18n_string/i18n_string.install index 78d8881..b5271c6 100644 --- a/i18n_string/i18n_string.install +++ b/i18n_string/i18n_string.install @@ -11,7 +11,7 @@ function i18n_string_enable() { // Refresh locales for enabled modules $modules = module_implements('i18n_string_refresh'); - i18n_string_modules_enabled($modules); + i18n_string_modules_enabled($modules); } /** @@ -128,7 +128,7 @@ function i18n_string_install_update_string($string) { $string->location = $string->textgroup . ':' . $string->context; $string->objectindex = (int)$string->objectid; drupal_write_record('i18n_string', $string, 'lid'); - drupal_write_record('locales_source', $string, 'lid'); + drupal_write_record('locales_source', $string, 'lid'); } /** @@ -144,7 +144,7 @@ function i18n_string_update_7000() { db_query("UPDATE {i18n_string} s SET s.textgroup = (SELECT l.textgroup FROM {locales_source} l WHERE l.lid = s.lid)"); // Populate context field. We could use CONCAT_WS but I guess this is more standard. db_query("UPDATE {i18n_string} SET context = CONCAT(type, ':', objectid, ':', property)"); - db_query("UPDATE {locales_source} s SET s.context = (SELECT l.context FROM {i18n_string} l WHERE l.lid = s.lid)"); + db_query("UPDATE {locales_source} s SET s.context = (SELECT l.context FROM {i18n_string} l WHERE l.lid = s.lid)"); } } diff --git a/i18n_string/i18n_string.pages.inc b/i18n_string/i18n_string.pages.inc index 4d3538c..d1b41c7 100644 --- a/i18n_string/i18n_string.pages.inc +++ b/i18n_string/i18n_string.pages.inc @@ -48,7 +48,7 @@ function i18n_string_translate_page_overview($form_meta) { else { // Try to figure out if this item has any of its properties translated. $translated = FALSE; - foreach($form_meta['#items'] as $item) { + foreach ($form_meta['#items'] as $item) { $str = i18n_string($item['#string_key'], $item['#default_value'], array('langcode' => $langcode, 'sanitize' => FALSE)); if ($str != $item['#default_value']) { $translated = TRUE; @@ -129,7 +129,7 @@ function i18n_string_translate_page_form($form, &$form_state, $form_meta, $langc 'i18n_string_translate_page_form_validate' ); $form['#redirect'] = array( - $form_meta['#translate'], + $form_meta['#translate'], ); return $form; } @@ -138,7 +138,7 @@ function i18n_string_translate_page_form($form, &$form_state, $form_meta, $langc * Validation submission callback for in-place string translation. */ function i18n_string_translate_page_form_validate($form, &$form_state) { - foreach($form_state['values']['strings'] as $key => $value) { + foreach ($form_state['values']['strings'] as $key => $value) { // We don't need to validate disabled form fields because those are already // validated by the FormAPI. if (empty($form['strings'][$key]['#i18n_string_format'])) { @@ -151,7 +151,7 @@ function i18n_string_translate_page_form_validate($form, &$form_state) { * Form submission callback for in-place string translation. */ function i18n_string_translate_page_form_submit($form, &$form_state) { - foreach($form_state['values']['strings'] as $key => $value) { + foreach ($form_state['values']['strings'] as $key => $value) { list($textgroup, $context) = i18n_string_context(explode(':', $key)); i18n_string_textgroup($textgroup)->update_translation($context, $form_state['values']['langcode'], $value); } diff --git a/i18n_string/i18n_string.test b/i18n_string/i18n_string.test index 90cadbc..b8b38ca 100644 --- a/i18n_string/i18n_string.test +++ b/i18n_string/i18n_string.test @@ -1,4 +1,10 @@ 'String translation API', diff --git a/i18n_string/i18n_string.variable.inc b/i18n_string/i18n_string.variable.inc index 0808981..6ef3791 100644 --- a/i18n_string/i18n_string.variable.inc +++ b/i18n_string/i18n_string.variable.inc @@ -5,7 +5,7 @@ */ /** - * Implements hook_variable_info() + * Implements hook_variable_info(). */ function i18n_string_variable_info($options = array()) { $variables['i18n_string_translate_langcode_[language]'] = array( diff --git a/i18n_sync/i18n_sync.features.inc b/i18n_sync/i18n_sync.features.inc index c708398..65be587 100644 --- a/i18n_sync/i18n_sync.features.inc +++ b/i18n_sync/i18n_sync.features.inc @@ -5,12 +5,12 @@ */ /** - * Implements hook_features_pipe_node_alter() + * Implements hook_features_pipe_node_alter(). */ function i18n_sync_features_pipe_node_alter(&$pipe, $data, $export) { if (!empty($data) && module_exists('variable')) { variable_include(); - foreach(variable_list_module('i18n_sync') as $variable) { + foreach (variable_list_module('i18n_sync') as $variable) { if (isset($variable['multiple']) && $variable['multiple'] === 'node_type') { $children = variable_build($variable['name']); if (!empty($children['children'])) { diff --git a/i18n_sync/i18n_sync.install b/i18n_sync/i18n_sync.install index 58396e4..1846535 100644 --- a/i18n_sync/i18n_sync.install +++ b/i18n_sync/i18n_sync.install @@ -21,7 +21,7 @@ function i18n_sync_install() { /* * Update variable names from Drupal 6 - */ + */ function i18n_sync_update_7000() { foreach (node_type_get_types() as $type => $info) { if ($fields = variable_get('i18nsync_nodeapi_' . $type)) { diff --git a/i18n_sync/i18n_sync.modules.inc b/i18n_sync/i18n_sync.modules.inc index 8b85737..1188e02 100644 --- a/i18n_sync/i18n_sync.modules.inc +++ b/i18n_sync/i18n_sync.modules.inc @@ -3,7 +3,7 @@ /** * @file * Internationalization (i18n) package. Synchronization of translations - * + * * Implements hook_i18n_sync_node_fields() for several core and contrib modules. */ @@ -13,7 +13,7 @@ function book_i18n_sync_options($entity_type, $bundle_name) { if ($entity_type == 'node') { return array( - 'parent' => array('title' =>t('Book outline'), 'description' => t('Set the translated parent for each translation if possible.')), + 'parent' => array('title' => t('Book outline'), 'description' => t('Set the translated parent for each translation if possible.')), ); } } diff --git a/i18n_sync/i18n_sync.node.inc b/i18n_sync/i18n_sync.node.inc index 7a530ae..cb5f725 100644 --- a/i18n_sync/i18n_sync.node.inc +++ b/i18n_sync/i18n_sync.node.inc @@ -3,7 +3,7 @@ /** * @file * Internationalization (i18n) package. Synchronization of translations - * + * * Node synchronization. */ @@ -54,7 +54,7 @@ function i18n_sync_node_translation($node, $translations, $fields, $op) { $count++; } i18n_sync(TRUE); - i18n_select(TRUE); + i18n_select(TRUE); drupal_set_message(format_plural($count, 'One node translation has been synchronized.', 'All @count node translations have been synchronized.')); } @@ -95,7 +95,7 @@ function i18n_sync_node_translation_default_field($node, $translation, $field) { if (isset($node->$field)) { $translation->$field = $node->$field; } - } + } } @@ -149,13 +149,13 @@ function i18n_sync_node_translation_filefield_field(&$node, &$translation, $fiel if (is_array($node->$field)) { $translated_images = array(); foreach ($node->$field as $file) { - $found = false; + $found = FALSE; // Try to find existing translations of the filefield items and reference them. foreach ($translation->$field as $translation_image) { if ($file['fid'] == $translation_image['fid']) { $translated_images[] = $translation_image; - $found = true; + $found = TRUE; } } @@ -194,7 +194,7 @@ function i18n_sync_node_translation_reference_field(&$reference_node, $default_v /** * Synchronize configurable field - * + * * @param $field_info * Field API field information. */ @@ -209,6 +209,6 @@ function i18n_sync_node_translation_field_field($node, $translation, $field, $fi if (isset($node->{$field}[$node->language])) { $translation->{$field}[$translation->language] = $node->{$field}[$node->language]; } - break; - } + break; + } } \ No newline at end of file diff --git a/i18n_sync/i18n_sync.variable.inc b/i18n_sync/i18n_sync.variable.inc index 1c22097..5f56940 100644 --- a/i18n_sync/i18n_sync.variable.inc +++ b/i18n_sync/i18n_sync.variable.inc @@ -5,7 +5,7 @@ */ /** - * Implements hook_variable_info() + * Implements hook_variable_info(). */ function i18n_sync_variable_info($options = array()) { $variables['i18n_sync_node_type_[node_type]'] = array( diff --git a/i18n_taxonomy/i18n_taxonomy.admin.inc b/i18n_taxonomy/i18n_taxonomy.admin.inc index 2c0fc02..6fdc29b 100644 --- a/i18n_taxonomy/i18n_taxonomy.admin.inc +++ b/i18n_taxonomy/i18n_taxonomy.admin.inc @@ -53,9 +53,9 @@ function i18n_taxonomy_term_translation_tab_page($term, $language = NULL) { ); if (!empty($term->description)) { $form_meta['#items'][] = array( - '#title' => t('Description'), - '#string_key' => array('taxonomy', 'term', $term->tid, 'description'), - '#default_value' => $term->description + '#title' => t('Description'), + '#string_key' => array('taxonomy', 'term', $term->tid, 'description'), + '#default_value' => $term->description ); } return i18n_string_translate_page($form_meta, $language); @@ -73,7 +73,7 @@ function i18n_taxonomy_translation_term_form($form, $form_state, $vocabulary, $t '#type' => 'fieldset', '#title' => t('Select translations'), '#description' => t('Select existing terms or type new ones that will be created for each language.'), - '#tree' => TRUE + '#tree' => TRUE ); // List of terms for languages. foreach (i18n_language_list() as $lang => $langname) { @@ -209,7 +209,7 @@ function i18n_taxonomy_translation_sets_overview($vocabulary) { // Get terms/translations for this vocab. $result = db_query('SELECT * FROM {taxonomy_term_data} t WHERE vid = :vid AND i18n_tsid > 0', array(':vid' => $vocabulary->vid)); $terms = $messages = array(); - foreach($result as $term) { + foreach ($result as $term) { if ($term->i18n_tsid && $term->language) { $terms[$term->i18n_tsid][$term->language] = $term; } @@ -220,7 +220,7 @@ function i18n_taxonomy_translation_sets_overview($vocabulary) { $thisrow = array(); foreach ($languages as $lang => $name) { if (array_key_exists($lang, $terms)) { - $thisrow[] = l($terms[$lang]->name, 'taxonomy/term/'. $terms[$lang]->tid); + $thisrow[] = l($terms[$lang]->name, 'taxonomy/term/' . $terms[$lang]->tid); } else { $thisrow[] = '--'; diff --git a/i18n_taxonomy/i18n_taxonomy.pages.inc b/i18n_taxonomy/i18n_taxonomy.pages.inc index d144f9c..e32d865 100644 --- a/i18n_taxonomy/i18n_taxonomy.pages.inc +++ b/i18n_taxonomy/i18n_taxonomy.pages.inc @@ -48,7 +48,7 @@ function i18n_taxonomy_term_page($term) { $build['pager'] = array( '#theme' => 'pager', '#weight' => 5, - ); + ); } else { $build['no_content'] = array( @@ -71,7 +71,7 @@ function i18n_taxonomy_term_page($term) { * @ingroup themeable */ function theme_i18n_taxonomy_term_page($tids, $result) { - drupal_add_css(drupal_get_path('module', 'taxonomy') .'/taxonomy.css'); + drupal_add_css(drupal_get_path('module', 'taxonomy') . '/taxonomy.css'); $output = ''; @@ -141,7 +141,7 @@ function _i18n_taxonomy_autocomplete($langcode, $vids, $tags_typed = '') { $query->addTag('i18n_select'); // Add language condition $query->condition('t.language', $langcode); - + // Do not select already entered terms. if (!empty($tags_typed)) { $query->condition('t.name', $tags_typed, 'NOT IN'); diff --git a/i18n_taxonomy/i18n_taxonomy.tokens.inc b/i18n_taxonomy/i18n_taxonomy.tokens.inc index fe3cfe9..a9a753a 100644 --- a/i18n_taxonomy/i18n_taxonomy.tokens.inc +++ b/i18n_taxonomy/i18n_taxonomy.tokens.inc @@ -57,7 +57,7 @@ function i18n_taxonomy_tokens($type, $tokens, array $data = array(), array $opti $replacements = array(); $sanitize = !empty($options['sanitize']); $langcode = isset($options['language']) ? $options['language']->language : i18n_langcode(); - + if ($type == 'term' && !empty($data['term'])) { $term = $data['term']; diff --git a/i18n_translation/i18n_translation.admin.inc b/i18n_translation/i18n_translation.admin.inc index e8527a5..fedee42 100644 --- a/i18n_translation/i18n_translation.admin.inc +++ b/i18n_translation/i18n_translation.admin.inc @@ -33,7 +33,7 @@ function i18n_translation_admin_form($form, &$form_state, $type = NULL, $tsids = $query->condition('t.tsid', $tsids); } $tsids = $query - ->fields('t',array('tsid')) + ->fields('t', array('tsid')) ->limit(50) ->orderByHeader($header) ->execute() @@ -57,7 +57,7 @@ function i18n_translation_admin_form($form, &$form_state, $type = NULL, $tsids = 'title' => t('edit'), 'href' => $path, 'query' => $destination, - ); + ); } if (count($operations) > 1) { // Render an unordered list of operations links. diff --git a/i18n_translation/i18n_translation.inc b/i18n_translation/i18n_translation.inc index 9386cb8..ec99776 100644 --- a/i18n_translation/i18n_translation.inc +++ b/i18n_translation/i18n_translation.inc @@ -11,7 +11,7 @@ class i18n_translation_set { public $master_id = 0; // Translations indexed by language public $translations = NULL; - + /** * Constructor from object/array */ @@ -82,7 +82,7 @@ class i18n_translation_set { /** * Clean all items in this translation set - * + * * Unlink other items (not current translations from this translation set) */ public function clean_translations() { @@ -90,7 +90,7 @@ class i18n_translation_set { $query = db_update($table) ->fields(array($field => 0)) ->condition($field, $this->tsid); - if ($translations = $this->get_translations()) { + if ($translations = $this->get_translations()) { $query->condition('language', array_keys($translations), 'NOT IN'); } return $query->execute(); @@ -111,11 +111,10 @@ class i18n_translation_set { return $this->delete_translations(); } } - } /** * Delete translations in this translation set - * + * * It won't delete objects, just unlink them from translation set */ public function delete_translations() { @@ -282,6 +281,6 @@ class i18n_translation_set { */ protected function key_field() { $info = i18n_object_info($this->type); - return $info['key']; + return $info['key']; } } \ No newline at end of file diff --git a/i18n_translation/i18n_translation.install b/i18n_translation/i18n_translation.install index 75ee058..d809fce 100644 --- a/i18n_translation/i18n_translation.install +++ b/i18n_translation/i18n_translation.install @@ -6,14 +6,14 @@ */ /** - * Implements hook_install() + * Implements hook_install(). */ function i18n_translation_install() { - + } /** - * Implements hook_schema() + * Implements hook_schema(). */ function i18n_translation_schema() { $schema['i18n_translation_set'] = array( diff --git a/i18n_variable/i18n_variable.admin.inc b/i18n_variable/i18n_variable.admin.inc index b3d4cbf..6aee4e0 100644 --- a/i18n_variable/i18n_variable.admin.inc +++ b/i18n_variable/i18n_variable.admin.inc @@ -6,11 +6,11 @@ /** * Select multilingual variables - * - * There are two lists of variables here. + * + * There are two lists of variables here. * - i18n_variable_conf, list with high level variable names, some of which are multiple variables * - i18n_variable_list, translated list into actual variable names - * + * * Aditional variables to be make translatable can be set into $conf['i18n_variables'] as for older versions */ function i18n_variable_admin_settings($form, $form_state) { diff --git a/i18n_variable/i18n_variable.install b/i18n_variable/i18n_variable.install index 801f599..ebcaa3a 100644 --- a/i18n_variable/i18n_variable.install +++ b/i18n_variable/i18n_variable.install @@ -6,7 +6,7 @@ */ /** - * Implements hook_install() + * Implements hook_install(). */ function i18n_variable_install() { // Set module weight for it to run before most modules, but after variable_realm diff --git a/i18n_variable/i18n_variable.variable.inc b/i18n_variable/i18n_variable.variable.inc index 6fdd8e0..c4371f1 100644 --- a/i18n_variable/i18n_variable.variable.inc +++ b/i18n_variable/i18n_variable.variable.inc @@ -5,7 +5,7 @@ */ /** - * Implements hook_variable_info() + * Implements hook_variable_info(). */ function i18n_variable_variable_info($options = array()) { $variables['i18n_variable_conf'] = array(