diff -up tweetbutton/tweetbutton.admin.inc tweetbutton.modified/tweetbutton.admin.inc
--- tweetbutton/tweetbutton.admin.inc	2010-11-02 03:02:41.000000000 -0700
+++ tweetbutton.modified/tweetbutton.admin.inc	2010-12-08 10:35:09.000000000 -0800
@@ -41,7 +41,7 @@ function tweetbutton_admin_settings() {
   
   $form['button']['tweetbutton_language'] = array(
     '#title' => t('Language'),
-    '#description' => t('This is the language that the button will render in on your website. People will see the Tweet dialog in their selected language for Twitter.com.'),
+    '#description' => t('This is the language that the button will render in on your website. People will see the Tweet dialog in their selected language for Twitter.com. If <strong>all</strong> of the languages on your site are available in this list, you can choose "Automatic."'),
     '#type' => 'select',
     '#options' => array(
       'en' => t('English'),
@@ -49,10 +49,11 @@ function tweetbutton_admin_settings() {
       'de' => t('German'),
       'es' => t('Spanish'),
       'ja' => t('Japanese'),
+      'auto' => t('Automatic'),
     ),
     '#default_value' => variable_get('tweetbutton_language',''),
   );
-  
+
   $form['follow'] = array(
     '#type' => 'fieldset',
     '#title' => t('Recommend people to follow'),
diff -up tweetbutton/tweetbutton.module tweetbutton.modified/tweetbutton.module
--- tweetbutton/tweetbutton.module	2010-11-02 03:02:41.000000000 -0700
+++ tweetbutton.modified/tweetbutton.module	2010-12-08 10:42:48.000000000 -0800
@@ -133,6 +133,7 @@ function tweetbutton_get_attributes($ent
     'entity_type' => 'node',
   );
   
+  global $language;
   $options += $default_option;
   $attributes =  array(
     'data-count'   => $options['type'],
@@ -140,7 +141,7 @@ function tweetbutton_get_attributes($ent
     'data-related' => $options['rel_account'] . ':' . $options['rel_desc'],
     'data-text'    => token_replace($options['text'], $options['entity_type'], $entity),
     'data-url'     => $options['url']? $options['url']: url('node/' . $entity->nid, array('absolute' => TRUE)),
-    'data-lang'    => $options['language'],
+    'data-lang'    => $options['language'] == 'auto' ? $language->language : $options['language'],
   );
 
   return $attributes;