From 43012692ccd7ed95679cbbf5f2bd061bf7c8799b Mon Sep 17 00:00:00 2001 From: Jules van Rie Date: Tue, 14 Oct 2025 20:32:42 +0200 Subject: [PATCH 1/2] Correction typos in French --- _partials/fr/windows_ubuntu.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_partials/fr/windows_ubuntu.md b/_partials/fr/windows_ubuntu.md index c11112a0..a72e3265 100644 --- a/_partials/fr/windows_ubuntu.md +++ b/_partials/fr/windows_ubuntu.md @@ -115,7 +115,7 @@ Cela devrait renvoyer le nom d'utilisateur que tu as choisi précédemment. ### Vérifier la locale -Le concept e "locale" permert de personnaliser les programms en fonction de ta langue et ton pays. +Le concept de "locale" permet de personnaliser les programms en fonction de ta langue et ton pays. Vérifions que la locale est bien en **anglais** dans le terminal : From 1f8dc7fdca1318a8dad3099d1104b42e66186a3a Mon Sep 17 00:00:00 2001 From: Jules van Rie Date: Tue, 14 Oct 2025 20:53:21 +0200 Subject: [PATCH 2/2] Move locale from Win Ubuntu to CLI tools partial The locale problem also happens on some Ubuntu installations. The solution currently sits in the Windows Update partial, but it makes more sense to include it in a partial that caters for both Windows and Ubuntu. The start of the CLI tools section is a good place to do this: - It fits better with the setup actions we do in that section. - It is still early enough: the problem only gets triggered after dotfiles. This commit will automatically move this in the right place. No need to change the `build.rb`. The next rebuild of the data-setup will then also include these changes. DA and DE setups do not rely on these partials. Also corrected some typos in the FR partial. --- _partials/cli_tools.md | 30 ++++++++++++++++++++++++++++++ _partials/es/cli_tools.md | 30 ++++++++++++++++++++++++++++++ _partials/es/windows_ubuntu.md | 30 ------------------------------ _partials/fr/cli_tools.md | 30 ++++++++++++++++++++++++++++++ _partials/fr/windows_ubuntu.md | 31 ------------------------------- _partials/pt/cli_tools.md | 30 ++++++++++++++++++++++++++++++ _partials/pt/windows_ubuntu.md | 31 ------------------------------- _partials/windows_ubuntu.md | 30 ------------------------------ 8 files changed, 120 insertions(+), 122 deletions(-) diff --git a/_partials/cli_tools.md b/_partials/cli_tools.md index 67e149ce..0fb198f2 100644 --- a/_partials/cli_tools.md +++ b/_partials/cli_tools.md @@ -1,5 +1,35 @@ ## Command line tools +### Check the locale + +The locale is a mechanism allowing to customize programs to your language and country. + +Let's verify that the default locale is set to English, please type this in the Ubuntu terminal: + +```bash +locale +``` + +If the output does not contain `LANG=en_US.UTF-8`, run the following command in a Ubuntu terminal to install the english locale: + +```bash +sudo locale-gen en_US.UTF-8 +``` + +If after, you receive a warning (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) in your terminal, please do the following: + +
+ Generate locale + +Please, run this lines in your terminal. + +```bash +sudo update-locale LANG=en_US.UTF8 +sudo apt-get update +sudo apt-get install language-pack-en language-pack-en-base manpages +``` +
+ ### Zsh & Git Instead of using the default `bash` [shell](https://en.wikipedia.org/wiki/Shell_(computing)), we will use `zsh`. diff --git a/_partials/es/cli_tools.md b/_partials/es/cli_tools.md index 2544dcf5..7808ca7b 100644 --- a/_partials/es/cli_tools.md +++ b/_partials/es/cli_tools.md @@ -1,5 +1,35 @@ ## Herramientas de línea de comando +### Comprueba la configuración regional (locale) + +La "locale" es un mecanismo que permite adaptar los programas a su idioma y país. + +Comprobemos que la configuración regional por defecto es el inglés: + +```bash +locale +``` + +Si la salida no contiene `LANG=en_US.UTF-8`, ejecute el siguiente comando en un Ubuntu terminal para instalar la locale inglesa: + +```bash +sudo locale-gen en_US.UTF-8 +``` + +Si después, recibes una advertencia (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) en tu terminal, por favor haz lo siguiente: + +
+ Generar la configuración regional<>/summary> + +Por favor, ejecuta estas líneas en tu terminal. + +```bash +sudo update-locale LANG=en_US.UTF8 +sudo apt-get update +sudo apt-get install language-pack-en language-pack-en-base manpages +``` +
+ ### Zsh & Git En lugar de usar el `bash` [shell](https://en.wikipedia.org/wiki/Shell_(computing)) predeterminado, usaremos `zsh`. diff --git a/_partials/es/windows_ubuntu.md b/_partials/es/windows_ubuntu.md index 2981b48a..22d77bff 100644 --- a/_partials/es/windows_ubuntu.md +++ b/_partials/es/windows_ubuntu.md @@ -110,33 +110,3 @@ whoami Debería devolver el nombre de usuario que elegiste anteriormente. :x: Si dice `root`, **contacta a un profesor** antes de continuar. - -### Comprueba la configuración regional (locale) - -La "locale" es un mecanismo que permite adaptar los programas a su idioma y país. - -Comprobemos que la configuración regional por defecto es el inglés: - -```bash -locale -``` - -Si la salida no contiene `LANG=en_US.UTF-8`, ejecute el siguiente comando en un Ubuntu terminal para instalar la locale inglesa: - -```bash -sudo locale-gen en_US.UTF-8 -``` - -Si después, recibes una advertencia (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) en tu terminal, por favor haz lo siguiente: - -
- Generar la configuración regional<>/summary> - -Por favor, ejecuta estas líneas en tu terminal. - -```bash -sudo update-locale LANG=en_US.UTF8 -sudo apt-get update -sudo apt-get install language-pack-en language-pack-en-base manpages -``` -
diff --git a/_partials/fr/cli_tools.md b/_partials/fr/cli_tools.md index 18b15ab2..1fbb3d2b 100644 --- a/_partials/fr/cli_tools.md +++ b/_partials/fr/cli_tools.md @@ -1,5 +1,35 @@ ## Outils en ligne de commande +### Vérifier la locale + +Le concept de "locale" permet de personnaliser les programms en fonction de ta langue et ton pays. + +Vérifions que la locale est bien en **anglais** dans le terminal : + +```bash +locale +``` + +Si la commande ne renvoie pas quelque chose qui contient `LANG=en_US.UTF-8`, lance ceci dans un terminal Ubuntu : + +```bash +sudo locale-gen en_US.UTF-8 +``` + +Si après, tu reçois un avertissement (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) dans ton terminal, veuillez faire ce qui suit : + +
+ Générer la localisation + +Veuillez exécuter ces lignes dans ton terminal. + +```bash +sudo update-locale LANG=en_US.UTF8 +sudo apt-get update +sudo apt-get install language-pack-en language-pack-en-base manpages +``` +
+ ### Zsh & Git Au lieu d’utiliser le [shell](https://fr.wikipedia.org/wiki/Interface_syst%C3%A8me) `bash` par défaut, nous utiliserons `zsh`. diff --git a/_partials/fr/windows_ubuntu.md b/_partials/fr/windows_ubuntu.md index a72e3265..00ee9ec4 100644 --- a/_partials/fr/windows_ubuntu.md +++ b/_partials/fr/windows_ubuntu.md @@ -111,34 +111,3 @@ whoami Cela devrait renvoyer le nom d'utilisateur que tu as choisi précédemment. :x: Si cela affiche `root`, **contacte un TA** avant de continuer ! - - -### Vérifier la locale - -Le concept de "locale" permet de personnaliser les programms en fonction de ta langue et ton pays. - -Vérifions que la locale est bien en **anglais** dans le terminal : - -```bash -locale -``` - -Si la commande ne renvoie pas quelque chose qui contient `LANG=en_US.UTF-8`, lance ceci dans un terminal Ubuntu : - -```bash -sudo locale-gen en_US.UTF-8 -``` - -Si après, tu reçois un avertissement (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) dans ton terminal, veuillez faire ce qui suit : - -
- Générer la localisation - -Veuillez exécuter ces lignes dans ton terminal. - -```bash -sudo update-locale LANG=en_US.UTF8 -sudo apt-get update -sudo apt-get install language-pack-en language-pack-en-base manpages -``` -
diff --git a/_partials/pt/cli_tools.md b/_partials/pt/cli_tools.md index 6055f814..a4cffe91 100644 --- a/_partials/pt/cli_tools.md +++ b/_partials/pt/cli_tools.md @@ -1,5 +1,35 @@ ## Ferramentas de linha de comando +### Verifique a localidade + +A localidade é um mecanismo que permite personalizar programas de acordo com seu idioma e país. + +Vamos verificar se a localidade padrão está definida como inglês, digite isto no terminal do Ubuntu: + +```bash +locale +``` + +Se a saída não contiver `LANG=en_US.UTF-8`, execute o seguinte comando em um terminal Ubuntu para instalar a localidade em inglês: + +```bash +sudo locale-gen en_US.UTF-8 +``` + +Se, depois, receberes um aviso (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) no teu terminal, por favor faz o seguinte: + +
+ Gerar localidade + +Por favor, executa estas linhas no teu terminal. + +```bash +sudo update-locale LANG=en_US.UTF8 +sudo apt-get update +sudo apt-get install language-pack-en language-pack-en-base manpages +``` +
+ ### Zsh e Git Em vez de usar o `bash` [shell](https://en.wikipedia.org/wiki/Shell_(computing)), usaremos `zsh`. diff --git a/_partials/pt/windows_ubuntu.md b/_partials/pt/windows_ubuntu.md index 0b8955f4..cb9e6854 100644 --- a/_partials/pt/windows_ubuntu.md +++ b/_partials/pt/windows_ubuntu.md @@ -110,34 +110,3 @@ whoami It should return the username you chose before. :x: It if says `root`, **contact a TA** before continuing! - - -### Verifique a localidade - -A localidade é um mecanismo que permite personalizar programas de acordo com seu idioma e país. - -Vamos verificar se a localidade padrão está definida como inglês, digite isto no terminal do Ubuntu: - -```bash -locale -``` - -Se a saída não contiver `LANG=en_US.UTF-8`, execute o seguinte comando em um terminal Ubuntu para instalar a localidade em inglês: - -```bash -sudo locale-gen en_US.UTF-8 -``` - -Se, depois, receberes um aviso (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) no teu terminal, por favor faz o seguinte: - -
- Gerar localidade - -Por favor, executa estas linhas no teu terminal. - -```bash -sudo update-locale LANG=en_US.UTF8 -sudo apt-get update -sudo apt-get install language-pack-en language-pack-en-base manpages -``` -
diff --git a/_partials/windows_ubuntu.md b/_partials/windows_ubuntu.md index 3473bd62..5d5326a2 100644 --- a/_partials/windows_ubuntu.md +++ b/_partials/windows_ubuntu.md @@ -111,33 +111,3 @@ whoami It should return the username you chose before. :x: It if says `root`, **contact a TA** before continuing! - -### Check the locale - -The locale is a mechanism allowing to customize programs to your language and country. - -Let's verify that the default locale is set to English, please type this in the Ubuntu terminal: - -```bash -locale -``` - -If the output does not contain `LANG=en_US.UTF-8`, run the following command in a Ubuntu terminal to install the english locale: - -```bash -sudo locale-gen en_US.UTF-8 -``` - -If after, you receive a warning (`bash: warning: setlocale: LC_ALL: cannot change locale (en_US.utf-8)`) in your terminal, please do the following: - -
- Generate locale - -Please, run this lines in your terminal. - -```bash -sudo update-locale LANG=en_US.UTF8 -sudo apt-get update -sudo apt-get install language-pack-en language-pack-en-base manpages -``` -