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

Commit c5c0754

Browse files
brsonbrson
authored
Merge pull request #711 from brson/www
Improve browser detection and install instructions
2 parents a2de8ef + 6628dae commit c5c0754

File tree

13 files changed

+263
-124
lines changed

13 files changed

+263
-124
lines changed

‎_includes/rustup.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ function detect_platform() {
3333
if (os == "unknown") {
3434
if (navigator.appVersion.indexOf("Win")!=-1) {os = "win";}
3535
if (navigator.appVersion.indexOf("Mac")!=-1) {os = "unix";}
36+
// rust-www/#692 - FreeBSD epiphany!
37+
if (navigator.appVersion.indexOf("FreeBSD")!=-1) {os = "unix";}
3638
}
3739

3840
return os;

‎_includes/set_platform.js

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎css/style.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,9 @@ footer a {
667667
letter-spacing: 0.1rem;
668668
}
669669

670-
#platform-instructions-unknown div {
670+
/* This is the box that prints navigator.platform, navigator.appVersion values */
671+
#platform-instructions-unknown > div:first-of-type {
672+
font-size: 1rem;
671673
line-height: 2rem;
672674
}
673675

‎en-US/install.html

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,38 @@ <h1 class="rustup">Install Rust</h1>
3333
</div>
3434

3535
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
36+
<!-- unrecognized platform: ask for help -->
3637
<p>I don't recognize your platform.</p>
3738
<p>
3839
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
3940
you are on one of these platforms and are seeing this then please
4041
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
4142
along with the following values:
42-
<div>
43-
<div>navigator.platform:</div>
44-
<div id="nav-plat"></div>
45-
<div>navigator.appVersion:</div>
46-
<div id="nav-app"></div>
47-
</div>
4843
</p>
44+
45+
<div>
46+
<div>navigator.platform:</div>
47+
<div id="nav-plat"></div>
48+
<div>navigator.appVersion:</div>
49+
<div id="nav-app"></div>
50+
</div>
51+
52+
<!-- duplicate the default cross-platform instructions -->
53+
<div>
54+
<p>To install Rust, if you are running Unix,<br/>run the following
55+
in your terminal, then follow the onscreen instructions.</p>
56+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
57+
</div>
58+
59+
<hr/>
60+
61+
<div>
62+
<p>
63+
If you are running Windows,<br/>download and run
64+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
65+
then follow the onscreen instructions.
66+
</p>
67+
</div>
4968
</div>
5069

5170
<div id="platform-instructions-default" class="instructions">

‎es-ES/install.html

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,45 @@ <h1 class="rustup">Instalar Rust</h1>
4242
</div>
4343

4444
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
45+
<!-- unrecognized platform: ask for help -->
4546
<p>No reconozco tu plataforma.</p>
46-
<p>
47-
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
48-
you are on one of these platforms and are seeing this then please
49-
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
50-
along with the following values:
51-
<div>
52-
<div>navigator.platform:</div>
53-
<div id="nav-plat"></div>
54-
<div>navigator.appVersion:</div>
55-
<div id="nav-app"></div>
56-
</div>
57-
</p>
5847
<p>
5948
Rust se puede ejecutar en Windows, Linux, Max OS X, FreeBSD y
6049
NetBSD. Si estas en una de estas plataformas y estás viendo esto,
6150
por favor
6251
<a href="https://github.com/rust-lang/rust-www/issues/new">reporta un error</a>,
6352
con la siguientes información:
64-
<div>
65-
<div>navigator.platform:</div>
66-
<div id="nav-plat"></div>
67-
<div>navigator.appVersion:</div>
68-
<div id="nav-app"></div>
69-
</div>
7053
</p>
54+
55+
<div>
56+
<div>navigator.platform:</div>
57+
<div id="nav-plat"></div>
58+
<div>navigator.appVersion:</div>
59+
<div id="nav-app"></div>
60+
</div>
61+
62+
<!-- duplicate the default cross-platform instructions -->
63+
<div>
64+
<p>Para instalar Rust en Unix,<br/>ejecuta lo siguiente en tu
65+
terminal y sigue las instrucciones en pantalla.</p>
66+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
67+
</div>
68+
69+
<hr/>
70+
71+
<div>
72+
<p>
73+
If you are running Windows,<br/>download and run
74+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
75+
then follow the onscreen instructions.
76+
</p>
77+
<p>
78+
Si estas en Windows,<br/>descarga y ejecuta
79+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
80+
luego sigue las instrucciones en pantalla.
81+
</p>
82+
</div>
83+
7184
</div>
7285

7386
<div id="platform-instructions-default" class="instructions">

‎fr-FR/install.html

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,39 @@ <h1 class="rustup">Installer Rust</h1>
3333
</div>
3434

3535
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
36+
<!-- unrecognized platform: ask for help -->
3637
<p>Je ne reconnais pas votre plate-forme.</p>
3738
<p>
3839
Rust tourne sur Windows, Linux, Mac OS X, FreeBSD et NetBSD. Si
3940
vous êtes sur une de ces plate-formes et que vous voyez ceci, alors, s'il vous plaît,
4041
<a href="https://github.com/rust-lang/rust-www/issues/new">signalez un problème</a>,
41-
avec les valeurs suivantes :
42-
<div>
43-
<div>navigator.platform:</div>
44-
<div id="nav-plat"></div>
45-
<div>navigator.appVersion:</div>
46-
<div id="nav-app"></div>
47-
</div>
42+
avec les valeurs suivantes:
4843
</p>
44+
45+
<div>
46+
<div>navigator.platform:</div>
47+
<div id="nav-plat"></div>
48+
<div>navigator.appVersion:</div>
49+
<div id="nav-app"></div>
50+
</div>
51+
52+
<!-- duplicate the default cross-platform instructions -->
53+
<div>
54+
<p>Pour installer Rust, si vous êtes sur Unix,<br/>lancez la commande suivante
55+
dans votre terminal, puis suivez les instructions affichées à l'écran.</p>
56+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
57+
</div>
58+
59+
<hr/>
60+
61+
<div>
62+
<p>
63+
Si vous êtes sur Windows,<br/>téléchargez et exécutez
64+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
65+
et suivez les instructions affichées à l'écran.
66+
</p>
67+
</div>
68+
4969
</div>
5070

5171
<div id="platform-instructions-default" class="instructions">

‎it-IT/install.html

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,38 @@ <h1 class="rustup">Installa Rust</h1>
3333
</div>
3434

3535
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
36+
<!-- unrecognized platform: ask for help -->
3637
<p>Non ho riconosciuto la tua piattaforma.</p>
3738
<p>
3839
Rust é disponibile per Windows, Linux, Mac OS X, FreeBSD and NetBSD. Se
3940
sei su una di queste piattaforme e vedi questo messaggio per favore
4041
<a href="https://github.com/rust-lang/rust-www/issues/new">segnala un problema</a>,
4142
insieme a questi valori
42-
<div>
43-
<div>navigator.platform:</div>
44-
<div id="nav-plat"></div>
45-
<div>navigator.appVersion:</div>
46-
<div id="nav-app"></div>
47-
</div>
4843
</p>
44+
45+
<div>
46+
<div>navigator.platform:</div>
47+
<div id="nav-plat"></div>
48+
<div>navigator.appVersion:</div>
49+
<div id="nav-app"></div>
50+
</div>
51+
52+
<!-- duplicate the default cross-platform instructions -->
53+
<div>
54+
<p>Per installare Rust, su sistemi Unix,<br/>esegui il seguente comando
55+
nel tuo terminale e poi segui le istruzioni.</p>
56+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
57+
</div>
58+
59+
<hr/>
60+
61+
<div>
62+
<p>
63+
Se sei su Windows,<br/>scarica e esegui
64+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
65+
poi segui le istruzioni a schermo.
66+
</p>
67+
</div>
4968
</div>
5069

5170
<div id="platform-instructions-default" class="instructions">

‎ja-JP/install.html

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,38 @@ <h1 class="rustup">Install Rust</h1>
3333
</div>
3434

3535
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
36+
<!-- unrecognized platform: ask for help -->
3637
<p>I don't recognize your platform.</p>
3738
<p>
3839
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
3940
you are on one of these platforms and are seeing this then please
4041
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
4142
along with the following values:
42-
<div>
43-
<div>navigator.platform:</div>
44-
<div id="nav-plat"></div>
45-
<div>navigator.appVersion:</div>
46-
<div id="nav-app"></div>
47-
</div>
4843
</p>
44+
45+
<div>
46+
<div>navigator.platform:</div>
47+
<div id="nav-plat"></div>
48+
<div>navigator.appVersion:</div>
49+
<div id="nav-app"></div>
50+
</div>
51+
52+
<!-- duplicate the default cross-platform instructions -->
53+
<div>
54+
<p>To install Rust, if you are running Unix,<br/>run the following
55+
in your terminal, then follow the onscreen instructions.</p>
56+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
57+
</div>
58+
59+
<hr/>
60+
61+
<div>
62+
<p>
63+
If you are running Windows,<br/>download and run
64+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
65+
then follow the onscreen instructions.
66+
</p>
67+
</div>
4968
</div>
5069

5170
<div id="platform-instructions-default" class="instructions">

‎ko-KR/install.html

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,38 @@ <h1 class="rustup">Install Rust</h1>
3333
</div>
3434

3535
<div id="platform-instructions-unknown" class="instructions" style="display: none;">
36+
<!-- unrecognized platform: ask for help -->
3637
<p>I don't recognize your platform.</p>
3738
<p>
3839
Rust runs on Windows, Linux, Mac OS X, FreeBSD and NetBSD. If
3940
you are on one of these platforms and are seeing this then please
4041
<a href="https://github.com/rust-lang/rust-www/issues/new">report an issue</a>,
4142
along with the following values:
42-
<div>
43-
<div>navigator.platform:</div>
44-
<div id="nav-plat"></div>
45-
<div>navigator.appVersion:</div>
46-
<div id="nav-app"></div>
47-
</div>
4843
</p>
44+
45+
<div>
46+
<div>navigator.platform:</div>
47+
<div id="nav-plat"></div>
48+
<div>navigator.appVersion:</div>
49+
<div id="nav-app"></div>
50+
</div>
51+
52+
<!-- duplicate the default cross-platform instructions -->
53+
<div>
54+
<p>To install Rust, if you are running Unix,<br/>run the following
55+
in your terminal, then follow the onscreen instructions.</p>
56+
<pre>curl https://sh.rustup.rs -sSf | sh</pre>
57+
</div>
58+
59+
<hr/>
60+
61+
<div>
62+
<p>
63+
If you are running Windows,<br/>download and run
64+
<a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
65+
then follow the onscreen instructions.
66+
</p>
67+
</div>
4968
</div>
5069

5170
<div id="platform-instructions-default" class="instructions">

0 commit comments

Comments
 (0)