From cff23371dc4dd49c9e773dc1dd04eae790133e64 Mon Sep 17 00:00:00 2001 From: Hadi Chokr Date: Fri, 27 Mar 2026 08:09:51 +0100 Subject: [PATCH] Gettext in Bash. --- Messages.sh | 3 ++- mkosi.extra/usr/lib/kjar-install | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Messages.sh b/Messages.sh index 8eccb6f..244884f 100644 --- a/Messages.sh +++ b/Messages.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash # SPDX-FileCopyrightText: None # SPDX-License-Identifier: CC0-1.0 -$XGETTEXT --language=Python mkosi.extra/usr/lib/command-not-found-handler.py --output=$podir/kde-linux.pot +$XGETTEXT --language=Python mkosi.extra/usr/lib/command-not-found-handler.py -o $podir/kde-linux.pot +$XGETTEXT --language=Shell mkosi.extra/usr/lib/kjar-install --join-existing --output=$podir/kde-linux.pot diff --git a/mkosi.extra/usr/lib/kjar-install b/mkosi.extra/usr/lib/kjar-install index d568d7c..7fb348b 100755 --- a/mkosi.extra/usr/lib/kjar-install +++ b/mkosi.extra/usr/lib/kjar-install @@ -2,21 +2,23 @@ # SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL # SPDX-FileCopyrightText: 2026 Hadi Chokr +export TEXTDOMAIN=kde-linux +. gettext.sh + mask() { update-desktop-database ~/.local/share/flatpak/exports/share/applications/ flatpak run org.kde.kjar --generate-wrappers } if flatpak list --app --user | grep -q org.kde.kjar; then - notify-send -a "Java Support" -i application-x-java-archive \ - "Java Support" "Java is already installed and ready to use." + notify-send -a "$(gettext "Java Support")" -i application-x-java-archive \ + "$(gettext "Java Support")" "$(gettext "Java is already installed and ready to use.")" mask exit 0 fi -# Ask for confirmation before downloading anything -if ! kdialog --title "Java Required" \ - --yesno "This file requires Java, but it is not installed.\n\nDownload and install it now?"; then +if ! kdialog --title "$(gettext "Java Required")" \ + --yesno "$(gettext "This file requires Java, but it is not installed.\n\nDownload and install it now?")"; then exit 1 fi @@ -24,12 +26,12 @@ flatpak remote-add --if-not-exists --user kjar-nightly \ https://cdn.kde.org/flatpak/kjar-nightly/kjar-nightly.flatpakrepo NOTIF_ID=$(notify-send --print-id \ - -a "Java Support" \ + -a "$(gettext "Java Support")" \ -i application-x-java-archive \ -u low \ -t 0 \ -h int:value:0 \ - "Installing Java Support" "Starting…") + "$(gettext "Installing Java Support")" "$(gettext "Starting…")") flatpak install --user org.kde.kjar --assumeyes 2>&1 | \ stdbuf -oL grep -oP '\d+(?=%)' | \ @@ -39,14 +41,15 @@ flatpak install --user org.kde.kjar --assumeyes 2>&1 | \ --object-path /org/freedesktop/Notifications \ --method org.freedesktop.Notifications.Notify \ "Java Support" "$NOTIF_ID" "application-x-java-archive" \ - "Installing Java Support" "${pct}%" \ + "$(gettext "Installing Java Support")" "${pct}%" \ "[]" "{'value': , 'urgency': , 'suppress-popup': }" \ "int32 0" > /dev/null 2>&1 done notify-send \ - -a "Java Support" \ + -a "$(gettext "Java Support")" \ -i application-x-java-archive \ -r "$NOTIF_ID" \ - "Java Support Ready" "Installation complete." + "$(gettext "Java Support Ready")" "$(gettext "Installation complete.")" + mask