Index: languageicons.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/Attic/languageicons.admin.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 languageicons.admin.inc --- languageicons.admin.inc 11 Aug 2008 15:16:16 -0000 1.1.2.1 +++ languageicons.admin.inc 11 Aug 2008 17:21:02 -0000 @@ -38,7 +38,7 @@ function languageicons_admin_settings() $form['languageicons_path'] = array( '#type' => 'textfield', '#title' => t('Icons file path'), - '#default_value' => variable_get('languageicons_path', drupal_get_path('module', 'languageicons').'/flags/*.png'), + '#default_value' => variable_get('languageicons_path', drupal_get_path('module', 'languageicons') .'/flags/*.png'), '#size' => 70, '#maxlength' => 180, '#description' => t('Path for language icons, relative to Drupal installation. \'*\' is a placeholder for language code.'), Index: languageicons.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/languageicons.info,v retrieving revision 1.1 diff -u -p -r1.1 languageicons.info --- languageicons.info 27 Jul 2008 18:22:52 -0000 1.1 +++ languageicons.info 11 Aug 2008 17:21:02 -0000 @@ -2,5 +2,4 @@ name = Language Icons description = Adds icons to language links. dependencies[] = locale package = Multilanguage -version = VERSION -core = 6.x \ No newline at end of file +core = 6.x Index: languageicons.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/languageicons.module,v retrieving revision 1.2.2.1 diff -u -p -r1.2.2.1 languageicons.module --- languageicons.module 11 Aug 2008 15:16:16 -0000 1.2.2.1 +++ languageicons.module 11 Aug 2008 17:21:02 -0000 @@ -3,15 +3,15 @@ /** * @file - * Icons for language links - * - * This is a spinf off from Internationalization (i18n) package - * + * Icons for language links. + * + * This is a spin off from the Internationalization (i18n) package. + * * @author Jose A. Reyero, 2007 */ /** - * Implementation of hook_theme() + * Implementation of hook_theme(). */ function languageicons_theme() { return array( @@ -27,18 +27,18 @@ function languageicons_theme() { /** * Implementation of hook_help(). */ -function languageicons_help($section = 'admin/help#languageicons' ) { - switch ($section) { +function languageicons_help($path, $arg) { + switch ($path) { case 'admin/help#languageicons' : - $output = '

'.t('This module manages language icons for multilingual sites:').'

'; + $output = '

'. t('This module manages language icons for multilingual sites:') .'

'; $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/31631')) .'

'; return $output; case 'admin/settings/languageicons': - $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'), )).'

'; + $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'))) .'

'; return $output; } } @@ -88,7 +88,7 @@ function languageicons_link_alter(&$link if (variable_get('languageicons_show_node', 1) && (!empty($node->tnid)) && $translations = module_invoke('translation', 'node_get_translations', $node->tnid)) { $languages = language_list(); foreach ($translations as $langcode => $translation) { - $index = 'node_translation_'.$langcode; + $index = 'node_translation_'. $langcode; if (!empty($links[$index])) { languageicons_link_add($links[$index]); } @@ -97,42 +97,42 @@ function languageicons_link_alter(&$link } /** - * Add language icon to link - * - * The language icon may be a different language as the destination page, can be passed in 'language_icon' + * Add language icon to link. + * + * The language icon may be a different language as the destination page, can be passed in 'language_icon'. */ function languageicons_link_add(&$link, $title = NULL) { $language = isset($link['language_icon']) ? $link['language_icon'] : $link['language']; $title = $title ? $title : $link['title']; if ($icon = theme('languageicons_icon', $language, $title)) { $link['title'] = theme('languageicons_place', $link['title'], $icon); - $link['html'] = TRUE; + $link['html'] = TRUE; } } /** - * Theme language icon - * - * This function can be overridden for no language icons + * Theme language icon. + * + * This function can be overridden for no language icons. */ -function theme_languageicons_icon($language, $title = NULL){ - if ($path = variable_get('languageicons_path', drupal_get_path('module', 'languageicons').'/flags/*.png')) { - $src = base_path().str_replace('*', $language->language, $path); +function theme_languageicons_icon($language, $title = NULL) { + if ($path = variable_get('languageicons_path', drupal_get_path('module', 'languageicons') .'/flags/*.png')) { + $src = base_path() . str_replace('*', $language->language, $path); $title = $title ? $title : $language->native; $attribs = array('class' => 'language-icon', 'alt' => $title); if ($size = variable_get('languageicons_size', '16x12')) { list($width, $height) = explode('x', $size); $attribs += array('width' => $width, 'height' => $height); } - return ""; + return "'; } } /** - * Theme language icon and text + * Theme language icon and text. */ function theme_languageicons_place($text, $icon, $separator = ' ') { - switch(variable_get('languageicons_placement', 'before')) { + switch (variable_get('languageicons_placement', 'before')) { case 'after': return $text . $separator . $icon; case 'replace':