-
Notifications
You must be signed in to change notification settings - Fork 32
feat: Add translation support for motd #154
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.
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
Draft
theMimolet
wants to merge
11
commits into
projectbluefin:main
Choose a base branch
from
theMimolet:translatable-motd
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
9dbf4dc
feat:added translation support for motd (WIP)
theMimolet c328bf4
fix: change lang.list's path to an absolute path
theMimolet 5cc9ec8
Merge branch 'main' into translatable-motd
theMimolet 2124fc0
Merge branch 'projectbluefin:main' into translatable-motd
theMimolet bdf4c59
Refactor: rewrite of the motd translation support
theMimolet 019cc77
fix(lang): spelling mistake in the french translation
theMimolet faf5913
fix(lang): string was worded weirdly in the french translation
theMimolet d69fea4
fix(lang): tiny fixes in the tips - french translation
theMimolet 7752812
Update system_files/bluefin/usr/share/ublue-os/motd/lang/en.json
theMimolet cd75359
Update MOTD environment script path
theMimolet b95e849
fix(lang): match the french translation to the original
theMimolet File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
3 changes: 2 additions & 1 deletion
3
system_files/bluefin/usr/share/ublue-os/motd/env.sh
100755 → 100644
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| #!/usr/bin/env sh | ||
| # KEEP THIS SMALL | ||
| # This will run on every shell that a user starts up. | ||
|
|
||
| export MOTD_DIRECTORY="/usr/share/ublue-os/motd/" | ||
| export MOTD_IMAGE_NAME="$(jq -rc '."image-ref"' "${MOTD_IMAGE_INFO_FILE:-/usr/share/ublue-os/image-info.json}" | sed 's@ostree-image-signed:docker://@@')" | ||
| export MOTD_IMAGE_TAG="$(jq -rc '."image-tag"' "${MOTD_IMAGE_INFO_FILE:-/usr/share/ublue-os/image-info.json}")" | ||
| export MOTD_TIP="${MOTD_TIP:-"$(/usr/bin/cat "${MOTD_TIP_DIRECTORY:-/usr/share/ublue-os/motd/tips}"/*.md 2>/dev/null | shuf -n 1)"}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "welcome": "Welcome to Bluefin", | ||
| "cmd": "Command", | ||
| "desc": "Description", | ||
| "choose": "Show available commands", | ||
| "toggle": "Toggle this banner on/off", | ||
| "bling": "Enable terminal bling", | ||
| "brew": "Manage command line packages", | ||
| "issues": "Issues", | ||
| "askbluefin": "Ask Bluefin", | ||
| "docs": "Documentation" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "welcome": "Bienvenue sur Bluefin", | ||
| "cmd": "Commande", | ||
| "desc": "Description", | ||
| "choose": "Affiche les commandes disponibles", | ||
| "toggle": "Active/Désactive cette bannière", | ||
| "bling": "Active le bling du terminal", | ||
| "brew": "Gère les paquets de la ligne de commande", | ||
| "issues": "Signaler un problème", | ||
| "askbluefin": "Consulter Bluefin", | ||
| "docs": "Documentation " | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,16 @@ | ||
| # Welcome to Bluefin | ||
| # ${_welcome} | ||
|
|
||
| `${MOTD_IMAGE_NAME}:${MOTD_IMAGE_TAG}` | ||
|
|
||
| | Command | Description | | ||
| | ${_cmd} | ${_desc} | | ||
| | ------- | ----------- | | ||
| | `ujust --choose` | Show available commands | | ||
| | `ujust toggle-user-motd` | Toggle this banner on/off | | ||
| | `ujust bluefin-cli` | Enable terminal bling | | ||
| | `brew help` | Manage command line packages | | ||
| | `ujust --choose` | ${_choose} | | ||
| | `ujust toggle-user-motd` | ${_toggle} | | ||
| | `ujust bluefin-cli` | ${_bling} | | ||
| | `brew help` | ${_brew} | | ||
|
|
||
| ${MOTD_TIP} | ||
|
|
||
| - **** [Issues](https://issues.projectbluefin.io) | ||
| - **** [Ask Bluefin](https://ask.projectbluefin.io) | ||
| - **** [Documentation](https://docs.projectbluefin.io) | ||
| - **** [${_issues}](https://issues.projectbluefin.io) | ||
| - **** [${_askbluefin}](https://ask.projectbluefin.io) | ||
| - **** [${_docs}](https://docs.projectbluefin.io) |
File renamed without changes.
26 changes: 26 additions & 0 deletions
26
system_files/bluefin/usr/share/ublue-os/motd/tips/tips-fr.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| Bluefin est votre passerelle vers le Cloud Native - rejoignez la communauté sur [landscape.cncf.io](https://l.cncf.io) | ||
| Vous aimez votre bureau ? Faites un don à [GNOME](https://donate.gnome.org) ! | ||
| Soutenez l'App Store ! Faites un don à [Bazaar](https://github.com/kolunmi/bazaar) ! | ||
| Vous avez besoin d'informations techniques plus détaillées ? Consultez le [Guide de l'administrateur Bluefin](https://docs.projectbluefin.io/administration) | ||
| Vous aimez les serveurs ? Découvrez [ucore](https://github.com/ublue-os/ucore) | ||
| Une mise à jour a causé un problème ? Vous pouvez revenir en arrière avec `bootc rollback`. | ||
| Utilisez `brew search` et `brew install` pour installer des paquets. Bluefin se chargera automatiquement des mises à jour. | ||
| Utilisez `Ctrl`-`Alt`-`Entrée` pour ouvrir rapidement un terminal. | ||
| Tailscale est inclus, consultez [leur documentation](https://tailscale.com/kb/1017/install). | ||
| `ujust --choose` vous montrera chaque raccourci et le script qu'il exécute. | ||
| `tldr vim` vous donnera un aperçu des commandes de base pour un outil donné. | ||
| `ujust rebase-helper` peut vous aider à revenir à une image spécifique ou à un canal entièrement différent. Consultez la documentation pour plus d'informations. | ||
| `ujust changelogs` affiche un résumé des modifications apportées au paquet depuis la dernière mise à jour. | ||
| N'oubliez pas de consulter les [notes de mise à jour](https://github.com/ublue-os/bluefin/releases). | ||
| Aidez Bluefin à rester actif et en bonne santé, pensez à faire un [don](https://docs.projectbluefin.io/donations). | ||
| Développez avec des devcontainers ! Utilisez les fichiers `devcontainer.json` dans vos projets pour créer des environnements isolés et reproductibles. | ||
| Utilisez DistroShelf (dans le logo-menu sous « Containers ») pour créer des conteneurs personnalisés pour différentes distributions. | ||
| `ujust jetbrains-toolbox` installe les outils JetBrains dans votre dossier personnel, prêts à l'emploi ! | ||
| Des outils de profilage des performances sont intégrés : essayez `sysprof`, `bpftrace` et d'autres outils de débogage. | ||
| Changez de shell en toute sécurité : modifiez votre shell dans les paramètres du terminal plutôt que dans l'ensemble du système. | ||
| VS Code est livré avec l'extension devcontainers préinstallée, parfaite pour le développement conteneurisé. | ||
| Le développement de conteneurs est indépendant du système d'exploitation : vos devcontainers fonctionnent sous Linux, macOS et Windows. | ||
| Utilisez `docker compose` pour le développement multi-conteneurs si les devcontainers ne correspondent pas à votre flux de travail. | ||
| Ouvrez un dossier avec Clapgrep (disponible dans l'app store Bazaar) pour une recherche ultra puissante. | ||
| Bluefin sépare le système d'exploitation de votre environnement de développement : adoptez le flux de travail cloud natif. | ||
| Découvrez `ujust bbrew` pour une sélection d'applications de développement et de ligne de commande. |
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. same here |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks like you accidentally stripped the executable bit somewhere down the line