Skip to content

Make install button easier #1004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 10, 2020
Merged

Make install button easier #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fd36f6
Make install page better
Zexbe Feb 6, 2020
b9fb2c2
Change install detect message
Zexbe Feb 6, 2020
e21b75d
Replace nobr with span nowrap
Zexbe Feb 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions locales/en-US/tools.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ tools-install-page-title = Install Rust

install-using-rustup-heading = Using rustup (Recommended)

install-rustup32-button = Download <span class="nowrap">rustup-init.exe</span> <span class="nowrap">(32-bit)</span>

install-rustup64-button = Download <span class="nowrap">rustup-init.exe</span> <span class="nowrap">(64-bit)</span>

install-notes-heading = Notes about Rust installation

install-notes-getting-started-description = If you're just getting started with
Expand Down Expand Up @@ -149,8 +153,8 @@ install-other-methods-link = Learn more

## components/tools/rustup.hbs

tools-rustup-unixy = It looks like you’re running macOS, Linux, or another Unix-like OS. To download Rustup and install Rust, run the following in your terminal, then follow the on-screen instructions.
tools-rustup-windows = It looks like you’re running Windows. To install Rust, download and run the following, and then follow the onscreen instructions.
tools-rustup-unixy = It looks like you’re running macOS, Linux, or another Unix-like OS. To download Rustup and install Rust, run the following in your terminal, then follow the on-screen instructions. See <a href="https://forge.rust-lang.org/infra/other-installation-methods.html">"Other Installation Methods"</a> if you are on Windows.
tools-rustup-windows = It looks like you’re running Windows. To start using Rust, download the installer, then run the program and follow the onscreen instructions. See <a href="https://forge.rust-lang.org/infra/other-installation-methods.html">"Other Installation Methods"</a> if you are not on Windows.
tools-rustup-wsl-heading = Windows Subsystem for Linux
tools-rustup-wsl = If you’re a Windows Subsystem for Linux user run the following in your terminal, then follow the on-screen instructions to install Rust.
tools-rustup-unknown = Rust runs on Windows, Linux, macOS, FreeBSD and NetBSD. If you are on one of these platforms and are seeing this then please report an issue with the following values:
Expand Down
17 changes: 13 additions & 4 deletions templates/components/tools/rustup.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@
</div>
<div id="platform-instructions-win" class="instructions dn">
<p>{{fluent "tools-rustup-windows"}}</p>
<a href="https://win.rustup.rs" class="button button-secondary">rustup‑init.exe</a>
<p><b>{{fluent "tools-rustup-wsl-heading"}}</b></p>
<p>{{fluent "tools-rustup-wsl"}}</p>
<pre><code class="db w-100">curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh</code></pre>
<div class="mw9 center ph3-ns">
<div class="cf ph2-ns">
<div class="fl w-100 w-50-ns pa2">
<a href="https://static.rust-lang.org/rustup/dist/i686-pc-windows-msvc/rustup-init.exe" class="button button-secondary">{{fluent "install-rustup32-button"}}</a>
</div>
<div class="fl w-100 w-50-ns pa2">
<a href="https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" class="button button-secondary">{{fluent "install-rustup64-button"}}</a>
</div>
</div>
</div>
<h3 class="mt4">{{fluent "tools-rustup-wsl-heading"}}</h3>
<p>{{fluent "tools-rustup-wsl"}}</p>
<pre><code class="db w-100">curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh</code></pre>
</div>
<div id="platform-instructions-unknown" class="instructions dn">
<!-- unrecognized platform: ask for help -->
Expand Down