Index: /extensions/TweetThis/admin.php =================================================================== --- /extensions/TweetThis/admin.php (revision 15121) +++ /extensions/TweetThis/admin.php (revision 15122) @@ -5,14 +5,16 @@ load_language('plugin.lang', TWEET_PATH); -$conf['TweetThis'] = explode(',', $conf['TweetThis']); +$conf['TweetThis'] = unserialize($conf['TweetThis']); if (isset($_POST['submit'])) { $conf['TweetThis'] = array( - $_POST['button_style'], - $_POST['position'], + 'size' => $_POST['button_size'], + 'position' => $_POST['position'], + 'count' => isset($_POST['count']), + 'via' => trim($_POST['via']), ); - conf_update_param('TweetThis', implode(',', $conf['TweetThis'])); + conf_update_param('TweetThis', serialize($conf['TweetThis'])); array_push($page['infos'], l10n('Information data registered in database')); @@ -22,6 +24,8 @@ $template->assign(array( - 'button_style' => $conf['TweetThis'][0], - 'position' => $conf['TweetThis'][1], + 'button_size' => $conf['TweetThis']['size'], + 'position' => $conf['TweetThis']['position'], + 'count_check' => $conf['TweetThis']['count'] ? 'checked="checked"' : null, + 'via' => $conf['TweetThis']['via'], 'TWEET_PATH' => TWEET_PATH, )); Index: /extensions/TweetThis/admin.tpl =================================================================== --- /extensions/TweetThis/admin.tpl (revision 15121) +++ /extensions/TweetThis/admin.tpl (revision 15122) @@ -8,79 +8,33 @@
- | - | - | + | ||
+ {'Button size'|@translate} + | +|||||
- | - | ||||
- | - | - | + | ||
+ + | ++ + | ||||
- | - | - | - | ||
+ | {'Button position on picture page'|@translate} | -+ | @@ -88,6 +42,14 @@ | ||
+ {'Via'|@translate} + | ++ @ + | +||||
+ | Index: /extensions/TweetThis/language/ca_ES/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/ca_ES/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/ca_ES/plugin.lang.php (revision 15122) @@ -23,5 +23,4 @@ $lang['Bottom'] = 'Inferior'; $lang['Button position on picture page'] = 'Posició del botó a la pàgina de la imatge'; -$lang['Share on Twitter'] = 'Compartir a Twitter'; $lang['Toolbar'] = 'Barra d\'eines'; $lang['Top'] = 'Superior'; Index: /extensions/TweetThis/language/cs_CZ/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/cs_CZ/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/cs_CZ/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Dole'; $lang['Toolbar'] = 'Panel nástrojů'; -$lang['Share on Twitter'] = 'Sdílet na Twitteru'; ?> Index: /extensions/TweetThis/language/de_DE/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/de_DE/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/de_DE/plugin.lang.php (revision 15122) @@ -23,5 +23,4 @@ $lang['Bottom'] = 'Unten'; $lang['Button position on picture page'] = 'Tastenposition auf der Bilderseite'; -$lang['Share on Twitter'] = 'Auf Twitter teilen'; $lang['Toolbar'] = 'Symbolleiste'; $lang['Top'] = 'Oben'; Index: /extensions/TweetThis/language/el_GR/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/el_GR/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/el_GR/plugin.lang.php (revision 15122) @@ -23,5 +23,4 @@ $lang['Bottom'] = 'Κάτω μέρος'; $lang['Button position on picture page'] = 'θέση Κουμπιού στη σελίδα της εικόνας'; -$lang['Share on Twitter'] = 'Μοιραστείτε το στο Twitter'; $lang['Toolbar'] = 'Γραμμή Εργαλείων'; $lang['Top'] = 'Κορυφή'; Index: /extensions/TweetThis/language/en_UK/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/en_UK/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/en_UK/plugin.lang.php (revision 15122) @@ -5,5 +5,7 @@ $lang['Bottom'] = 'Bottom'; $lang['Toolbar'] = 'Toolbar'; -$lang['Share on Twitter'] = 'Share on Twitter'; +$lang['Button size'] = 'Button size'; +$lang['Display counter'] = 'Display counts'; +$lang['Via'] = 'Via'; ?> Index: /extensions/TweetThis/language/es_ES/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/es_ES/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/es_ES/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Abajo'; $lang['Toolbar'] = 'Barra de herramientas'; -$lang['Share on Twitter'] = 'Compartir en Twitter'; ?> Index: /extensions/TweetThis/language/fr_FR/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/fr_FR/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/fr_FR/plugin.lang.php (revision 15122) @@ -5,5 +5,7 @@ $lang['Bottom'] = 'Bas'; $lang['Toolbar'] = 'Barre d\'outils'; -$lang['Share on Twitter'] = 'Partager sur Twitter'; +$lang['Button size'] = 'Taille du bouton'; +$lang['Display counter'] = 'Afficcher le compteur'; +$lang['Via'] = 'Via'; ?> Index: /extensions/TweetThis/language/hu_HU/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/hu_HU/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/hu_HU/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Lent'; $lang['Toolbar'] = 'Eszköztár'; -$lang['Share on Twitter'] = 'Megosztás a Twitteren'; ?> Index: /extensions/TweetThis/language/it_IT/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/it_IT/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/it_IT/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Basso'; $lang['Toolbar'] = 'Barra degli strumenti'; -$lang['Share on Twitter'] = 'Condividere su Twitter'; ?> Index: /extensions/TweetThis/language/lv_LV/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/lv_LV/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/lv_LV/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Apakšā'; $lang['Toolbar'] = 'Rīkjoslā'; -$lang['Share on Twitter'] = 'Dalīties Tviterī'; ?> Index: /extensions/TweetThis/language/nl_NL/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/nl_NL/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/nl_NL/plugin.lang.php (revision 15122) @@ -4,5 +4,4 @@ $lang['Bottom'] = 'Onder'; $lang['Toolbar'] = 'Werkbalk'; -$lang['Share on Twitter'] = 'Deel op Twitter'; $lang['Button position on picture page'] = 'Knop positie op afbeelding pagina'; Index: /extensions/TweetThis/language/pl_PL/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/pl_PL/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/pl_PL/plugin.lang.php (revision 15122) @@ -21,5 +21,4 @@ // | USA. | // +-----------------------------------------------------------------------+ -$lang['Share on Twitter'] = 'Udostępnij na Twitterze'; $lang['Bottom'] = 'Dół'; $lang['Button position on picture page'] = 'Miejsce umieszczenia przycisku'; Index: /extensions/TweetThis/language/pt_PT/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/pt_PT/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/pt_PT/plugin.lang.php (revision 15122) @@ -23,5 +23,4 @@ $lang['Bottom'] = 'Base'; $lang['Button position on picture page'] = 'Posição do botão na página da foto'; -$lang['Share on Twitter'] = 'Partilhar no Twiter'; $lang['Toolbar'] = 'Barra de tarefas'; $lang['Top'] = 'Topo'; Index: /extensions/TweetThis/language/ru_RU/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/ru_RU/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/ru_RU/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Внизу'; $lang['Toolbar'] = 'На панели инструментов'; -$lang['Share on Twitter'] = 'Опубликовать в Twitter'; ?> Index: /extensions/TweetThis/language/sk_SK/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/sk_SK/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/sk_SK/plugin.lang.php (revision 15122) @@ -4,5 +4,4 @@ $lang['Bottom'] = 'Dole'; $lang['Toolbar'] = 'Lišta nástrojov'; -$lang['Share on Twitter'] = 'Zdieľať na Twitteri'; $lang['Button position on picture page'] = 'Tlačidlo pozície na stránke fotiek'; Index: /extensions/TweetThis/language/sv_SE/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/sv_SE/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/sv_SE/plugin.lang.php (revision 15122) @@ -4,5 +4,4 @@ $lang['Bottom'] = 'Botten'; $lang['Toolbar'] = 'Verktygsfältet'; -$lang['Share on Twitter'] = 'Dela på Twitter'; $lang['Button position on picture page'] = 'Knappens position på sidan'; Index: /extensions/TweetThis/language/tr_TR/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/tr_TR/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/tr_TR/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Alt'; $lang['Toolbar'] = 'menübar'; -$lang['Share on Twitter'] = 'Twitter\'da paylaş'; ?> Index: /extensions/TweetThis/language/uk_UA/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/uk_UA/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/uk_UA/plugin.lang.php (revision 15122) @@ -21,5 +21,4 @@ // | USA. | // +-----------------------------------------------------------------------+ -$lang['Share on Twitter'] = 'Поділитись на Twitter'; $lang['Bottom'] = 'Низ'; $lang['Button position on picture page'] = 'Положення кнопки на сторінці зображення'; Index: /extensions/TweetThis/language/vi_VN/plugin.lang.php =================================================================== --- /extensions/TweetThis/language/vi_VN/plugin.lang.php (revision 15121) +++ /extensions/TweetThis/language/vi_VN/plugin.lang.php (revision 15122) @@ -5,5 +5,4 @@ $lang['Bottom'] = 'Dưới cùng'; $lang['Toolbar'] = 'Thanh công cụ'; -$lang['Share on Twitter'] = 'Chia sẻ qua Twitter'; ?> Index: /extensions/TweetThis/main.inc.php =================================================================== --- /extensions/TweetThis/main.inc.php (revision 15121) +++ /extensions/TweetThis/main.inc.php (revision 15122) @@ -20,56 +20,41 @@ function tweet_add_button() { - global $conf, $template; - $conf['TweetThis'] = explode(',', $conf['TweetThis']); + global $conf, $template, $user; + + $conf['TweetThis'] = unserialize($conf['TweetThis']); + $conf['TweetThis']['lang'] = array( + 'no','de','zh-cn','en','pl','sv','zh-tw','tr','es','th','fa','hu','pt','it','ar','he', + 'ko','id','ru','ja','da','fi','hi','ur','fr','nl', + ); + + $template->assign(array( + 'TWEET_SIZE' => $conf['TweetThis']['size'], + 'TWEET_COUNT' => $conf['TweetThis']['count'], + 'TWEET_VIA' => $conf['TweetThis']['via'], + )); if (script_basename() == 'picture') { - $template->assign(array( - 'TWEET_IMAGE' => $conf['TweetThis'][0], - 'TWEET_POSITON' => $conf['TweetThis'][1], - )); - + $template->assign('TWEET_POSITON', $conf['TweetThis']['position']); $template->set_prefilter('picture', 'tweet_add_button_prefilter'); } else if (script_basename() == 'index') { - $template->assign(array( - 'TWEET_IMAGE' => $conf['TweetThis'][0], - 'TWEET_POSITON' => 'index', - )); - + $template->assign('TWEET_POSITON', 'index'); $template->set_prefilter('index', 'tweet_add_button_prefilter'); } - // html change a bit if we use custom button, or official with counter - if ( in_array( $conf['TweetThis'][0], array('none','horizontal','vertical') ) ) + // button language + if ( in_array(str_replace('_','-',strtolower($user['language'])), $conf['TweetThis']['lang']) ) { - $template->assign(array( - 'TWEET_IFRAME' => true, - 'TWEET_COUNTER' => $conf['TweetThis'][0], - )); + $template->assign('TWEET_LANG', str_replace('_','-',strtolower($user['language']))); + } + if ( in_array(substr($user['language'],0,2), $conf['TweetThis']['lang']) ) + { + $template->assign('TWEET_LANG', substr($user['language'],0,2)); } else { - $template->assign(array( - 'TWEET_IFRAME' => false, - 'TWEET_COUNTER' => 'none', - )); - } - - // if the link is in the toolbar, we must use smallier buttons - if ( script_basename() == 'index' OR $conf['TweetThis'][1] == 'toolbar') - { - switch ($conf['TweetThis'][0]) - { - case 'vertical': - $template->assign('TWEET_COUNTER', 'horizontal'); break; - case 't_logo-a': - $template->assign('TWEET_IMAGE', 't_small-a'); break; - case 't_logo-b': - $template->assign('TWEET_IMAGE', 't_small-b'); break; - case 't_logo-c': - $template->assign('TWEET_IMAGE', 't_small-c'); break; - } + $template->assign('TWEET_LANG', 'en'); } } @@ -79,51 +64,29 @@ global $template; + $replace = '{combine_script id=\'twitter_widgets\' path=\'http://platform.twitter.com/widgets.js} + Tweet'; + switch ($template->get_template_vars('TWEET_POSITON')) { case 'top': $search = ' |