[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Mon Jan 21 02:33:22 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1112, 1.1113.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.28 loncom/interface/loncommon.pm:1.1075.2.29
--- loncom/interface/loncommon.pm:1.1075.2.28	Tue Jan 15 18:48:17 2013
+++ loncom/interface/loncommon.pm	Mon Jan 21 02:33:22 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.28 2013/01/15 18:48:17 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.29 2013/01/21 02:33:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -990,7 +990,7 @@
     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);
@@ -4887,7 +4887,7 @@
 
     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;