[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Apparently foo.html.en works better than foo.en.html - at l...
Update of /home/or/cvsroot/website/include
In directory moria:/tmp/cvs-serv30908/include
Modified Files:
head.wmi links.wmi
Log Message:
Apparently foo.html.en works better than foo.en.html - at least with eff's apache config
Index: head.wmi
===================================================================
RCS file: /home/or/cvsroot/website/include/head.wmi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- head.wmi 5 Oct 2005 02:15:28 -0000 1.3
+++ head.wmi 7 Oct 2005 22:43:08 -0000 1.4
@@ -34,7 +34,7 @@
$page = $WML_SRC_FILENAME;
$page =~ s/\.wml//;
if ($page ne $key) {
- printf '<a href="%s.$(LANG).html">%s</a>'."\n", $key, $navigation{$key};
+ printf '<a href="%s.html.$(LANG)">%s</a>'."\n", $key, $navigation{$key};
} else {
printf '<a class="current">%s</a>'."\n", $navigation{$key};
}
@@ -47,7 +47,7 @@
$page =~ s/\.wml//;
for my $dir (sort {$LANGUAGES{$a} cmp $LANGUAGES{$b}} @LANGUAGES) {
next if $dir eq '$(LANG)';
- printf('<a href="%s.%s.html"><img src="$(IMGROOT)/%s.png" alt="%s" /></a>', $page, $dir, $dir, $LANGUAGES{$dir}) if (-e "$dir/$WML_SRC_FILENAME");
+ printf('<a href="%s.html.%s"><img src="$(IMGROOT)/%s.png" alt="%s" /></a>', $page, $dir, $dir, $LANGUAGES{$dir}) if (-e "$dir/$WML_SRC_FILENAME");
};
:>
</td>
Index: links.wmi
===================================================================
RCS file: /home/or/cvsroot/website/include/links.wmi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- links.wmi 4 Oct 2005 23:03:54 -0000 1.2
+++ links.wmi 7 Oct 2005 22:43:08 -0000 1.3
@@ -9,7 +9,7 @@
$page="%0";
$lang="$(LANG)";
if (-e "$lang/$page.wml") {
- print "%0.$lang.html";
+ print "%0.html.$lang";
} elsif (-e "en/$page.wml") {
print "%0.html";
} else {