Roger Dingledine commited on 2011-03-09 18:44:19
Zeige 1 geänderte Dateien mit 4 Einfügungen und 4 Löschungen.
... | ... |
@@ -30,14 +30,14 @@ |
30 | 30 |
my ($page, $lang) = @_; |
31 | 31 |
my ($dir, $base) = $page =~ m,^(?:(.*)/)?(.*?)$,; |
32 | 32 |
$dir = '.' unless defined $dir; |
33 |
- if (-e "$(DOCROOT)/$lang/$dir/$base.wml") { |
|
33 |
+ if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { |
|
34 | 34 |
return stripDotSlashs("$(DOCROOT)/$dir/$base.html.$lang"); |
35 | 35 |
} elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { |
36 | 36 |
return stripDotSlashs("$(DOCROOT)/$dir/$base.html.en"); |
37 | 37 |
} elsif ($page =~ /^http/) { |
38 | 38 |
return $page; |
39 | 39 |
} else { |
40 |
- warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist."; |
|
40 |
+ warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; |
|
41 | 41 |
}; |
42 | 42 |
} |
43 | 43 |
:> |
... | ... |
@@ -50,10 +50,10 @@ |
50 | 50 |
$dir = '.' unless defined $dir; |
51 | 51 |
if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { |
52 | 52 |
print stripDotSlashs("$(DOCROOT)/$dir/$base.html.$lang"); |
53 |
- } elsif (-e "$(DOCROOT)/en/$dir/$base.wml") { |
|
53 |
+ } elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { |
|
54 | 54 |
print stripDotSlashs("$(DOCROOT)/$dir/$base.html"); |
55 | 55 |
} else { |
56 |
- warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist."; |
|
56 |
+ warn "$WML_SRC_FILENAME has a [page $page] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; |
|
57 | 57 |
}; |
58 | 58 |
}:> |
59 | 59 |
</define-tag> |
60 | 60 |