Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/v2/api/index.md

Author: sylvainpolletvillard

README.md

@@ -1,10 +1,10 @@
-# vuejs.org
+# fr.vuejs.org
 
-This site is built with [hexo](http://hexo.io/). Site content is written in Markdown format located in `src`. Pull requests welcome!
+Ce site est assemblé avec [hexo](http://hexo.io/). Le contenu du Site est écrit au format Markdown et se trouve dans `src`. Les Pull requests son les bienvenues !
 
-## Developing
+## Développement
 
-Start a dev server at `localhost:4000`:
+Lancez un serveur de développement sur `localhost:4000` :
 
 ```
 $ npm install -g hexo-cli

_config.yml

@@ -5,14 +5,14 @@
 # Site
 title: Vue.js
 subtitle:
-description: "Reactive Components for Modern Web Interfaces"
+description: "Le Framework JavaScript Évolutif"
 author: Evan You
 email:
 language:
 
 # URL
 ## If your site is put in a subdirectory, set url as 'http://yoursite.com/child' and root as '/child/'
-url: http://vuejs.org
+url: http://fr.vuejs.org
 root: /
 permalink: :year/:month/:day/:title/
 tag_dir: tags
@@ -65,7 +65,7 @@ logger_format:
 ## Hexo uses Moment.js to parse and display date
 ## You can customize the date format as defined in
 ## http://momentjs.com/docs/#/displaying/format/
-date_format: MMM D YYYY
+date_format: D MMM YYYY
 time_format: H:mm:ss
 
 # Pagination
@@ -97,9 +97,53 @@ markdown:
 ## Docs: http://zespia.tw/hexo/docs/deployment.html
 deploy:
   type: git
-  repository: git@github.com:vuejs/vuejs.org.git
+  repository: git@github.com:vuejs-fr/vuejs.org.git
 
 feed:
   type: atom
   path: atom.xml
   limit: 20
+
+alias:
+  api/index.html: v2/api/index.html
+  guide/class-and-style.html: v2/guide/class-and-style.html
+  guide/comparison.html: v2/guide/comparison.html
+  guide/components.html: v2/guide/components.html
+  guide/computed.html: v2/guide/computed.html
+  guide/conditional.html: v2/guide/conditional.html
+  guide/custom-directive.html: v2/guide/custom-directive.html
+  guide/deployment.html: v2/guide/deployment.html
+  guide/events.html: v2/guide/events.html
+  guide/forms.html: v2/guide/forms.html
+  guide/index.html: v2/guide/index.html
+  guide/installation.html: v2/guide/installation.html
+  guide/instance.html: v2/guide/instance.html
+  guide/join.html: v2/guide/join.html
+  guide/list.html: v2/guide/list.html
+  guide/migration-vue-router.html: v2/guide/migration-vue-router.html
+  guide/migration-vuex.html: v2/guide/migration-vuex.html
+  guide/migration.html: v2/guide/migration.html
+  guide/mixins.html: v2/guide/mixins.html
+  guide/plugins.html: v2/guide/plugins.html
+  guide/reactivity.html: v2/guide/reactivity.html
+  guide/render-function.html: v2/guide/render-function.html
+  guide/routing.html: v2/guide/routing.html
+  guide/single-file-components.html: v2/guide/single-file-components.html
+  guide/ssr.html: v2/guide/ssr.html
+  guide/state-management.html: v2/guide/state-management.html
+  guide/syntax.html: v2/guide/syntax.html
+  guide/transitioning-state.html: v2/guide/transitioning-state.html
+  guide/transitions.html: v2/guide/transitions.html
+  guide/unit-testing.html: v2/guide/unit-testing.html
+  examples/commits.html: v2/examples/commits.html
+  examples/elastic-header.html: v2/examples/elastic-header.html
+  examples/firebase.html: v2/examples/firebase.html
+  examples/grid-component.html: v2/examples/grid-component.html
+  examples/hackernews.html: v2/examples/hackernews.html
+  examples/index.html: v2/examples/index.html
+  examples/modal.html: v2/examples/modal.html
+  examples/select2.html: v2/examples/select2.html
+  examples/svg.html: v2/examples/svg.html
+  examples/todomvc.html: v2/examples/todomvc.html
+  examples/tree-view.html: v2/examples/tree-view.html
+

package.json

@@ -8,6 +8,7 @@
   "dependencies": {
     "hexo": "^3.2.2",
     "hexo-deployer-git": "0.1.0",
+    "hexo-generator-alias": "git+https://github.com/chrisvfritz/vuejs.org-hexo-generator-alias.git",
     "hexo-generator-archive": "^0.1.4",
     "hexo-generator-category": "^0.1.3",
     "hexo-generator-feed": "^1.1.0",

src/CNAME

@@ -1 +1 @@
-vuejs.org
+fr.vuejs.org

src/_posts/why-no-template-url.md

@@ -13,7 +13,7 @@ First, it allows us to write our template in a separate HTML file. This gives us
 
 Second, because `templateURL` loads the template via Ajax at runtime, you don't need a build step in order to split up your files. This is convenient during development, but comes at a serious cost when you want to deploy it to production. Before HTTP/2 is universally supported, the number of HTTP requests is still probably the most critical factor in your app's initial load performance. Now imagine you use `templateURL` for every component in your app - the browser needs to perform dozens of HTTP requests before even being able to display anything! In case you don't know, most browsers limit the number of parallel requests it can perform to a single server. When you exceed that limit, your app's initial rendering will suffer for every extra round trip the browser has to wait for. Sure, there are build tools that can help you pre-register all those templates in `$templateCache` - but that shows us a build step is, in fact, inevitable for any serious frontend development.
 
-So, without `templateURL`, how do we deal with the development experience problem? Writing templates as inline JavaScript strings is terrible, faking templates with `<script type="x/template">` also feels like a hack. Well, maybe it's time to up the game a bit and use a proper module bundler like [Webpack](http://webpack.github.io/) or [Browserify](http://browserify.org/). It might seem daunting if you've never dealt with them before, but trust me it's worth it to take the leap. Proper modularization is a necessity if you want to build anything large and maintainable. More importantly, you get to write your [Vue components in a single file](http://vuejs.org/guide/application.html#Single-File-Components), with proper syntax highlighting and the extra benefits of custom pre-processors, hot-reloading, ES2015 by default, autoprefixing and scoped CSS, which makes the development experience 10 times better.
+So, without `templateURL`, how do we deal with the development experience problem? Writing templates as inline JavaScript strings is terrible, faking templates with `<script type="x/template">` also feels like a hack. Well, maybe it's time to up the game a bit and use a proper module bundler like [Webpack](http://webpack.github.io/) or [Browserify](http://browserify.org/). It might seem daunting if you've never dealt with them before, but trust me it's worth it to take the leap. Proper modularization is a necessity if you want to build anything large and maintainable. More importantly, you get to write your [Vue components in a single file](http://vuejs.org/guide/single-file-components.html), with proper syntax highlighting and the extra benefits of custom pre-processors, hot-reloading, ES2015 by default, autoprefixing and scoped CSS, which makes the development experience 10 times better.
 
 Finally, Vue does allow you to [lazy load your components](http://vuejs.org/guide/components.html#Async-Components), and with Webpack it is trivially easy. Although this is only a concern when your initial bundle is so large that you are better off splitting it apart.