Index: languageicons.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/languageicons.admin.inc,v retrieving revision 1.7 diff -u -p -r1.7 languageicons.admin.inc --- languageicons.admin.inc 2 Mar 2010 15:31:11 -0000 1.7 +++ languageicons.admin.inc 10 Dec 2010 00:21:05 -0000 @@ -1,5 +1,5 @@ 'fieldset', '#title' => t('Add language icons'), Index: languageicons.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/languageicons.info,v retrieving revision 1.4 diff -u -p -r1.4 languageicons.info --- languageicons.info 2 Mar 2010 15:31:11 -0000 1.4 +++ languageicons.info 10 Dec 2010 00:21:05 -0000 @@ -4,6 +4,13 @@ dependencies[] = locale package = Multilanguage core = 7.x -files[] = languageicons.module +; Information added by drupal.org packaging script on 2010-12-04 +version = "6.x-2.x-dev" +core = 7.x +project = "languageicons" +datestamp = "1291464962" + + files[] = languageicons.admin.inc files[] = languageicons.install +files[] = languageicons.module Index: languageicons.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/languageicons.install,v retrieving revision 1.5 diff -u -p -r1.5 languageicons.install --- languageicons.install 2 Mar 2010 15:31:11 -0000 1.5 +++ languageicons.install 10 Dec 2010 00:21:05 -0000 @@ -1,5 +1,5 @@ ' . t('This module manages language icons for multilingual sites:') . '

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

' . t('For more information, please see the online handbook section.', array('@handbook' => 'http://drupal.org/node/133977')) . '

'; 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' => url('admin/content/types'))) . '

'; + case 'admin/config/languageicons': + $output .= '

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

'; return $output; } } @@ -47,7 +47,7 @@ function languageicons_help($path, $arg) * Implements hook_menu(). */ function languageicons_menu() { - $items['admin/config/regional/language/icons'] = array( + $items['admin/config/language/icons'] = array( 'title' => 'Icons', 'page callback' => 'drupal_get_form', 'page arguments' => array('languageicons_admin_settings'), @@ -73,14 +73,18 @@ function languageicons_translation_link_ } /** - * Implements hook_language_switch_links_alter(). + * Implements hook_link_alter(). * * Adds language icons to node links. */ -function languageicons_language_switch_links_alter(array &$links, $type, $path) { - if (variable_get('languageicons_show_node', 1) && module_exists('translation') && $paths = module_invoke('translation', 'path_get_translations', $path)) { - foreach ($links as $langcode => $link) { - languageicons_link_add($links[$langcode]); +function languageicons_link_alter(&$links, $node) { + 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; + if (!empty($links[$index])) { + languageicons_link_add($links[$index]); + } } } } @@ -93,15 +97,8 @@ function languageicons_language_switch_l function languageicons_link_add(&$link, $title = NULL) { $language = isset($link['language_icon']) ? $link['language_icon'] : $link['language']; $title = $title ? $title : $link['title']; - $icon = theme('languageicons_icon', array( - 'language' => $language, - 'title' => $title, - )); - if ($icon) { - $link['title'] = theme('languageicons_place', array( - 'text' => $link['title'], - 'icon' => $icon, - )); + if ($icon = theme('languageicons_icon', array('language' => $language, 'title' => $title))) { + $link['title'] = theme('languageicons_place', array('text' => $link['title'], 'icon' => $icon)); $link['html'] = TRUE; } } @@ -112,12 +109,8 @@ function languageicons_link_add(&$link, * This function can be overridden for no language icons. */ function theme_languageicons_icon($variables) { - // Merge in default values - $variables += array('title' => NULL); - $language = $variables['language']; - $title = $variables['title']; - + $title = $variables['title']; 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; @@ -140,13 +133,9 @@ function theme_languageicons_icon($varia * @ingroup themeable */ function theme_languageicons_place($variables) { - // Merge in default values - $variables += array('separator' => ' '); - $text = $variables['text']; $icon = $variables['icon']; $separator = $variables['separator']; - switch (variable_get('languageicons_placement', 'before')) { case 'after': return $text . $separator . $icon; Index: translations/hu.po =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/languageicons/translations/hu.po,v retrieving revision 1.2 diff -u -p -r1.2 hu.po --- translations/hu.po 11 Nov 2008 19:05:59 -0000 1.2 +++ translations/hu.po 10 Dec 2010 00:21:05 -0000 @@ -1,121 +1,74 @@ -# $Id: hu.po,v 1.2 2008/11/11 19:05:59 freso Exp $ -# -# Hungarian translation of Drupal module languageicons -# Copyright Balogh Zoltán -# Generated from files: -# languageicons.admin.inc,v 1.1.2.2 2008/08/11 17:25:55 freso -# languageicons.module,v 1.2.2.3 2008/08/16 13:16:24 freso -# languageicons.info: n/a +# Hungarian translation of Language icons (6.x-2.0) +# Copyright (c) 2010 by the Hungarian translation team # msgid "" msgstr "" -"Project-Id-Version: Drupal module languageicons\n" -"POT-Creation-Date: 2008-10-01 14:45+0200\n" -"PO-Revision-Date: 2008-10-17 12:17+0100\n" -"Last-Translator: Balogh Zoltán \n" -"Language-Team: Drupal fordítási csapat \n" +"Project-Id-Version: Language icons (6.x-2.0)\n" +"POT-Creation-Date: 2010-09-30 09:27+0000\n" +"PO-Revision-Date: 2010-09-30 09:26+0000\n" +"Language-Team: Hungarian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../languageicons.admin.inc:18 +msgid "Image size" +msgstr "Képméret" +msgid "Icons" +msgstr "Ikonok" +msgid "Node links" +msgstr "Tartalom hivatkozások" +msgid "Image size for language icons, in the form \"width x height\"." +msgstr "" +"A nyelvi ikonok képmérete „szélesség x magasság” " +"formátumban." +msgid "Multilanguage" +msgstr "Többnyelvűség" msgid "Add language icons" msgstr "Nyelvi ikonok hozzáadása" - -#: ../languageicons.admin.inc:19 msgid "Link types to add language icons." -msgstr "Hivatkozás típusok a nyelvi ikonok hozzáadásához" - -#: ../languageicons.admin.inc:23 -msgid "Node links" -msgstr "Tartalmi hivatkozások" - -#: ../languageicons.admin.inc:28 +msgstr "Hivatkozástípusok a nyelvi ikonok hozzáadásához." msgid "Language switcher block" -msgstr "Nyelv kiválasztó blokk" - -#: ../languageicons.admin.inc:33 +msgstr "Nyelvi választó blokk" msgid "Icon placement" msgstr "Ikon elhelyezése" - -#: ../languageicons.admin.inc:34 -msgid "Before" -msgstr "Előtte" - -#: ../languageicons.admin.inc:34 -msgid "After" -msgstr "Utána" - -#: ../languageicons.admin.inc:34 -msgid "Replace" -msgstr "Helyette" - -#: ../languageicons.admin.inc:36 msgid "Where to display the icon, relative to the link title." msgstr "A hivatkozáshoz képest hol jelenjen meg az ikon." - -#: ../languageicons.admin.inc:40 msgid "Icons file path" msgstr "Ikonok elérési útja" - -#: ../languageicons.admin.inc:44 -msgid "Path for language icons, relative to Drupal installation. '*' is a placeholder for language code." -msgstr "A nyelvi ikonok elérési útja a Drupal telepítési könyvtárához képest. A „*” jelöli a nyelv kódját." - -#: ../languageicons.admin.inc:48 -msgid "Image size" -msgstr "Kép mérete" - -#: ../languageicons.admin.inc:52 -msgid "Image size for language icons, in the form \"width x height\"." -msgstr "A nyelvi ikonok képmérete „szélesség x magasság” formátumban." - -#: ../languageicons.module:33 msgid "This module manages language icons for multilingual sites:" -msgstr "Ez a modul kezeli a nyelvi ikonokat a többnyelvű oldalakon:" - -#: ../languageicons.module:35 -msgid "Automatically adds icons to language links" -msgstr "Automatikusan ikont rendel a nyelvi hivatkozásokhoz" - -#: ../languageicons.module:36 -msgid "Provides related theme functions" -msgstr "Gondoskodik a kapcsolódó smink függvényekről" - -#: ../languageicons.module:38 -msgid "For more information please read the on-line help pages." -msgstr "Bővebb információ a súgó oldalon." - -#: ../languageicons.module:41 -msgid "To enable multilingual support for specific content types go to !configure_content_types." -msgstr "Az egyes tartalom típusok több nyelven történő kezelésének bekapcsolása a !configure_content_types oldalon." - -#: ../languageicons.module:41 -msgid "configure content types" -msgstr "tartalom típusok beállítása" - -#: ../languageicons.module:51 -msgid "Configure" -msgstr "Beállítás" - -#: ../languageicons.module:58 -msgid "Icons" -msgstr "Ikonok" - -#: ../languageicons.module:0 -msgid "languageicons" -msgstr "languageicons" - -#: ../languageicons.info:0 -msgid "Language Icons" -msgstr "Language Icons" - -#: ../languageicons.info:0 +msgstr "Ez a modul kezeli a nyelvi ikonokat a többnyelvű webhelyeken:" msgid "Adds icons to language links." msgstr "Ikonokat rendel a nyelvi hivatkozásokhoz." - -#: ../languageicons.info:0 -msgid "Multilanguage" -msgstr "Többnyelvűség" - +msgid "" +"To enable multilingual support for specific content types go to configure content types." +msgstr "" +"Az egyes tartalomtípusok többnyelvű támogatásának " +"engedélyezése a tartalomtípusok beállítása " +"oldalon végezhető el." +msgid "Before link" +msgstr "Hivatkozás előtt" +msgid "After link" +msgstr "Hivatkozás után" +msgid "Replace link" +msgstr "Hivatkozás helyett" +msgid "" +"Path for language icons, relative to Drupal installation. \"*\" is a " +"placeholder for language code." +msgstr "" +"A nyelvi ikonok relatív útvonala a Drupal telepítéshez képest. A " +"„*” karakter a helykitöltő a nyelvkód számra." +msgid "Automatically adds icons to language links." +msgstr "Ikonokat rendel automatikusan a nyelvi hivatkozásokhoz." +msgid "Provides related theme functions." +msgstr "A kapcsolódó sminkfüggvényeket adja." +msgid "" +"For more information, please see the online " +"handbook section." +msgstr "" +"További információk a kézikönyvben " +"találhatóak." +msgid "Language icons" +msgstr "Language icons"