Skip to content

Commit c8a0eec

Browse files
bishaboshabishabosha
authored
Merge pull request #2405 from bishabosha/inline-tabs
2 parents 59fce6a + 2f54c51 commit c8a0eec

30 files changed

+350
-251
lines changed

‎_config.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ scala-3-version: 3.1.2
2222
collections:
2323
contribute_resources:
2424
output: false
25-
install_tabs:
26-
output: false
2725
style:
2826
output: true
2927
overviews:

‎_fr/getting-started/index.md

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,43 @@ L'installateur Scala est un outil nommé [Coursier](https://get-coursier.io/docs
2727
Il s'assure que la JVM est les outils standards de Scala sont installés sur votre système.
2828
Installez-le sur votre système avec les instructions suivantes.
2929

30-
<div class="main-download">
31-
<div class="recommended-install">
32-
<div class="place-inline">
33-
{% include tabsection.html language='fr' id='install-cs-setup-tabs' collection=site.install_tabs %}
34-
</div>
35-
<!-- TODO: translate 'Test your setup' from _includes/getting-started.md, embellish tabs -->
36-
</div>
37-
</div>
30+
<!-- Display tabs for each OS -->
31+
{% tabs install-cs-setup-tabs class=platform-os-options %}
32+
33+
<!-- macOS -->
34+
{% tab macOS for=install-cs-setup-tabs %}
35+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %}
36+
{% altDetails cs-setup-macos-nobrew "Alternativement, si vous n'utilisez pas Homebrew:" %}
37+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %}
38+
{% endaltDetails %}
39+
{% endtab %}
40+
<!-- end macOS -->
41+
42+
<!-- Linux -->
43+
{% tab Linux for=install-cs-setup-tabs %}
44+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %}
45+
{% endtab %}
46+
<!-- end Linux -->
47+
48+
<!-- Windows -->
49+
{% tab Windows for=install-cs-setup-tabs %}
50+
Téléchargez et exécutez [l'intallateur Scala pour Windows]({{site.data.setup-scala.windows-link}}) basé sur Coursier.
51+
{% endtab %}
52+
<!-- end Windows -->
53+
54+
<!-- Other -->
55+
{% tab Other for=install-cs-setup-tabs defaultTab %}
56+
<noscript>
57+
<p><span style="font-style:italic;">JavaScript est désacivé. Cliquez sur l'onglet correspondant à votre système d'exploitation.</span></p>
58+
</noscript>
59+
Suivez
60+
[les instructions pour installer la commande `cs`](https://get-coursier.io/docs/cli-installation)
61+
puis exécutez `./cs setup`.
62+
{% endtab %}
63+
<!-- end Other -->
64+
65+
{% endtabs %}
66+
<!-- End tabs -->
3867

3968
En plus de gérer les JVMs, `cs setup` installe aussi des utilitaires en ligne de commande :
4069

‎_includes/_ja/getting-started.md

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,41 @@ Scala をインストールすると、コンパイラやビルドツールな
1717
Scala のインストーラーは[Coursier](https://get-coursier.io/docs/cli-overview)というツールで、コマンドは`cs`です。このツールを使うと、JVM と標準 Scala ツールがシステムにインストールされます。
1818
以下の手順でお使いのシステムにインストールしてください。
1919

20-
<div class="main-download">
21-
<div class="recommended-install">
22-
<div class="place-inline">
23-
{% include tabsection.html language='ja' id='install-cs-setup-tabs' collection=site.install_tabs %}
24-
</div>
25-
<!-- TODO: translate 'Test your setup' from _includes/getting-started.md, embellish tabs -->
26-
</div>
27-
</div>
20+
<!-- Display tabs for each OS -->
21+
{% tabs install-cs-setup-tabs class=platform-os-options %}
22+
23+
<!-- macOS -->
24+
{% tab macOS for=install-cs-setup-tabs %}
25+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %}
26+
{% altDetails cs-setup-macos-nobrew "または、Homebrewを使用しない場合は" %}
27+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %}
28+
{% endaltDetails %}
29+
{% endtab %}
30+
<!-- end macOS -->
31+
32+
<!-- Linux -->
33+
{% tab Linux for=install-cs-setup-tabs %}
34+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %}
35+
{% endtab %}
36+
<!-- end Linux -->
37+
38+
<!-- Windows -->
39+
{% tab Windows for=install-cs-setup-tabs %}
40+
[the Scala installer for Windows]({{site.data.setup-scala.windows-link}})を、ダウンロードして実行してください。
41+
{% endtab %}
42+
<!-- end Windows -->
43+
44+
<!-- Other -->
45+
{% tab Other for=install-cs-setup-tabs defaultTab %}
46+
<noscript>
47+
<p><span style="font-style:italic;">JavaScript is disabled, click the tab relevant for your OS.</span></p>
48+
</noscript>
49+
[手順に従って `cs` ランチャーをインストール](https://get-coursier.io/docs/cli-installation)し、その次に以下を実行します。`./cs setup`
50+
{% endtab %}
51+
<!-- end Other -->
52+
53+
{% endtabs %}
54+
<!-- End tabs -->
2855

2956
`cs setup` は JVM の管理だけでなく、便利なコマンドラインツールもインストールします:
3057

‎_includes/alt-details.html

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

‎_includes/getting-started.md

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,56 @@ The Scala installer is a tool named [Coursier](https://get-coursier.io/docs/cli-
2020
It ensures that a JVM and standard Scala tools are installed on your system.
2121
Install it on your system with the following instructions.
2222

23-
{% capture scalaDemo %}$ scala -version
24-
Scala code runner version {{site.scala-3-version}} -- Copyright 2002-2022, LAMP/EPFL{% endcapture %}
25-
26-
<div class="main-download">
27-
<div class="recommended-install">
28-
<div class="place-inline">
29-
{% include tabsection.html language='en' id='install-cs-setup-tabs' collection=site.install_tabs %}
30-
</div>
31-
{% capture checkSetupDetail %}
32-
<div class="wrap-inline">
33-
<div class="wrap">
34-
<p>Check your setup with the command <code>scala -version</code>, which should output:</p>
35-
{% include code-snippet.html nocopy=true language='bash' codeSnippet=scalaDemo %}
36-
<p>If that does not work, you may need to log out and log back in (or reboot) in order for the changes to take
37-
effect.
38-
</p>
39-
</div>
40-
</div>
41-
{% endcapture %}
42-
<div class="place-inline">
43-
{% include alt-details.html id='testing-your-setup' title='Testing your setup' detail=checkSetupDetail %}
44-
</div>
45-
</div>
46-
</div>
23+
<!-- Display tabs for each OS -->
24+
{% tabs install-cs-setup-tabs class=platform-os-options %}
25+
26+
<!-- macOS -->
27+
{% tab macOS for=install-cs-setup-tabs %}
28+
Run the following command in your terminal, following the on-screen instructions:
29+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-brew %}
30+
{% altDetails cs-setup-macos-nobrew "Alternatively, if you don't use Homebrew:" %}
31+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.macOS-default %}
32+
{% endaltDetails %}
33+
{% endtab %}
34+
<!-- end macOS -->
35+
36+
<!-- Linux -->
37+
{% tab Linux for=install-cs-setup-tabs %}
38+
Run the following command in your terminal, following the on-screen instructions:
39+
{% include code-snippet.html language='bash' codeSnippet=site.data.setup-scala.linux %}
40+
{% endtab %}
41+
<!-- end Linux -->
42+
43+
<!-- Windows -->
44+
{% tab Windows for=install-cs-setup-tabs %}
45+
Download and execute [the Scala installer for Windows]({{site.data.setup-scala.windows-link}})
46+
based on Coursier, and follow the on-screen instructions.
47+
{% endtab %}
48+
<!-- end Windows -->
49+
50+
<!-- Other -->
51+
{% tab Other for=install-cs-setup-tabs defaultTab %}
52+
<noscript>
53+
<p><span style="font-style:italic;">JavaScript is disabled, click the tab relevant for your OS.</span></p>
54+
</noscript>
55+
Follow the documentation from Coursier on
56+
[how to install and run `cs setup`](https://get-coursier.io/docs/cli-installation).
57+
{% endtab %}
58+
<!-- end Other -->
59+
60+
{% endtabs %}
61+
<!-- End tabs -->
62+
63+
<!-- Alternative Detail - test the `scala` command -->
64+
{% altDetails testing-your-setup 'Testing your setup' %}
65+
Check your setup with the command `scala -version`, which should output:
66+
```bash
67+
$ scala -version
68+
Scala code runner version {{site.scala-3-version}} -- Copyright 2002-2022, LAMP/EPFL
69+
```
70+
If that does not work, you may need to log out and log back in (or reboot) in order for the changes to take effect.
71+
{% endaltDetails %}
72+
<!-- end Alternative Detail -->
4773

4874

4975
Along with managing JVMs, `cs setup` also installs useful command-line tools:

‎_includes/tabsection.html

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

‎_install_tabs/1-macos.html

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

‎_install_tabs/2-linux.html

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

‎_install_tabs/3-windows.html

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

‎_install_tabs/4-other.html

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

‎_install_tabs/fr-1-macos.html

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

‎_install_tabs/fr-2-linux.html

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

‎_install_tabs/fr-3-windows.html

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

‎_install_tabs/fr-4-other.html

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

‎_install_tabs/ja-1-macos.html

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

‎_install_tabs/ja-2-linux.html

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

‎_install_tabs/ja-3-windows.html

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

0 commit comments

Comments
 (0)