From ba64ebbca8626abfc6cbec223c0d5df9fb49f70e Mon Sep 17 00:00:00 2001
From: Benjy Cui <benjytrys@gmail.com>
Date: Fri, 22 Apr 2016 14:53:33 +0800
Subject: [PATCH] site: fix bugs

---
 site/component/Article/index.jsx      |  4 +--
 site/component/ComponentDoc/index.jsx |  6 ++---
 site/component/Header/index.jsx       |  6 ++---
 site/component/MainContent/index.jsx  | 39 ++++++++++++++-------------
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/site/component/Article/index.jsx b/site/component/Article/index.jsx
index 5dd1e9a59f..f7d0e9bf59 100644
--- a/site/component/Article/index.jsx
+++ b/site/component/Article/index.jsx
@@ -9,8 +9,8 @@ export default class Article extends React.Component {
     this.componentDidUpdate();
   }
   componentDidUpdate() {
-    const { chinese, english } = this.props.content.meta;
-    utils.setTitle(`${chinese || english} - Ant Design`);
+    const { title, chinese, english } = this.props.content.meta;
+    utils.setTitle(`${title || chinese || english} - Ant Design`);
     const links = Array.apply(null, document.querySelectorAll('.outside-link.internal'));
     if (links.length === 0) {
       return;
diff --git a/site/component/ComponentDoc/index.jsx b/site/component/ComponentDoc/index.jsx
index ddf5b79ecc..39d743f574 100644
--- a/site/component/ComponentDoc/index.jsx
+++ b/site/component/ComponentDoc/index.jsx
@@ -23,8 +23,8 @@ export default class ComponentDoc extends React.Component {
     this.componentDidUpdate();
   }
   componentDidUpdate() {
-    const { chinese, english } = this.props.doc.meta;
-    utils.setTitle(`${chinese} ${english} - Ant Design`);
+    const { title, subtitle, chinese, english } = this.props.doc.meta;
+    utils.setTitle(`${subtitle || chinese || ''} ${title || english} - Ant Design`);
   }
 
   handleExpandToggle = () => {
@@ -89,7 +89,7 @@ export default class ComponentDoc extends React.Component {
           </ul>
         </Affix>
         <section className="markdown">
-          <h1>{meta.english} {meta.chinese}</h1>
+          <h1>{meta.title || meta.english} {meta.subtitle || meta.chinese}</h1>
           {
             utils.jsonmlToComponent(
               location.pathname,
diff --git a/site/component/Header/index.jsx b/site/component/Header/index.jsx
index bce3deffc5..bed8ef954a 100644
--- a/site/component/Header/index.jsx
+++ b/site/component/Header/index.jsx
@@ -93,9 +93,9 @@ export default class Header extends React.Component {
       const pathSnippet = meta.fileName.split('/')[1];
       const url = `/components/${pathSnippet}`;
       return (
-        <Option value={url} key={url} data-label={`${meta.english.toLowerCase()} ${meta.chinese}`}>
-          <strong>{meta.english}</strong>
-          <span className="ant-component-decs">{meta.chinese}</span>
+        <Option value={url} key={url} data-label={`${(meta.title || meta.english).toLowerCase()} ${meta.subtitle || meta.chinese}`}>
+          <strong>{meta.title || meta.english}</strong>
+          <span className="ant-component-decs">{meta.subtitle || meta.chinese}</span>
         </Option>
       );
     });
diff --git a/site/component/MainContent/index.jsx b/site/component/MainContent/index.jsx
index 665bd8aa94..a1ade47f5f 100644
--- a/site/component/MainContent/index.jsx
+++ b/site/component/MainContent/index.jsx
@@ -40,17 +40,17 @@ export default class MainContent extends React.Component {
   }
 
   fileNameToPath(fileName) {
-    const snippets = fileName.replace(/(\/index)?\.md$/i, '').split('/');
+    const snippets = fileName.replace(/(\/index)?((\.zh-CN)|(\.en-US))?\.md$/i, '').split('/');
     return snippets[snippets.length - 1];
   }
 
   generateMenuItem(isTop, item) {
     const key = this.fileNameToPath(item.fileName);
     const text = isTop ?
-      item.chinese || item.english : [
-        <span key="english">{item.english}</span>,
-        <span className="chinese" key="chinese">{item.chinese}</span>,
-      ];
+            item.chinese || item.english : [
+              <span key="english">{ item.title || item.english }</span>,
+              <span className="chinese" key="chinese">{ item.subtitle || item.chinese }</span>
+            ];
     const disabled = item.disabled;
     const url = item.fileName.replace(/(\/index)?((\.zh-CN)|(\.en-US))?\.md$/i, '');
     const child = !item.link ?
@@ -75,20 +75,21 @@ export default class MainContent extends React.Component {
   generateSubMenuItems(obj) {
     const topLevel = (obj.topLevel || []).map(this.generateMenuItem.bind(this, true));
     const itemGroups = Object.keys(obj).filter(this.isNotTopLevel)
-      .sort((a, b) => {
-        return config.typeOrder[a] - config.typeOrder[b];
-      })
-      .map((type, index) => {
-        const groupItems = obj[type].sort((a, b) => {
-          return a.english.charCodeAt(0) - b.english.charCodeAt(0);
-        }).map(this.generateMenuItem.bind(this, false));
-
-        return (
-          <Menu.ItemGroup title={type} key={index}>
-            {groupItems}
-          </Menu.ItemGroup>
-        );
-      });
+            .sort((a, b) => {
+              return config.typeOrder[a] - config.typeOrder[b];
+            })
+            .map((type, index) => {
+              const groupItems = obj[type].sort((a, b) => {
+                return (a.title || a.english).charCodeAt(0) -
+                  (b.title || b.english).charCodeAt(0);
+              }).map(this.generateMenuItem.bind(this, false));
+
+              return (
+                <Menu.ItemGroup title={type} key={index}>
+                  { groupItems }
+                </Menu.ItemGroup>
+              );
+            });
     return [...topLevel, ...itemGroups];
   }