revert the pathing for lang (3bc6e4184) - tor-webwml.git

include/head.wmi

@@ -69,7 +69,7 @@
 	            $dir = '.' unless defined $dir;
                 
               # translated version
-              if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
+              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
                   printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
               } 
@@ -83,7 +83,7 @@
                 printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
               } else {
                 warn "$WML_SRC_FILENAME has a [page $key] (parses to
-docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
+docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
               }
             }
         }:>
@@ -119,7 +119,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml),
 
 	          $dir = '.' unless defined $dir;
               # try to use a translated version
-              if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
+              if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
                   printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
                          stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
               } 
@@ -128,7 +128,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml),
               	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
                   stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
               } else {
-                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
+                warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
               }
             }    
           }:>


...	...	@@ -69,7 +69,7 @@
69	69	$dir = '.' unless defined $dir;
70	70
71	71	# translated version
72		- if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
	72	+ if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
73	73	printf '<li><a '.$class.' href="%s">%s</a></li>'."\n",
74	74	stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
75	75	}
...	...	@@ -83,7 +83,7 @@
83	83	printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key};
84	84	} else {
85	85	warn "$WML_SRC_FILENAME has a [page $key] (parses to
86		-docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
	86	+docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
87	87	}
88	88	}
89	89	}:>
...	...	@@ -119,7 +119,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml),
119	119
120	120	$dir = '.' unless defined $dir;
121	121	# try to use a translated version
122		- if (-e "$(DOCROOT)/$lang/$dir/$base.wml") {
	122	+ if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
123	123	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
124	124	stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
125	125	}
...	...	@@ -128,7 +128,7 @@ docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml),
128	128	printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n",
129	129	stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key};
130	130	} else {
131		- warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$lang/$dir/$base.wml), but that doesn't exist.";
	131	+ warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
132	132	}
133	133	}
134	134	}:>
135	135