--- loncom/interface/loncommon.pm	2013/01/15 17:37:45	1.1111
+++ loncom/interface/loncommon.pm	2013/01/21 02:12:51	1.1113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1111 2013/01/15 17:37:45 raeburn Exp $
+# $Id: loncommon.pm,v 1.1113 2013/01/21 02:12:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -993,7 +993,7 @@ sub select_language {
     my ($name,$selected,$includeempty) = @_;
     my %langchoices;
     if ($includeempty) {
-        %langchoices = ('' => 'No language preference');
+        %langchoices = ('' => &mt('No language preference'));
     }
     foreach my $id (&languageids()) {
         my $code = &supportedlanguagecode($id);
@@ -4981,7 +4981,7 @@ sub CSTR_pageheader {
 
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my ($udom,$uname,$thisdisfn)=
-        ($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)/(.*)$});
+        ($trailfile =~ m{^\Q$londocroot\E/priv/([^/]+)/([^/]+)(?:|/(.*))$});
     my $formaction = "/priv/$udom/$uname/$thisdisfn";
     $formaction =~ s{/+}{/}g;