Merge pull request #2043 from rust-lang/master

Manishearth · web-flow · commit 2021cb2ed5ac · 2024-09-09T16:09:36.000-07:00
Deploy
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,7 +4,7 @@ updates:
   - package-ecosystem: cargo
     directory: "/"
     schedule:
-      interval: weekly
+      interval: monthly
     groups:
       all:
         patterns:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/locales/en-US/learn.ftl b/locales/en-US/learn.ftl
@@ -108,7 +108,7 @@ learn-generating-steps = <p>Let’s write a small application with our new Rust
     { $tree }
     <p><code>Cargo.toml</code> is the manifest file for Rust. It’s where you keep metadata for your project, as well as dependencies.</p>
     <p><code>src/main.rs</code> is where we’ll write our application code.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p>The <code>cargo new</code> step generated a "Hello, world!" project for us! We can run this program by moving into the new directory that we made and running this in our terminal:</p>
     <p><code>cargo run</code></p>
     <p>You should see this in your terminal:</p>
diff --git a/locales/es/learn.ftl b/locales/es/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> es el archivo de manifiesto de Rust. Es donde mantenemos los metadatos del proyecto, así como la declaración de dependencias.</p>
     <p><code>src/main.rs</code> es donde escribimos el código de nuestra aplicación.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> genera un proyecto de "Hello, world" para nosotros. Podemos ejecutar el programa si nos movemos al nuevo directorio recién creado ejecutando en tu terminal:</p>
     <p><code>cargo run</code></p>
     <p>Deberías ver esto en tu terminal:</p>
diff --git a/locales/fr/learn.ftl b/locales/fr/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> est le fichier manifeste de Rust. C'est là que vous gardez les métadonnées pour votre projet, ainsi que les dépendances.</p>
     <p><code>src/main.rs</code> est l'endroit où vous écrirez le code de notre application.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> génère pour nous un projet "Hello, world!". Nous pouvons exécuter ce programme en nous déplaçant dans le nouveau répertoire que nous avons créé et en exécutant ceci dans notre terminal :</p>
     <p><code>cargo run</code></p>
     <p>Vous devriez voir ceci dans votre terminal :</p>
diff --git a/locales/it/learn.ftl b/locales/it/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> è il manifest per i progetti Rust. Contiene i metadati, così come l'elenco delle dipendenze.</p>
     <p><code>src/main.rs</code> il file che conterrà il codice della nostra applicazione.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> crea un progetto del tipo "Hello, world!"! Possiamo eseguire questo programma scendendo nella directory che abbiamo appena creato e poi lanciare:</p>
     <p><code>cargo run</code></p>
     <p>Questo l'output che dovrebbe apparire sulla console:</p>
diff --git a/locales/ja/learn.ftl b/locales/ja/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code>はRust用のマニフェストファイルです。プロジェクトのメタデータに加え依存関係も記録されます。</p>
     <p><code>src/main.rs</code>がアプリケーションのコードを書く場所です。</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code>は「Hello, world!」プロジェクトを生成します！ターミナルで作成した新しいディレクトリに移動し、以下を実行することでこのプログラムを実行できます：</p>
     <p><code>cargo run</code></p>
     <p>以下の出力が得られるはずです：</p>
diff --git a/locales/pl/learn.ftl b/locales/pl/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> to plik manifestowy projektu Rust. Jest to miejsce, w którym trzymane są metadane dotyczące naszego projektu oraz jego zależności w postaci rozmaitych bibliotek kodu.</p>
     <p><code>src/main.rs</code> to plik, w którym będziemy pisać nasz program.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> tworzy dla nas domyślny projekt "Hello, world!". Możemy uruchomić tak powstałą aplikację, wchodząc w katalog projektu i uruchamiając następujące polecenie:</p>
     <p><code>cargo run</code></p>
     <p>Na ekranie powinniśmy zobaczyć:</p>
diff --git a/locales/pt-BR/learn.ftl b/locales/pt-BR/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> é o manifesto de um projeto Rust. Aqui você encontra todos os metadados do projeto, assim como as declarações de dependência.</p>
     <p><code>src/main.rs</code> é onde nos vamos escrever nossa aplicação.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> gera um projeto "Hello, world!" para você! Você pode executar esse programa entrando no diretório recém criado e executando o seguinte no seu terminal:</p>
     <p><code>cargo run</code></p>
     <p>Você deveria ver a seguinte saída no terminal:</p>
diff --git a/locales/ru/learn.ftl b/locales/ru/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> - это файл манифеста. Здесь хранятся метаданные вашего проекта, такие как описание.</p>
     <p>В файле <code>src/main.rs</code> вы пишете код приложения.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> создал для нас проект "Hello, world!". Для запуска этой программы мы перейдём в директорию, которая была создана, и запустим в терминале:</p>
     <p><code>cargo run</code></p>
     <p>Вы должны увидеть следующее:</p>
diff --git a/locales/tr/learn.ftl b/locales/tr/learn.ftl
@@ -80,7 +80,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code>, Rust için manifesto dosyasıdır. Burası projenizin metaverisini sakladığınız yer olmakla birlikte, bağımlılıkların da belirtildiği yerdir.</p>
     <p>Uygulama kodunuzun bulunduğu yer ise <code>src/main.rs</code>'dir.</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code>, bizim için yeni bir "Merhaba, dünya!" projesi oluşturur! Bu programı yeni bir dizine taşıyıp, aşağıdaki kodla uçbirimimizde çalıştırabiliriz:</p>
     <p><code>cargo run</code></p>
     <p>Uçbiriminizde şu çıktıyı almanız gerekmektedir:</p>
diff --git a/locales/zh-CN/learn.ftl b/locales/zh-CN/learn.ftl
@@ -87,7 +87,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> 为 Rust 的清单文件。其中包含了项目的元数据和依赖库。</p>
     <p><code>src/main.rs</code> 为编写应用代码的地方。</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> 会生成一个新的“Hello, world!”项目！我们可以进入新创建的目录中，执行下面的命令来运行此程序：</p>
     <p><code>cargo run</code></p>
     <p>您应该会在终端中看到如下内容：</p>
diff --git a/locales/zh-TW/learn.ftl b/locales/zh-TW/learn.ftl
@@ -83,7 +83,7 @@ learn-generating-steps =
     { $tree }
     <p><code>Cargo.toml</code> 是 Rust 的 manifest 檔案，它是保存專案 metadata 與相依套件資訊的地方。</p>
     <p><code>src/main.rs</code> 是我們要編寫程式碼的地方。</p>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
     <p><code>cargo new</code> 會為我們產生一個「Hello, world!」的專案！我們可以移動到這個新的目錄並在我們的終端機上執行：</p>
     <p><code>cargo run</code></p>
     <p>您應該會在終端機上看到以下訊息：</p>
diff --git a/src/styles/app.scss b/src/styles/app.scss
@@ -531,7 +531,7 @@ blockquote::before {
   width: 80%;
 }
 
-.get-started-hr {
+.white-hr {
   background-color: white;
   height: 1px;
   border: 0px;
diff --git a/static/scripts/tools-install.js b/static/scripts/tools-install.js
@@ -157,8 +157,23 @@ function set_up_cycle_button() {
 function fill_in_bug_report_values() {
     var nav_plat = document.getElementById("nav-plat");
     var nav_app = document.getElementById("nav-app");
+    var report_link = document.getElementById("report-unknown-platform-link");
     nav_plat.textContent = navigator.platform;
     nav_app.textContent = navigator.appVersion;
+    var issue_template = `\
+<!--
+    PLEASE do not open an issue if you are using Android!
+
+    The Rust toolchain does not run and can't be installed on Android.
+
+    If you are on desktop, go ahead and open this issue.
+-->
+
+navigator.platform: \`${navigator.platform}\`
+navigator.appVersion: \`${navigator.appVersion}\`
+
+The website did not recognize the platform I'm on, so I am unable to install rustup.`;
+    report_link.href = "https://github.com/rust-lang/www.rust-lang.org/issues/new?title=Unrecognized%20platform&body=" + encodeURIComponent(issue_template);
 }
 
 var override_map = new Map ([
diff --git a/templates/components/tools/rustup.html.hbs b/templates/components/tools/rustup.html.hbs
@@ -33,15 +33,22 @@
       </div>
     </div>
     <br/>
-    <a href="https://github.com/rust-lang/www.rust-lang.org/issues/new?title=Unrecognized%20platform&body=navigator.platform%3A%20_please%20fill%20out_%0Anavigator.appVersion%3A%20_please%20fill%20out_%0A%0AThe%20website%20did%20not%20recognize%20the%20platform%20I%27m%20on%2C%20so%20I%20am%20unable%20to%20install%20rustup." class="button button-secondary">{{fluent "tools-rustup-report"}}</a>
-    <hr/>
+    <!-- This href is overwritten with a better template in static/scripts/tools-install.js -->
+    <a
+      href="https://github.com/rust-lang/www.rust-lang.org/issues/new"
+      id="report-unknown-platform-link"
+      class="button button-secondary"
+    >
+      {{fluent "tools-rustup-report"}}
+    </a>
+    <hr class="white-hr" />
     <div>
       <p>
         {{fluent "tools-rustup-manual-unixy"}}
       </p>
       <code class="db w-100">curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh</code>
     </div>
-    <hr>
+    <hr class="white-hr" />
     <div>
       <p>
         {{fluent "tools-rustup-manual-windows"}}
@@ -55,7 +62,7 @@
       </p>
       <pre><code class="db w-100">curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh</code></pre>
     </div>
-    <hr>
+    <hr class="white-hr" />
     <div>
       <p>
         {{fluent "tools-rustup-manual-default-windows"}}
diff --git a/templates/learn/get-started.html.hbs b/templates/learn/get-started.html.hbs
@@ -15,7 +15,7 @@
     </header>
     <p>{{fluent "learn-play"}}</p>
     <a href="https://play.rust-lang.org/" class="button button-secondary">{{fluent "learn-play-button"}}</a>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
 
     <h3>{{fluent "learn-install-rustup-header"}}</h3>
     <p>{{fluent "learn-install-rustup"}}</p>
@@ -25,12 +25,12 @@
     <p>{{#fluent "learn-install-rustup-update"}}{{#fluentparam "update-command"}}<code>rustup update</code>{{/fluentparam}}{{/fluent}}</p>
     <br />
     <a href="{{baseurl}}/tools/install" class="button button-secondary">{{fluent "learn-install-rustup-button"}}</a>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
 
     <h3>{{fluent "learn-install-cargo-header"}}</h3>
     {{fluent "learn-install-cargo"}}
     <a href="https://doc.rust-lang.org/cargo/index.html" class="button button-secondary">{{fluent "learn-install-cargo-button"}}</a>
-    <hr class="get-started-hr" />
+    <hr class="white-hr" />
 
     <h3>{{fluent "learn-install-other"}}</h3>
     <p>{{fluent "learn-install-editors"}}</p>

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ blockquote::before {`
`531`	`531`	`width: 80%;`
`532`	`532`	`}`
`533`	`533`
`534`		`-.get-started-hr {`
	`534`	`+.white-hr {`
`535`	`535`	`background-color: white;`
`536`	`536`	`height: 1px;`
`537`	`537`	`border: 0px;`