revert r21143. two problems: a) default apache doesn't know that zh_CN is chinese, and b) external links would need to be rewritten. the first one is the killer problem, since it will make our mirrors' lives worse.
Roger Dingledine

Roger Dingledine commited on 2009-12-10 22:12:20
Zeige 32 geänderte Dateien mit 5 Einfügungen und 5 Löschungen.

... ...
@@ -16,7 +16,7 @@ WMLOPT  = \
16 16
           -D TORSVNSTABLE=$(TORSVNSTABLE) \
17 17
           -D TORSVNHEAD=$(TORSVNHEAD)
18 18
 
19
-LANGS=de en es it fi fr ja ko nl no pl pt ru se tr zh_CN fa ar
19
+LANGS=de en es it fi fr ja ko nl no pl pt ru se tr zh-cn fa ar
20 20
 
21 21
 WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS)))
22 22
 WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi )
... ...
@@ -78,7 +78,7 @@ all: $(HTMLFILES)
78 78
 %.html.tr: tr/%.wml en/%.wml
79 79
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
80 80
 
81
-%.html.zh_CN: zh_CN/%.wml en/%.wml
81
+%.html.zh-cn: zh-cn/%.wml en/%.wml
82 82
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
83 83
 
84 84
 .deps/%.html.en.d: en/%.wml .deps/.stamp
... ...
@@ -200,7 +200,7 @@ all: $(HTMLFILES)
200 200
 	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
201 201
 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
202 202
 	rm -f $$tmpfile
203
-.deps/%.html.zh_CN.d: zh_CN/%.wml .deps/.stamp
203
+.deps/%.html.zh-cn.d: zh-cn/%.wml .deps/.stamp
204 204
 	tmpfile=`tempfile` \
205 205
 	lang=`dirname $<` && \
206 206
 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \
... ...
@@ -2,7 +2,7 @@
2 2
 <:
3 3
 	# Change both.  The array is ordered (for pages like translation status, order of flags, etc).
4 4
 
5
-	my @LANGUAGES = qw{de en es fa fi fr it ja ko nl no pl pt ru se tr zh_CN};
5
+	my @LANGUAGES = qw{de en es fa fi fr it ja ko nl no pl pt ru se tr zh-cn};
6 6
 	my %LANGUAGES = (
7 7
 		'en' => "English",
8 8
 		'de' => "Deutsch",
... ...
@@ -20,7 +20,7 @@
20 20
 		'ru' => "&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;&nbsp;(Russkij)",
21 21
 		'se' => "svenska",
22 22
 		'tr' => "T&uuml;rk&ccedil;e",
23
-		'zh_CN' => "&#20013;&#25991;(&#31616;) (Simplified Chinese)",
23
+		'zh-cn' => "&#20013;&#25991;(&#31616;) (Simplified Chinese)",
24 24
 
25 25
 		);
26 26
 	our $WML_SRC_FILENAME;