[or-cvs] r21144: {website} revert r21143. two problems: a) default apache doesn't know (in website/trunk: . docs include torbrowser)

[arma@xxxxxxxx]

Author: arma
Date: 2009-12-10 16:12:20 -0500 (Thu, 10 Dec 2009)
New Revision: 21144

Added:
   website/trunk/docs/zh-cn/
   website/trunk/torbrowser/zh-cn/
   website/trunk/zh-cn/
Removed:
   website/trunk/docs/zh_CN/
   website/trunk/torbrowser/zh_CN/
   website/trunk/zh_CN/
Modified:
   website/trunk/Makefile.common
   website/trunk/include/perl-globals.wmi
Log:
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.


Modified: website/trunk/Makefile.common
===================================================================
--- website/trunk/Makefile.common	2009-12-10 21:00:39 UTC (rev 21143)
+++ website/trunk/Makefile.common	2009-12-10 21:12:20 UTC (rev 21144)
@@ -16,7 +16,7 @@
           -D TORSVNSTABLE=$(TORSVNSTABLE) \
           -D TORSVNHEAD=$(TORSVNHEAD)
 
-LANGS=de en es it fi fr ja ko nl no pl pt ru se tr zh_CN fa ar
+LANGS=de en es it fi fr ja ko nl no pl pt ru se tr zh-cn fa ar
 
 WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS)))
 WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi )
@@ -78,7 +78,7 @@
 %.html.tr: tr/%.wml en/%.wml
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
 
-%.html.zh_CN: zh_CN/%.wml en/%.wml
+%.html.zh-cn: zh-cn/%.wml en/%.wml
 	lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@
 
 .deps/%.html.en.d: en/%.wml .deps/.stamp
@@ -200,7 +200,7 @@
 	wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \
 	sed -e s',\(^[^ ]*\):,.deps/\1.d:,' < $$tmpfile >> $@ && \
 	rm -f $$tmpfile
-.deps/%.html.zh_CN.d: zh_CN/%.wml .deps/.stamp
+.deps/%.html.zh-cn.d: zh-cn/%.wml .deps/.stamp
 	tmpfile=`tempfile` \
 	lang=`dirname $<` && \
 	OUT=`echo $@ | sed -e 's,\.deps/\(.*\)\.d$$,\1,'` && \

Modified: website/trunk/include/perl-globals.wmi
===================================================================
--- website/trunk/include/perl-globals.wmi	2009-12-10 21:00:39 UTC (rev 21143)
+++ website/trunk/include/perl-globals.wmi	2009-12-10 21:12:20 UTC (rev 21144)
@@ -2,7 +2,7 @@
 <:
 	# Change both.  The array is ordered (for pages like translation status, order of flags, etc).
 
-	my @LANGUAGES = qw{de en es fa fi fr it ja ko nl no pl pt ru se tr zh_CN};
+	my @LANGUAGES = qw{de en es fa fi fr it ja ko nl no pl pt ru se tr zh-cn};
 	my %LANGUAGES = (
 		'en' => "English",
 		'de' => "Deutsch",
@@ -20,7 +20,7 @@
 		'ru' => "&#1056;&#1091;&#1089;&#1089;&#1082;&#1080;&#1081;&nbsp;(Russkij)",
 		'se' => "svenska",
 		'tr' => "T&uuml;rk&ccedil;e",
-		'zh_CN' => "&#20013;&#25991;(&#31616;) (Simplified Chinese)",
+		'zh-cn' => "&#20013;&#25991;(&#31616;) (Simplified Chinese)",
 
 		);
 	our $WML_SRC_FILENAME;