Index: country_code.views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/country_code/country_code.views.inc,v
retrieving revision 1.13
diff -u -r1.13 country_code.views.inc
--- country_code.views.inc	28 Oct 2008 20:46:34 -0000	1.13
+++ country_code.views.inc	26 Nov 2008 05:56:04 -0000
@@ -64,7 +64,7 @@
     // Current country field.
     $data['node']['country_code_current'] = array(
       'title' => t("Current country's language"),
-      'help' => t("Content for the current country language, with a generic language fallback. If the current language is fr-CA for Canadian French, this filter will show content in the fr-CA language or, if there isn't such a translation, a fr version."),
+      'help' => t("Content for the current country language, with a generic language fallback. If the current language is fr-ca for Canadian French, this filter will show content in the fr-ca language or, if there isn't such a translation, a fr version."),
       'filter' => array(
         'field' => 'language',
         'handler' => 'country_code_handler_filter_node_country_current',
Index: country_code_handler_filter_node_country.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/country_code/country_code_handler_filter_node_country.inc,v
retrieving revision 1.10
diff -u -r1.10 country_code_handler_filter_node_country.inc
--- country_code_handler_filter_node_country.inc	30 Oct 2008 20:10:56 -0000	1.10
+++ country_code_handler_filter_node_country.inc	26 Nov 2008 05:56:04 -0000
@@ -34,10 +34,10 @@
     $language_substrings = array();
     $options = array();
     foreach ($this->value as $value) {
-      // The search strings include a dash(-), e.g., -CA, so we begin at the 3rd
+      // The search strings include a dash(-), e.g., -ca, so we begin at the 3rd
       // character.
       $options[] = "SUBSTRING({$this->table_alias}.{$this->real_field}, 3) = '%s'";
-      $language_substrings[] = '-' . strtoupper($value);
+      $language_substrings[] = '-' . $value;
     }
 
     $where = ' (' . implode(" OR ", $options) . ')';
Index: country_code.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/country_code/country_code.module,v
retrieving revision 1.93
diff -u -r1.93 country_code.module
--- country_code.module	12 Nov 2008 14:41:59 -0000	1.93
+++ country_code.module	26 Nov 2008 05:56:04 -0000
@@ -826,13 +826,11 @@
     }
     // Otherwise, return a country's languages.
     else {
-      // Upper case is  used for countries in the language codes.
-      $country_upper = strtoupper($country);
       if ($enabled) {
-        $result = db_query("SELECT c.language, g.language as language_short, g.name, g.native, c.weight FROM {languages} c INNER JOIN {languages} g ON SUBSTRING(c.language, 1, 2) = g.language WHERE SUBSTRING(c.language, 4) = '%s' AND c.enabled = 1 ORDER BY c.weight, c.name", $country_upper);
+        $result = db_query("SELECT c.language, g.language as language_short, g.name, g.native, c.weight FROM {languages} c INNER JOIN {languages} g ON SUBSTRING(c.language, 1, 2) = g.language WHERE SUBSTRING(c.language, 4) = '%s' AND c.enabled = 1 ORDER BY c.weight, c.name", $country);
       }
       else {
-        $result = db_query("SELECT c.language, g.language as language_short, g.name, g.native, c.weight FROM {languages} c INNER JOIN {languages} g ON SUBSTRING(c.language, 1, 2) = g.language WHERE SUBSTRING(c.language, 4) = '%s' ORDER BY c.weight, c.name", $country_upper);
+        $result = db_query("SELECT c.language, g.language as language_short, g.name, g.native, c.weight FROM {languages} c INNER JOIN {languages} g ON SUBSTRING(c.language, 1, 2) = g.language WHERE SUBSTRING(c.language, 4) = '%s' ORDER BY c.weight, c.name", $country);
       }
     }
     while ($language = db_fetch_object($result)) {
@@ -849,7 +847,7 @@
  * current country, if such a language is installed.
  *
  * @return
- *   A language code form en-CA where en is the language and CA
+ *   A language code form en-ca where en is the language and ca
  *   is the country.
  */
 function country_code_get_country_language($language_code = NULL, $country_code = NULL, $enabled = TRUE) {
@@ -864,7 +862,7 @@
     $country_code = country_code();
   }
 
-  $country_language = $language_code . '-' . strtoupper($country_code);
+  $country_language = $language_code . '-' . $country_code;
 
   if ($enabled) {
     $enabled_languages = locale_language_list();
Index: country_code.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/country_code/country_code.test,v
retrieving revision 1.25
diff -u -r1.25 country_code.test
--- country_code.test	13 Nov 2008 12:16:37 -0000	1.25
+++ country_code.test	26 Nov 2008 05:56:04 -0000
@@ -280,7 +280,7 @@
 
     // Change user's default language - need 2 separate posts as Canadian
     // langauges not available until default country has changed.
-    $this->changeUserDefaultLanguage($this->admin_user, 'fr-CA');
+    $this->changeUserDefaultLanguage($this->admin_user, 'fr-ca');
 
     // Disable language option and ensure it doesn't appear on the user edit
     // profile form.
@@ -332,7 +332,7 @@
     $edit = array();
     $edit['language'] = $language_code;
     $this->drupalPost('admin/settings/country-code-country/' . $country_code . '/languages/add', $edit, t('Add language'));
-    $country_language = $language_code . '-' . strtoupper($country_code);
+    $country_language = $language_code . '-' . $country_code;
     $this->assertTrue(country_code_language_exists($country_language), t('New country-language was enabled.'));
   }