From 7acf98a85bc5c840b0b6790583c147a388178d29 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 21 May 2025 10:54:50 +0600 Subject: [PATCH] Fixed Makefile localisation install --- Makefile | 17 +++++++-------- locale/grub-parameters.pot | 16 ++------------ locale/grub-parameters_ru.po | 24 --------------------- locale/grub-terminal-input_ru.po | 35 ------------------------------- locale/grub-terminal-output_ru.po | 24 --------------------- 5 files changed, 10 insertions(+), 106 deletions(-) diff --git a/Makefile b/Makefile index 6df4b42..78b45dd 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,9 @@ PKGNAME = $(MAKEFILE_DIR) FILE_VER = source/${PKGNAME}.h PKGIDENT=$(subst /,-,${PREFIX}) +FILE_MO := $(PKGNAME).mo +LOCALE_DIR := ./locale + default_target: all .PHONY: all init depend debug prepare check build uninstall install clean help @@ -104,16 +107,12 @@ uninstall: install: check uninstall @echo "Install ..." - @for FILE_PO in $(wildcard *.po); do \ - LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ - FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ - echo "$${FILE_PO}"; \ - msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ + @for po in $(LOCALE_DIR)/$(PKGNAME)_*.po; do \ + lang=$$(basename $$po | sed -E 's/^$(PKGNAME)_([^.]+)\.po$$/\1/'); \ + file=$$(find ./locale/ -name '*_'"$$lang"'.po'); \ + msgfmt $$file -v -f -o ${DESTDIR}/usr/share/locale/$$lang/LC_MESSAGES/$(FILE_MO); \ done - @mkdir -p ./locale - @msgcat $(wildcard *.pot) | msgfmt -o ./locale/common.mo - + @for SIZE in 16 32 48; do \ install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ diff --git a/locale/grub-parameters.pot b/locale/grub-parameters.pot index f23b8fa..5b86d72 100644 --- a/locale/grub-parameters.pot +++ b/locale/grub-parameters.pot @@ -22,15 +22,9 @@ msgstr "" msgid "Description" msgstr "" -#: ./grub-parameters.csv:2 -msgid "Disable Plymouth" -msgstr "" - -#: ./grub-parameters.csv:3 -msgid "Disable Plymouth" -msgstr "" - #: ./grub-parameters.csv:4 +#: ./grub-parameters.csv:3 +#: ./grub-parameters.csv:2 msgid "Disable Plymouth" msgstr "" @@ -135,13 +129,7 @@ msgid "Prevents the processor from going into a deep sleep state (default:9) (in msgstr "" #: ./grub-parameters.csv:30 -msgid "Eliminates flickering laptop display on Ultra Voltage processors (int)" -msgstr "" - #: ./grub-parameters.csv:31 -msgid "Eliminates flickering laptop display on Ultra Voltage processors (int)" -msgstr "" - #: ./grub-parameters.csv:32 msgid "Eliminates flickering laptop display on Ultra Voltage processors (int)" msgstr "" diff --git a/locale/grub-parameters_ru.po b/locale/grub-parameters_ru.po index c0fbcc6..eb6399e 100644 --- a/locale/grub-parameters_ru.po +++ b/locale/grub-parameters_ru.po @@ -1,27 +1,3 @@ -# Russian translations for ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-parameters.csv package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-parameters.csv package. -# UBLinux Team , 2022 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-parameters.csv 1.0\n" -"Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-04-17 23:28+0600\n" -"Last-Translator: ublinux \n" -"Language-Team: Russian - UBLinux Team \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - - -#: ./grub-parameters.csv:1 -msgid "Description" -msgstr "Описание" - #: ./grub-parameters.csv:3 #: ./grub-parameters.csv:4 #: ./grub-parameters.csv:2 diff --git a/locale/grub-terminal-input_ru.po b/locale/grub-terminal-input_ru.po index 71b637b..a411d2a 100644 --- a/locale/grub-terminal-input_ru.po +++ b/locale/grub-terminal-input_ru.po @@ -1,38 +1,3 @@ -# Russian translations for ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-terminal-input.csv package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-terminal-input.csv package. -# UBLinux Team , 2022 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-terminal-input.csv 1.0\n" -"Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-04-17 23:28+0600\n" -"Last-Translator: ublinux \n" -"Language-Team: Russian - UBLinux Team \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - - -#: ./grub-terminal-input.csv:1 -msgid "Description" -msgstr "Описание" - -#: ./grub-terminal-input.csv:2 -msgid "PC BIOS & EFI console" -msgstr "PC BIOS & EFI консоль" - -#: ./grub-terminal-input.csv:3 -msgid "Serial terminal" -msgstr "Терминал Serial" - -#: ./grub-terminal-input.csv:4 -msgid "Open Firmware Console" -msgstr "Консоль Open Firmware" #: ./grub-terminal-input.csv:5 msgid "PC AT Keyboard (Coreboot)" diff --git a/locale/grub-terminal-output_ru.po b/locale/grub-terminal-output_ru.po index 82130a4..d2fd204 100644 --- a/locale/grub-terminal-output_ru.po +++ b/locale/grub-terminal-output_ru.po @@ -1,27 +1,3 @@ -# Russian translations for ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-terminal-output.csv package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-terminal-output.csv package. -# UBLinux Team , 2022 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ubl-settings-bootloader-/home/superadmin/Документы/ubl-settings-bootloader/grub-terminal-output.csv 1.0\n" -"Report-Msgid-Bugs-To: support@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2025-04-17 23:28+0600\n" -"Last-Translator: ublinux \n" -"Language-Team: Russian - UBLinux Team \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - - -#: ./grub-terminal-output.csv:1 -msgid "Description" -msgstr "Описание" - #: ./grub-terminal-output.csv:2 msgid "PC BIOS & EFI console" msgstr "PC BIOS & EFI консоль"