[zh_CN] change folder back to zh, but keep language as zh_CN

jjdelvalle · Sep 21, 2014 · 72c5bd2 · 72c5bd2
1 parent ae85605
commit 72c5bd2
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ ES_HOST =
 .PHONY: all clean html latexpdf epub htmlhelp website website-dirs
 
 # Languages that can be built.
-LANGS = en es fr ja pt ru ro sr zh_CN
+LANGS = en es fr ja pt ru ro sr zh
 
 # pdflatex does not like ja or ru for some reason.
 PDF_LANGS = en es fr pt ro

diff --git a/config/cakei18n.py b/config/cakei18n.py
@@ -20,13 +20,23 @@ def lang_link(lang, path):
         dots = []
         for p in path.split(SEP):
             dots.append('..')
-        return SEP.join(dots) + SEP + lang + SEP + path + app.builder.link_suffix
+        tokens = lang.split('_')
+        if len(tokens) > 1:
+            folder = tokens[0]
+        else:
+            folder = lang
+        return SEP.join(dots) + SEP + folder + SEP + path + app.builder.link_suffix
 
     def has_lang(lang, path):
         """
         Check to see if a language file exists for a given path/RST doc.:
         """
-        possible = '..' + SEP + lang +  SEP + path + app.config.source_suffix
+        tokens = lang.split('_')
+        if len(tokens) > 1:
+            folder = tokens[0]
+        else:
+            folder = lang
+        possible = '..' + SEP + folder +  SEP + path + app.config.source_suffix
         full_path = os.path.realpath(os.path.join(os.getcwd(), possible))
 
         return os.path.isfile(full_path)

diff --git a/zh_CN/Makefile → zh/Makefile b/zh_CN/Makefile → zh/Makefile
@@ -7,7 +7,7 @@ SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = ../build
 PYTHON        = python
-LANG          = zh_CN
+LANG          = zh
 
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4

diff --git a/zh_CN/_static/img/basic_mvc.png → zh/_static/img/basic_mvc.png b/zh_CN/_static/img/basic_mvc.png → zh/_static/img/basic_mvc.png
diff --git a/zh_CN/_static/img/code-coverage.png → zh/_static/img/code-coverage.png b/zh_CN/_static/img/code-coverage.png → zh/_static/img/code-coverage.png
diff --git a/zh_CN/_static/img/typical-cake-request.png → zh/_static/img/typical-cake-request.png b/zh_CN/_static/img/typical-cake-request.png → zh/_static/img/typical-cake-request.png
diff --git a/zh_CN/conf.py → zh/conf.py b/zh_CN/conf.py → zh/conf.py
diff --git a/zh_CN/contents.rst → zh/contents.rst b/zh_CN/contents.rst → zh/contents.rst
diff --git a/zh_CN/contributing.rst → zh/contributing.rst b/zh_CN/contributing.rst → zh/contributing.rst
diff --git a/.../contributing/backwards-compatibility.rst → zh/contributing/backwards-compatibility.rst b/.../contributing/backwards-compatibility.rst → zh/contributing/backwards-compatibility.rst
diff --git a/...ntributing/cakephp-coding-conventions.rst → ...ntributing/cakephp-coding-conventions.rst b/...ntributing/cakephp-coding-conventions.rst → ...ntributing/cakephp-coding-conventions.rst
diff --git a/zh_CN/contributing/code.rst → zh/contributing/code.rst b/zh_CN/contributing/code.rst → zh/contributing/code.rst
diff --git a/zh_CN/contributing/documentation.rst → zh/contributing/documentation.rst b/zh_CN/contributing/documentation.rst → zh/contributing/documentation.rst
diff --git a/zh_CN/contributing/tickets.rst → zh/contributing/tickets.rst b/zh_CN/contributing/tickets.rst → zh/contributing/tickets.rst
diff --git a/zh_CN/epub-contents.rst → zh/epub-contents.rst b/zh_CN/epub-contents.rst → zh/epub-contents.rst
diff --git a/zh_CN/index.rst → zh/index.rst b/zh_CN/index.rst → zh/index.rst
@@ -16,7 +16,7 @@ CakePHP CookBook 是一个公开地开发和社区可以编辑的文档项目。
     您几乎可以在任何地方阅读本书，当前提供的格式有 PDF 和 EPUB，您可以在更多设备上阅读它，也可以(把它下载下来)离线阅读。
 
     - `PDF <../_downloads/en/CakePHPCookbook.pdf>`_
-    - `EPUB <../_downloads/zh_CN/CakePHPCookbook.epub>`_
+    - `EPUB <../_downloads/zh/CakePHPCookbook.epub>`_
     - `原文出处 <http://github.com/cakephp/docs>`_
 
 入门指南

diff --git a/zh_CN/pdf-contents.rst → zh/pdf-contents.rst b/zh_CN/pdf-contents.rst → zh/pdf-contents.rst