tor-webwml.git

Apparently foo.html.en works better than foo.en.html - at least with eff's apache config
Parent c800081bc
Peter Palfrader

Peter Palfrader commited on 2005-10-08 00:43:08
Zeige 3 geänderte Dateien mit 21 Einfügungen und 21 Löschungen.

Makefile
Zeige Datei @ ff0711aa2
... ... 
@@ -18,13 +18,13 @@ WMIFILES=$(wildcard include/*.wmi \
18 18 
                     de/*.wmi      \
19 19 
                     it/*.wmi      \
20 20 
           )
21 
-HTMLFILES = $(patsubst de/%.wml, %.de.html, \
22 
-            $(patsubst en/%.wml, %.en.html, \
23 
-            $(patsubst it/%.wml, %.it.html, \
21 
+HTMLFILES = $(patsubst de/%.wml, %.html.de, \
22 
+            $(patsubst en/%.wml, %.html.en, \
23 
+            $(patsubst it/%.wml, %.html.it, \
24 24 
             $(WMLFILES))))
25 
-DEPFILES =  $(patsubst de/%.wml,.deps/%.de.html.d,   \
26 
-            $(patsubst en/%.wml,.deps/%.en.html.d,   \
27 
-            $(patsubst it/%.wml,.deps/%.it.html.d,   \
25 
+DEPFILES =  $(patsubst de/%.wml,.deps/%.html.de.d,   \
26 
+            $(patsubst en/%.wml,.deps/%.html.en.d,   \
27 
+            $(patsubst it/%.wml,.deps/%.html.it.d,   \
28 28 
             $(WMLFILES))))
29 29
30 30 
 LANGS=de en it
... ... 
@@ -33,45 +33,45 @@ all: $(HTMLFILES)
33 33
34 34
35 35
36 
-%.en.html: en/%.wml
36 
+%.html.en: en/%.wml
37 37 
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
38 38
39 
-%.de.html: de/%.wml en/%.wml
39 
+%.html.de: de/%.wml en/%.wml
40 40 
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
41 41
42 
-%.it.html: it/%.wml en/%.wml
42 
+%.html.it: it/%.wml en/%.wml
43 43 
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $@
44 44
45 45
46 
-.deps/%.en.html.d: en/%.wml
46 
+.deps/%.html.en.d: en/%.wml
47 47 
 	@[ -d .deps ] || mkdir .deps
48 48 
 	tmpfile=`tempfile` \
49 
-	lang=`echo $@ | sed -e 's,\.html\.d$$,,' -e 's,.*\.,,'` && \
49 
+	lang=`dirname $<` && \
50 50 
 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
51 51 
 	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
52 52 
 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
53 53 
 	rm -f $$tmpfile
54 
-.deps/%.de.html.d: de/%.wml
54 
+.deps/%.html.de.d: de/%.wml
55 55 
 	@[ -d .deps ] || mkdir .deps
56 56 
 	tmpfile=`tempfile` \
57 
-	lang=`echo $@ | sed -e 's,\.html\.d$$,,' -e 's,.*\.,,'` && \
57 
+	lang=`dirname $<` && \
58 58 
 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
59 59 
 	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
60 60 
 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
61 61 
 	rm -f $$tmpfile
62 
-.deps/%.it.html.d: it/%.wml
62 
+.deps/%.html.it.d: it/%.wml
63 63 
 	@[ -d .deps ] || mkdir .deps
64 64 
 	tmpfile=`tempfile` \
65 
-	lang=`echo $@ | sed -e 's,\.html\.d$$,,' -e 's,.*\.,,'` && \
65 
+	lang=`dirname $<` && \
66 66 
 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
67 67 
 	wml $(WMLOPT) -I $$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
68 68 
 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
69 69 
 	rm -f $$tmpfile
70 70
71 
-tor-manual-cvs.en.html: $(TORCVSHEAD)/doc/tor.1.in
72 
-tor-manual.en.html: $(TORCVSSTABLE)/doc/tor.1.in
71 
+tor-manual-cvs.html.en: $(TORCVSHEAD)/doc/tor.1.in
72 
+tor-manual.html.en: $(TORCVSSTABLE)/doc/tor.1.in
73 73
74 
-translation-status.en.html: $(LANGS) $(WMIFILES) $(WMLFILES)
74 
+translation-status.html.en: $(LANGS) $(WMIFILES) $(WMLFILES)
75 75
76 76 
 dep: $(DEPFILES)
77 77
include/head.wmi
Zeige Datei @ ff0711aa2
... ... 
@@ -34,7 +34,7 @@
34 34 
 	      $page = $WML_SRC_FILENAME;
35 35 
 	      $page =~ s/\.wml//;
36 36 
 	      if ($page ne $key) {
37 
-	        printf '<a href="%s.$(LANG).html">%s</a>'."\n", $key, $navigation{$key};
37 
+	        printf '<a href="%s.html.$(LANG)">%s</a>'."\n", $key, $navigation{$key};
38 38 
 	       } else {
39 39 
 	        printf '<a class="current">%s</a>'."\n", $navigation{$key};
40 40 
 	       }
... ... 
@@ -47,7 +47,7 @@
47 47 
 	  $page =~ s/\.wml//;
48 48 
 	  for my $dir (sort {$LANGUAGES{$a} cmp $LANGUAGES{$b}} @LANGUAGES) {
49 49 
 	    next if $dir eq '$(LANG)';
50 
-	    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");
50 
+	    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");
51 51 
 	  };
52 52 
 	:>
53 53 
         </td>
include/links.wmi
Zeige Datei @ ff0711aa2
... ... 
@@ -9,7 +9,7 @@
9 9 
 	$page="%0";
10 10 
 	$lang="$(LANG)";
11 11 
 	if (-e "$lang/$page.wml") {
12 
-		print "%0.$lang.html";
12 
+		print "%0.html.$lang";
13 13 
 	} elsif (-e "en/$page.wml") {
14 14 
 		print "%0.html";
15 15 
 	} else {
16 16