rust-lang · alilleybrinker · Sep 23, 2016 · Sep 23, 2016 · Sep 23, 2016 · Sep 24, 2016
diff --git a/_data/users.yml b/_data/users.yml
@@ -14,7 +14,7 @@
 # the name and email of a contact within your organization who the
 # Rust team can contact should we need to make changes to the web
 # page. You may either do this on the pull request itself, or
-# alternately email rust-logos@rust-lang.org with the subject line
+# alternately email user-logos@rust-lang.org with the subject line
 # "Rust User Logo Contact". This information will be kept private.
 
 # Logos will be displayed against a white background and constrained
@@ -27,6 +27,11 @@
   url: https://1aim.com/
   logo: 1aim.svg
   how: "Modern, secure and universal access management."
+-
+  name: 360dialog
+  url: http://www.360dialog.com
+  logo: 360dialog.png
+  how: "Most of our service consumers are written with Rust."
 -
   name: 3DR
   url: https://3dr.com/
@@ -196,7 +201,7 @@
   name: OneSignal
   url: https://onesignal.com
   logo: onesignal.svg
-  how: "High volume, cross platform push notification <a href='https://onesignal.com/blog/announcing-our-new-delivery-backend/'>delivery</a>."
+  how: "High volume, cross platform push notification <a href='https://onesignal.com/blog/rust-at-onesignal/'>delivery</a>."
 -
   name: OVH
   url: https://www.ovh.com
@@ -232,6 +237,11 @@
   url: http://www.slowtec.de/
   logo: slowtec.svg
   how: "Our robust & reliable automation systems are entirely written in Rust."
+-
+  name: SmartThings
+  url: http://www.smartthings.com/
+  logo: smartthings.png
+  how: "Memory-safe embedded applications on our <a href='https://www.smartthings.com/how-it-works'>SmartThings Hub</a> and supporting services in the cloud."
 -
   name: Snips
   url: https://snips.ai/

diff --git a/_includes/ja-JP/example.rs b/_includes/ja-JP/example.rs
@@ -0,0 +1,22 @@
+// This code is editable and runnable!
+fn main() {
+    // A simple integer calculator:
+    // `+` or `-` means add or subtract by 1
+    // `*` or `/` means multiply or divide by 2
+
+    let program = "+ + * - /";
+    let mut accumulator = 0;
+
+    for token in program.chars() {
+        match token {
+            '+' => accumulator += 1,
+            '-' => accumulator -= 1,
+            '*' => accumulator *= 2,
+            '/' => accumulator /= 2,
+            _ => { /* ignore everything else */ }
+        }
+    }
+
+    println!("The program \"{}\" calculates the value {}",
+              program, accumulator);
+}
diff --git a/_includes/ja-JP/example.rs.html b/_includes/ja-JP/example.rs.html
@@ -0,0 +1,23 @@
+<pre class='rust'>
+<span class='kw'>fn</span> main() {
+<span class='comment'>// A simple integer calculator:
+// `+` or `-` means add or subtract by 1
+// `*` or `/` means multiply or divide by 2</span>
+
+<span class='kw'>let</span> program = <span class='string'>"+ + * - /"</span>;
+<span class='kw'>let</span> <span class='kw'>mut</span> accumulator = <span class='number'>0</span>;
+
+<span class='kw'>for</span> token in program.chars() {
+<span class='kw'>match</span> token {
+    <span class='string'>'+'</span> => accumulator <span class='op'>+=</span> <span class='number'>1</span>,
+    <span class='string'>'-'</span> => accumulator <span class='op'>-=</span> <span class='number'>1</span>,
+    <span class='string'>'*'</span> => accumulator <span class='op'>*=</span> <span class='number'>2</span>,
+    <span class='string'>'/'</span> => accumulator <span class='op'>/=</span> <span class='number'>2</span>,
+    _ => { <span class='comment'>/* ignore everything else */</span> }
+}
+}
+
+<span class='prelude-val'>println!</span>(<span class='string'>"The program \"{}\" calculates the value {}"</span>,
+   program, accumulator);
+}
+</pre>
diff --git a/_layouts/basic.html b/_layouts/basic.html
@@ -38,10 +38,13 @@ <h2><a href="/en-US/contribute.html">Contribute</a></h2>
 
     <footer>
       <p>Our site in other languages:
-        <a href="/fr/">Français</a>,
+        <a href="/es/">Español</a>,
+		<a href="/ja-JP/">日本語</a>,
+        <a href="/fr-FR/">Français</a>,
         <a href="/ko-KR/">한국어</a>,
         <a href="/pt-BR/">Português</a>,
         <a href="/ru-RU/">Русский</a>,
+        <a href="/vi-VN/">Tiếng việt</a>,
         <a href="/zh-CN/">简体中文</a>
       </p>
     </footer>

diff --git a/_layouts/fr/basic.html → _layouts/fr-FR/basic.html b/_layouts/fr/basic.html → _layouts/fr-FR/basic.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <!-- Page last generated {{ site.time }} -->
-<html lang="fr">
+<html lang="fr-FR">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -21,15 +21,15 @@
     <header>
       <ul class="row menu">
 	<li class="col-xs-12 col-md-2">
-          <a href="/fr/index.html">
+          <a href="/fr-FR/index.html">
             <img class="img-responsive" src="/logos/rust-logo-blk.svg" onerror="this.src='/logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
           </a>
 	</li>
 	<li class="col-xs-12 col-md-10 menu">
-	  <h2><a href="/fr/documentation.html">Documentation</a></h2>
-	  <h2><a href="/fr/install.html">Install</a></h2>
-	  <h2><a href="/fr/community.html">Communauté</a></h2>
-	  <h2><a href="/fr/contribute.html">Contribuer</a></h2>
+	  <h2><a href="/fr-FR/documentation.html">Documentation</a></h2>
+	  <h2><a href="/fr-FR/install.html">Install</a></h2>
+	  <h2><a href="/fr-FR/community.html">Communauté</a></h2>
+	  <h2><a href="/fr-FR/contribute.html">Contribuer</a></h2>
 	</li>
       </ul>
     </header>
@@ -39,9 +39,11 @@ <h2><a href="/fr/contribute.html">Contribuer</a></h2>
     <footer>
       <p>Notre site dans d'autres langues&nbsp;:
         <a href="/en-US/">English</a>,
+		<a href="/ja-JP/">日本語</a>,
         <a href="/ko-KR/">한국어</a>,
         <a href="/pt-BR/">Português</a>,
         <a href="/ru-RU/">Русский</a>,
+        <a href="/vi-VN/">Tiếng việt</a>, 
         <a href="/zh-CN/">简体中文</a>
       </p>
     </footer>

diff --git a/_layouts/fr/default.html → _layouts/fr-FR/default.html b/_layouts/fr/default.html → _layouts/fr-FR/default.html
@@ -1,5 +1,5 @@
 ---
-layout: fr/basic
+layout: fr-FR/basic
 ---
 
 <div class="content">

diff --git a/_layouts/ja-JP/basic.html b/_layouts/ja-JP/basic.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<!-- Page last generated {{ site.time }} -->
+<html lang="ja">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ page.title }}</title>
+    <meta name="keywords" content="Rust, Rust言語, rustlang, rust-lang, Mozilla Rust">
+    <meta name="description" content="Rustは速度、安全性、並行性の3つのゴールにフォーカスしたシステムプログラミング言語です。">
+
+    <link rel="stylesheet" href="/css/bootstrap.css">
+    <link rel="stylesheet" href="/css/style.css">
+  </head>
+
+  <body class="container">
+    <a href="https://github.com/rust-lang/rust">
+      <img class="ribbon" style="display: none" src="/logos/forkme.png" alt="Fork me on GitHub" width="298" height="298">
+    </a>
+
+    <header>
+      <ul class="row menu">
+	<li class="col-xs-12 col-md-2">
+          <a href="/ja-JP/index.html">
+            <img class="img-responsive" src="/logos/rust-logo-blk.svg" onerror="this.src='/logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
+          </a>
+	</li>
+	<li class="col-xs-12 col-md-10 menu">
+	  <h2><a href="/en-US/documentation.html">ドキュメンテーション</a></h2>
+	  <h2><a href="/en-US/install.html">インストール</a></h2>
+	  <h2><a href="/en-US/community.html">コミュニティ</a></h2>
+	  <h2><a href="/en-US/contribute.html">開発に参加する</a></h2>
+	</li>
+      </ul>
+    </header>
+
+    {{ content }}
+
+    <footer>
+      <p>他の言語のページ:
+	    <a href="/en-US/">English</a>, 
+        <a href="/fr/">Français</a>,
+        <a href="/ko-KR/">한국어</a>,
+        <a href="/pt-BR/">Português</a>,
+        <a href="/ru-RU/">Русский</a>,
+        <a href="/zh-CN/">简体中文</a>
+      </p>
+    </footer>
+
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-58390457-1', 'auto');
+      ga('send', 'pageview');
+
+    </script>
+  </body>
+</html>
diff --git a/_layouts/ja-JP/default.html b/_layouts/ja-JP/default.html
@@ -0,0 +1,7 @@
+---
+layout: ja-JP/basic
+---
+
+<div class="content">
+  {{ content }}
+</div>
diff --git a/_layouts/ja-JP/faq.html b/_layouts/ja-JP/faq.html
@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+<link href='https://fonts.googleapis.com/css?family=Source+Serif+Pro:400,600' rel='stylesheet' type='text/css'>
+<link href='/css/syntax-highlight.css' rel='stylesheet' type='text/css'>
+
+<div class="faq">
+  {{ content }}
+</div>
diff --git a/_layouts/ko-KR/basic.html b/_layouts/ko-KR/basic.html
@@ -40,8 +40,10 @@ <h2><a href="/ko-KR/contribute.html">기여하기</a></h2>
       <p>이 사이트를 다른 언어로 보기:
         <a href="/en-US/">English</a>,
 		<a href="/fr/">Français</a>,
+		<a href="/ja-JP/">日本語</a>,
         <a href="/pt-BR/">Português</a>,
         <a href="/ru-RU/">Русский</a>,
+        <a href="/vi-VN/">Tiếng việt</a>,
         <a href="/zh-CN/">简体中文</a>
       </p>
     </footer>

diff --git a/_layouts/pt-BR/basic.html b/_layouts/pt-BR/basic.html
@@ -40,8 +40,10 @@ <h2><a href="/pt-BR/contribute.html">Contribua</a></h2>
       <p>Nosso site em outros idiomas:
         <a href="/en-US/">English</a>,
         <a href="/fr/">Français</a>,
+		<a href="/ja-JP/">日本語</a>,
         <a href="/ko-KR/">한국어</a>,
         <a href="/ru-RU/">Русский</a>,
+        <a href="/vi-VN/">Tiếng việt</a>,
         <a href="/zh-CN/">简体中文</a>
       </p>
     </footer>

diff --git a/_layouts/redirect.html b/_layouts/redirect.html
@@ -9,8 +9,8 @@
       var languages = {
         "en": "en-US",
         "en-US": "en-US",
-        "fr": "fr",
-        "fr-FR": "fr", // Prevents 404 on existing links
+        "fr": "fr-FR",
+        "fr-FR": "fr-FR",
         "ko": "ko-KR",
         "ko-KR": "ko-KR",
         "pt": "pt-BR", // For now, since there's no pt-PT page, redirect to pt-BR

diff --git a/_layouts/ru-RU/basic.html b/_layouts/ru-RU/basic.html
@@ -27,7 +27,7 @@
 	</li>
 	<li class="col-xs-12 col-md-10 menu">
 	  <h2><a href="/ru-RU/documentation.html">Документация</a></h2>
-	  <h2><a href="/ru-RU/install.html">Install</a></h2>
+	  <h2><a href="/ru-RU/install.html">Установка</a></h2>
 	  <h2><a href="/ru-RU/community.html">Сообщество</a></h2>
 	  <h2><a href="/ru-RU/contribute.html">Участие</a></h2>
 	</li>
@@ -40,8 +40,10 @@ <h2><a href="/ru-RU/contribute.html">Участие</a></h2>
       <p>Наш сайт на других языках:
         <a href="/en-US/">English</a>,
         <a href="/fr/">Français</a>,
+		<a href="/ja-JP/">日本語</a>,
         <a href="/ko-KR/">한국어</a>,
         <a href="/pt-BR/">Português</a>,
+        <a href="/vi-VN/">Tiếng việt</a>,
         <a href="/zh-CN/">简体中文</a>
       </p>
     </footer>

diff --git a/_layouts/vi-VN/basic.html b/_layouts/vi-VN/basic.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<!-- Page last generated {{ site.time }} -->
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ page.title }}</title>
+    <meta name="keywords" content="Rust, Rust programming language, rustlang, rust-lang, Mozilla Rust">
+    <meta name="description" content="A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.">
+
+    <link rel="stylesheet" href="/css/bootstrap.css">
+    <link rel="stylesheet" href="/css/style-vi.css">
+  </head>
+
+  <body class="container">
+    <a href="https://github.com/rust-lang/rust">
+      <img class="ribbon" style="display: none" src="/logos/forkme.png" alt="Fork me on GitHub" width="298" height="298">
+    </a>
+
+    <header>
+      <ul class="row menu">
+	<li class="col-xs-12 col-md-2">
+          <a href="/vi-VN/index.html">
+            <img class="img-responsive" src="/logos/rust-logo-blk.svg" onerror="this.src='/logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
+          </a>
+	</li>
+	<li class="col-xs-12 col-md-10 menu">
+	  <h2><a href="/vi-VN/documentation.html">Tài liệu</a></h2>
+	  <h2><a href="/vi-VN/install.html">Cài đặt</a></h2>
+	  <h2><a href="/vi-VN/community.html">Cộng đồng</a></h2>
+	  <h2><a href="/vi-VN/contribute.html">Đóng góp</a></h2>
+	</li>
+      </ul>
+    </header>
+
+    {{ content }}
+
+    <footer>
+      <p>Our site in other languages:
+        <a href="/en-US/">English</a>,
+        <a href="/fr/">Français</a>,
+        <a href="/ko-KR/">한국어</a>,
+        <a href="/pt-BR/">Português</a>,
+        <a href="/ru-RU/">Русский</a>,
+        <a href="/zh-CN/">简体中文</a>
+      </p>
+    </footer>
+
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      ga('create', 'UA-58390457-1', 'auto');
+      ga('send', 'pageview');
+
+    </script>
+  </body>
+</html>
diff --git a/_layouts/vi-VN/default.html b/_layouts/vi-VN/default.html
@@ -0,0 +1,7 @@
+---
+layout: vi-VN/basic
+---
+
+<div class="content">
+  {{ content }}
+</div>
diff --git a/_layouts/zh-CN/basic.html b/_layouts/zh-CN/basic.html
@@ -40,9 +40,11 @@ <h2><a href="/zh-CN/contribute.html">贡献</a></h2>
       <p>本土化页面：
         <a href="/en-US/">English</a>,
         <a href="/fr/">Français</a>,
+		<a href="/ja-JP/">日本語</a>,
         <a href="/ko-KR/">한국어</a>,
         <a href="/pt-BR/">Português</a>,
-        <a href="/ru-RU/">Русский</a>
+        <a href="/ru-RU/">Русский</a>,
+        <a href="/vi-VN/">Tiếng việt</a>
       </p>
     </footer>
 

diff --git a/_layouts/zh-CN/faq.html b/_layouts/zh-CN/faq.html
@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: zh-CN/default
 ---
 
 <link href='https://fonts.googleapis.com/css?family=Source+Serif+Pro:400,600' rel='stylesheet' type='text/css'>