--- doc/install/linux/install.pl	2011/10/25 02:03:16	1.23
+++ doc/install/linux/install.pl	2013/02/27 19:48:53	1.25
@@ -72,7 +72,7 @@ if (!open(LOG,">>loncapa_install.log"))
           &mt('Stopping execution.')."\n";
     exit;
 } else {
-    print LOG '$Id: install.pl,v 1.23 2011/10/25 02:03:16 raeburn Exp $'."\n";
+    print LOG '$Id: install.pl,v 1.25 2013/02/27 19:48:53 raeburn Exp $'."\n";
 }
 
 #
@@ -320,6 +320,16 @@ sub check_locale {
                       '/etc/sysconfig/language');
         }
         $langvar = 'RC_LANG';
+    } elsif ($distro =~ /^fedora(\d+)/) {
+        if ($1 >= 18) {
+            if (!open($fh,"</etc/locale.conf")) {
+                print &mt('Failed to open: [_1], default locale not checked.',
+                          '/etc/locale.conf');
+            }
+        } elsif (!open($fh,"</etc/sysconfig/i18n")) {
+            print &mt('Failed to open: [_1], default locale not checked.',
+                      '/etc/sysconfig/i18n');
+        }
     } else {
         if (!open($fh,"</etc/sysconfig/i18n")) {
             print &mt('Failed to open: [_1], default locale not checked.',
@@ -329,13 +339,15 @@ sub check_locale {
     my @data = <$fh>;
     chomp(@data);
     foreach my $item (@data) {
-        if ($item =~ /^\Q$langvar\E=\"([^\"]*)\"/) {
+        if ($item =~ /^\Q$langvar\E=\"?([^\"]*)\"?/) {
             my $default = $1;
             if ($default ne 'en_US.UTF-8') {
                 if ($distro =~ /^debian/) {
-                    $command = 'dpkg-reconfigure locales';
+                    $command = 'locale-gen en_US.UTF-8'."\n".
+                               'update-locale LANG=en_US.UTF-8';
                 } elsif ($distro =~ /^ubuntu/) {
-                    $command = 'sudo set-language-env -E'; 
+                    $command = 'sudo locale-gen en_US.UTF-8'."\n".
+                               'sudo update-locale LANG=en_US.UTF-8';
                 } elsif ($distro =~ /^(suse|sles)/) {
                     $command = 'yast language'; 
                 } else {