Index: country_code.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/country_code/country_code.module,v
retrieving revision 1.51
diff -u -p -r1.51 country_code.module
--- country_code.module	21 Oct 2008 16:46:49 -0000	1.51
+++ country_code.module	21 Oct 2008 17:56:21 -0000
@@ -434,11 +434,21 @@ function country_code_block($op = 'list'
  * Remove links not supported by current country.
  */
 function country_code_link_alter(&$links, &$node) {
+  $languages = country_code_languages(country_code());
   foreach($links as $module => $link) {
     if (strpos($module, 'node_translation') === 0) {
+
+      // If a link points to a translation from a different country to the
+      // current node, remove it.
       if (substr($link['language']->language, -3, 3) != substr($node->language, -3, 3)) {
         unset($links[$module]);
       }
+
+      // If the link is for a two digit language like 'en', and this language
+      // is not enabled for the current user's country, remove it.
+      if (strlen($link['language']->language) == 2 && !isset($languages[$link['language']->language])) {
+        unset ($links[$module]);
+      }
     }
   }
 }