Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit c332c34

Browse files
steveklabniksteveklabnik
authored
Merge pull request #682 from AndrewBrinker/fix-language-codes
Fixed language codes for fr-FR and es-ES
2 parents 5e6a0ac + b108849 commit c332c34

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+128
-58
lines changed

‎_includes/fr/example.rs renamed to ‎_includes/fr-FR/example.rs

File renamed without changes.

‎_includes/fr/example.rs.html renamed to ‎_includes/fr-FR/example.rs.html

File renamed without changes.

‎_layouts/basic.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ <h2><a href="/en-US/contribute.html">Contribute</a></h2>
3838

3939
<footer>
4040
<p>Our site in other languages:
41-
<a href="/es/">Español</a>,
42-
<a href="/fr/">Français</a>,
41+
<a href="/es-ES/">Español</a>,
42+
<a href="/fr-FR/">Français</a>,
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/pt-BR/">Português</a>,

‎_layouts/es-ES/basic.html

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<!DOCTYPE html>
2+
<!-- Page last generated {{ site.time }} -->
3+
<html lang="en">
4+
<head>
5+
<meta charset="utf-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<title>{{ page.title }}</title>
9+
<meta name="keywords" content="Rust, Rust programming language, rustlang, rust-lang, Mozilla Rust">
10+
<meta name="description" content="A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.">
11+
12+
<link rel="stylesheet" href="/css/bootstrap.css">
13+
<link rel="stylesheet" href="/css/style.css">
14+
</head>
15+
16+
<body class="container">
17+
<a href="https://github.com/rust-lang/rust">
18+
<img class="ribbon" style="display: none" src="/logos/forkme.png" alt="Fork me on GitHub" width="298" height="298">
19+
</a>
20+
21+
<header>
22+
<ul class="row menu">
23+
<li class="col-xs-12 col-md-2">
24+
<a href="/en-US/index.html">
25+
<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" />
26+
</a>
27+
</li>
28+
<li class="col-xs-12 col-md-10 menu">
29+
<h2><a href="/en-US/documentation.html">Documentation</a></h2>
30+
<h2><a href="/en-US/install.html">Install</a></h2>
31+
<h2><a href="/en-US/community.html">Community</a></h2>
32+
<h2><a href="/en-US/contribute.html">Contribute</a></h2>
33+
</li>
34+
</ul>
35+
</header>
36+
37+
{{ content }}
38+
39+
<footer>
40+
<p>Our site in other languages:
41+
<a href="/es-ES/">Español</a>,
42+
<a href="/fr-FR/">Français</a>,
43+
<a href="/ja-JP/">日本語</a>,
44+
<a href="/ko-KR/">한국어</a>,
45+
<a href="/pt-BR/">Português</a>,
46+
<a href="/ru-RU/">Русский</a>,
47+
<a href="/vi-VN/">Tiếng việt</a>,
48+
<a href="/zh-CN/">简体中文</a>
49+
</p>
50+
</footer>
51+
52+
<script>
53+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
54+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
55+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
56+
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
57+
58+
ga('create', 'UA-58390457-1', 'auto');
59+
ga('send', 'pageview');
60+
61+
</script>
62+
</body>
63+
</html>

‎_layouts/fr/default.html renamed to ‎_layouts/es-ES/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: fr/basic
2+
layout: es-ES/basic
33
---
44

55
<div class="content">

‎_layouts/fr/basic.html renamed to ‎_layouts/fr-FR/basic.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<!-- Page last generated {{ site.time }} -->
3-
<html lang="fr">
3+
<html lang="fr-FR">
44
<head>
55
<meta charset="utf-8">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -21,15 +21,15 @@
2121
<header>
2222
<ul class="row menu">
2323
<li class="col-xs-12 col-md-2">
24-
<a href="/fr/index.html">
24+
<a href="/fr-FR/index.html">
2525
<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" />
2626
</a>
2727
</li>
2828
<li class="col-xs-12 col-md-10 menu">
29-
<h2><a href="/fr/documentation.html">Documentation</a></h2>
30-
<h2><a href="/fr/install.html">Install</a></h2>
31-
<h2><a href="/fr/community.html">Communauté</a></h2>
32-
<h2><a href="/fr/contribute.html">Contribuer</a></h2>
29+
<h2><a href="/fr-FR/documentation.html">Documentation</a></h2>
30+
<h2><a href="/fr-FR/install.html">Install</a></h2>
31+
<h2><a href="/fr-FR/community.html">Communauté</a></h2>
32+
<h2><a href="/fr-FR/contribute.html">Contribuer</a></h2>
3333
</li>
3434
</ul>
3535
</header>
@@ -43,7 +43,7 @@ <h2><a href="/fr/contribute.html">Contribuer</a></h2>
4343
<a href="/ko-KR/">한국어</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,
46-
<a href="/vi-VN/">Tiếng việt</a>,
46+
<a href="/vi-VN/">Tiếng việt</a>,
4747
<a href="/zh-CN/">简体中文</a>
4848
</p>
4949
</footer>

‎_layouts/fr-FR/default.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: fr-FR/basic
3+
---
4+
5+
<div class="content">
6+
{{ content }}
7+
</div>

‎_layouts/ja-JP/basic.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<!-- Page last generated {{ site.time }} -->
3-
<html lang="ja">
3+
<html lang="ja-JP">
44
<head>
55
<meta charset="utf-8">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -38,8 +38,8 @@ <h2><a href="/en-US/contribute.html">開発に参加する</a></h2>
3838

3939
<footer>
4040
<p>他の言語のページ:
41-
<a href="/en-US/">English</a>,
42-
<a href="/fr/">Français</a>,
41+
<a href="/en-US/">English</a>,
42+
<a href="/fr-FR/">Français</a>,
4343
<a href="/ko-KR/">한국어</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,

‎_layouts/ko-KR/basic.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<!-- Page last generated {{ site.time }} -->
3-
<html lang="ko">
3+
<html lang="ko-KR">
44
<head>
55
<meta charset="utf-8">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -39,7 +39,7 @@ <h2><a href="/ko-KR/contribute.html">기여하기</a></h2>
3939
<footer>
4040
<p>이 사이트를 다른 언어로 보기:
4141
<a href="/en-US/">English</a>,
42-
<a href="/fr/">Français</a>,
42+
<a href="/fr-FR/">Français</a>,
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,

‎_layouts/pt-BR/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2><a href="/pt-BR/contribute.html">Contribua</a></h2>
3939
<footer>
4040
<p>Nosso site em outros idiomas:
4141
<a href="/en-US/">English</a>,
42-
<a href="/fr/">Français</a>,
42+
<a href="/fr-FR/">Français</a>,
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/ru-RU/">Русский</a>,

‎_layouts/ru-RU/basic.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ <h2><a href="/ru-RU/contribute.html">Участие</a></h2>
3535
</header>
3636

3737
{{ content }}
38-
38+
3939
<footer>
4040
<p>Наш сайт на других языках:
4141
<a href="/en-US/">English</a>,
42-
<a href="/fr/">Français</a>,
42+
<a href="/fr-FR/">Français</a>,
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/pt-BR/">Português</a>,

‎_layouts/vi-VN/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2><a href="/vi-VN/contribute.html">Đóng góp</a></h2>
3939
<footer>
4040
<p>Our site in other languages:
4141
<a href="/en-US/">English</a>,
42-
<a href="/fr/">Français</a>,
42+
<a href="/fr-FR/">Français</a>,
4343
<a href="/ko-KR/">한국어</a>,
4444
<a href="/pt-BR/">Português</a>,
4545
<a href="/ru-RU/">Русский</a>,

‎_layouts/zh-CN/basic.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h2><a href="/zh-CN/contribute.html">贡献</a></h2>
3939
<footer>
4040
<p>本土化页面：
4141
<a href="/en-US/">English</a>,
42-
<a href="/fr/">Français</a>,
42+
<a href="/fr-FR/">Français</a>,
4343
<a href="/ja-JP/">日本語</a>,
4444
<a href="/ko-KR/">한국어</a>,
4545
<a href="/pt-BR/">Português</a>,

‎es/community.md renamed to ‎es-ES/community.md

Lines changed: 1 addition & 1 deletion

‎es/conduct.md renamed to ‎es-ES/conduct.md

Lines changed: 1 addition & 1 deletion

‎es/contribute-bugs.md renamed to ‎es-ES/contribute-bugs.md

‎es/contribute-community.md renamed to ‎es-ES/contribute-community.md

‎es/contribute-compiler.md renamed to ‎es-ES/contribute-compiler.md

‎es/contribute-docs.md renamed to ‎es-ES/contribute-docs.md

‎es/contribute-libs.md renamed to ‎es-ES/contribute-libs.md

‎es/contribute-tools.md renamed to ‎es-ES/contribute-tools.md

‎es/contribute-translations.md renamed to ‎es-ES/contribute-translations.md

‎es/contribute.md renamed to ‎es-ES/contribute.md

‎es/documentation.md renamed to ‎es-ES/documentation.md

Lines changed: 1 addition & 1 deletion

‎es/downloads.html renamed to ‎es-ES/downloads.html

File renamed without changes.

‎es/faq.md renamed to ‎es-ES/faq.md

‎es/friends.html renamed to ‎es-ES/friends.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: es/basic
2+
layout: es-ES/basic
33
title: Amigos de Rust &middot; El lenguaje de programación Rust
44
---
55

‎es/index.html renamed to ‎es-ES/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: es/basic
2+
layout: es-ES/basic
33
title: El lenguaje de programación Rust
44
---
55

‎es/install.html renamed to ‎es-ES/install.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: es/default
2+
layout: es-ES/default
33
title: Instalación &middot; El lenguaje de programación Rust
44
---
55
<h1 class="rustup">Instalar Rust</h1>
@@ -19,7 +19,7 @@ <h1 class="rustup">Instalar Rust</h1>
1919
</p>
2020
</div>
2121

22-
<div id="platform-instructions-android" class="instructions" style="display: none;">
22+
<div id="platform-instructions-android" class="instructions" style="display: none;">
2323
<p>Parece que estas ejecutando Android.</p>
2424
<p>
2525
The Rust compiler does not run on Android directly (yet),

‎es/legal.md renamed to ‎es-ES/legal.md

‎es/other-installers.md renamed to ‎es-ES/other-installers.md

‎es/security.html renamed to ‎es-ES/security.html

File renamed without changes.

‎es/team.md renamed to ‎es-ES/team.md

Lines changed: 1 addition & 1 deletion

‎es/user-groups.md renamed to ‎es-ES/user-groups.md

‎fr/community.md renamed to ‎fr-FR/community.md

Lines changed: 1 addition & 1 deletion

‎fr/conduct.md renamed to ‎fr-FR/conduct.md

Lines changed: 1 addition & 1 deletion

‎fr/contribute-bugs.md renamed to ‎fr-FR/contribute-bugs.md

Lines changed: 1 addition & 1 deletion

‎fr/contribute-community.md renamed to ‎fr-FR/contribute-community.md

Lines changed: 1 addition & 1 deletion

‎fr/contribute-compiler.md renamed to ‎fr-FR/contribute-compiler.md

Lines changed: 1 addition & 1 deletion

‎fr/contribute-docs.md renamed to ‎fr-FR/contribute-docs.md

Lines changed: 1 addition & 1 deletion

‎fr/contribute-libs.md renamed to ‎fr-FR/contribute-libs.md

Lines changed: 1 addition & 1 deletion

‎fr/contribute-tools.md renamed to ‎fr-FR/contribute-tools.md

Lines changed: 1 addition & 1 deletion

‎fr/contribute.md renamed to ‎fr-FR/contribute.md

Lines changed: 1 addition & 1 deletion

‎fr/documentation.md renamed to ‎fr-FR/documentation.md

Lines changed: 1 addition & 1 deletion

‎fr/downloads.html renamed to ‎fr-FR/downloads.html

File renamed without changes.

‎fr/faq.md renamed to ‎fr-FR/faq.md

‎fr/friends.html renamed to ‎fr-FR/friends.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: fr/basic
2+
layout: fr-FR/basic
33
title: Amis de Rust &middot; Rust, le langage de programmation
44
---
55

‎fr/index.html renamed to ‎fr-FR/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
layout: fr/basic
2+
layout: fr-FR/basic
33
title: Langage de programmation Rust
44
---
55
<!-- -->
@@ -39,12 +39,12 @@ <h2>Fonctionnalités</h2>
3939
<div class="col-md-8">
4040
<div id="active-code">
4141
<button type="button" class="btn btn-primary btn-sm" id="run-code">Exécuter</button>
42-
<div id="editor">{% include fr/example.rs %}</div>
42+
<div id="editor">{% include fr-FR/example.rs %}</div>
4343
<div id="result">
4444
<a id="playlink"><i class="icon-link-ext"></i></a>
4545
</div>
4646
</div>
47-
<div id="static-code">{% include fr/example.rs.html %}</div>
47+
<div id="static-code">{% include fr-FR/example.rs.html %}</div>
4848
<div class="more-examples">
4949
<a href="http://rustbyexample.com/">Plus d’exemples</a>
5050
</div>

0 commit comments

Comments
 (0)