Fix .po and Makefile

3 months ago · 500b87c460
parent 42b4124b4d
commit 500b87c460
5 changed files with 80 additions and 59 deletions
--- a/76
+++ b/76
@ -12,10 +12,6 @@ DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
 FILE_VER = source/${PKGNAME}.h
-PKGIDENT=$(subst /,-,${PREFIX})
-
-FILE_MO := $(PKGNAME).mo
-LOCALE_DIR := ./locale

 default_target: all

@ -25,9 +21,9 @@ all: init build

 init:
 	@echo "Initialize ..."; \
-	if [ -d ".git" ]; then \
+	if [[ -d ".git" ]]; then \
 	    LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \
-		if [ -z "$${LATEST_TAG}" ]; \
+		if [[ -z "$${LATEST_TAG}" ]]; \
 		then \
 			LATEST_TAG=$$"0.0"; \
 			echo "$${LATEST_TAG} is empty"; \
@ -41,7 +37,7 @@ init:
 depend:
 	@echo "Check depends ..."
 	@for FILE_DEPEND in $(DEPENDS); do \
-	    if [ ! -f $${FILE_DEPEND} ]; then \
+	    if [[ ! -f "$${FILE_DEPEND}" ]]; then \
 		echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \
 		exit 1; \
 	    fi; \
@ -51,21 +47,21 @@ depend:

 debug:
 	@echo "Debug ..."
-	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
+	if [[ ! -d "${CMAKE_BUILD_DIR}" ]]; then \
 	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Debug: OK"

 prepare:
 	@echo "Prepare ..."; \
-	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
+	if [[ ! -d "${CMAKE_BUILD_DIR}" ]]; then \
 	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Prepare: OK"

 check:
 	@echo "Check ..."; \
-	if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \
+	if [[ -f "${CMAKE_BUILD_DIR}/${PKGNAME}" ]]; then \
 	    echo "Check: OK"; \
 	else \
 	    echo "Check: ${CMAKE_BUILD_DIR}/${PKGNAME} not found !"; \
@ -80,10 +76,9 @@ build: depend prepare

 uninstall:
 	@echo "Uninstall ..."
-	@for FILE_PO in $(wildcard *.po); do \
-	    LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-	    FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-	    PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	@for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \
+#	    PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
+	    PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
 	    $(RM) "$${PATH_FILE_MO}"; \
 	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
@ -97,46 +92,55 @@ uninstall:
 	done
 	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
-	@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
-	@if [ -z ${DESTDIR} ]; then \
-	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
+	@if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \
+	    $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"; \
+	else \
+#	    $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \
+	    $(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \
+	fi
+	@if [[ -z "${DESTDIR}" ]]; then \
+	    [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
-	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	    [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Uninstall: OK"

 install: check uninstall
 	@echo "Install ..."
-	@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); \
+	@for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \
+	    install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
+#	    PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
+	    PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \
+	    PKGNAME_PO="./locale/${PKGNAME}_$${LANG}.po"; [[ -f "$${PKGNAME_PO}" ]] || PKGNAME_PO= ; \
+	    msgfmt --verbose --use-fuzzy --output-file "$${PATH_FILE_MO}" - < <(msgcat --use-first --no-wrap $${PKGNAME_PO} ./locale/*_$${LANG}.po); \
 	done
-
 	@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"; \
+	    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"; \
 	done
-	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy
-	@sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
-	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
-	@ldconfig -n /usr/local/lib
-	@if [ -z ${DESTDIR} ]; then \
-	    [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+	@if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \
+	    install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"; \
+	else \
+#	    install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \
+	    install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \
+#	    sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \
+	    sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \
+	fi
+	@if [[ -z "${DESTDIR}" ]]; then \
+	    ldconfig -n ${DESTDIR}${PREFIX}/lib; \
+	    [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
-	    [ -d "${DESTDIR}/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \
+	    [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Install: OK"

-
-
 clean:
 	@echo "Clean ..."
 	@$(RM) -rd ${CMAKE_BUILD_DIR}
-	@if [ -d ${CMAKE_BUILD_DIR} ]; then \
+	@if [[ -d "${CMAKE_BUILD_DIR}" ]]; then \
 	    echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \
 	else \
 	    echo "Clean: OK"; \
--- a/locale/journals_list.pot
+++ b/locale/journals_list.pot
@ -1,4 +1,4 @@
-# Language translations for ubl-settings-logging package.
+# Language translations journals_list.csv for ubl-settings-logging package.
 # Copyright (C) 2025, UBTech LLC
 # This file is distributed under the same license as the ubl-settings-logging package.
 # UBLinux Team <support@ublinux.com>, 2025
@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ubl-settings-logging 1.0\n"
+"Project-Id-Version: ubl-settings-logging_journals_list.csv 1.0\n"
 "Report-Msgid-Bugs-To: support@ublinux.com\n"
 "POT-Creation-Date: 2025-05-20 00:00+0600\n"
 "PO-Revision-Date: 2025-05-20 00:00+0600\n"
-"Last-Translator: UBLinux Team <support@ublinux.com>\n"
+"Last-Translator: ublinux <support@ublinux.com>\n"
 "Language-Team: UBLinux Team <support@ublinux.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@ -51,4 +51,4 @@ msgid "X.org display server log"
 msgstr ""

 msgid "Graphics X session log"
-msgstr ""
+msgstr ""
--- a/locale/journals_list_ru.po
+++ b/locale/journals_list_ru.po
@ -1,3 +1,22 @@
+# Russian translations journals_list.csv for ubl-settings-logging package.
+# Copyright (C) 2025, UBTech LLC
+# This file is distributed under the same license as the ubl-settings-logging package.
+# UBLinux Team <support@ublinux.com>, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubl-settings-logging_journals_list.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 <support@ublinux.com>\n"
+"Language-Team: Russian - UBLinux Team <support@ublinux.com>\n"
+"Language: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 msgid "Log of work and requests to Acpid"
 msgstr "Журнал работы и обращений к Acpid"

@ -29,4 +48,4 @@ msgid "System log"
 msgstr "Системный журнал"

 msgid "X.org display server log"
-msgstr "Журнал работы дисплейного сервера X.org"
+msgstr "Журнал работы дисплейного сервера X.org"
--- a/locale/ubl-settings-logging.pot
+++ b/locale/ubl-settings-logging.pot
@ -1,17 +1,17 @@
 # Language translations for ubl-settings-logging package.
-# Copyright (C) 2022, UBTech LLC
+# Copyright (C) 2025, UBTech LLC
 # This file is distributed under the same license as the ubl-settings-logging package.
-# UBLinux Team <info@ublinux.com>, 2022
+# UBLinux Team <support@ublinux.com>, 2025
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ubl-settings-logging 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-22 16:12+0600\n"
-"PO-Revision-Date: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"Report-Msgid-Bugs-To: support@ublinux.com\n"
+"POT-Creation-Date: 2023-01-01 00:00+0600\n"
+"PO-Revision-Date: 2025-01-01 00:00+0600\n"
+"Last-Translator: ublinux <support@ublinux.com>\n"
+"Language-Team: UBLinux Team <support@ublinux.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
--- a/locale/ubl-settings-logging_ru.po
+++ b/locale/ubl-settings-logging_ru.po
@ -1,17 +1,17 @@
 # Russian translations for ubl-settings-logging package.
-# Copyright (C) 2022, UBTech LLC
+# Copyright (C) 2025, UBTech LLC
 # This file is distributed under the same license as the ubl-settings-logging package.
-# UBLinux Team <info@ublinux.com>, 2022
+# UBLinux Team <support@ublinux.com>, 2025
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ubl-settings-logging 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-22 16:12+0600\n"
-"PO-Revision-Date: 2023-01-01 00:00+0600\n"
-"Last-Translator: UBLinux Team <info@ublinux.com>\n"
-"Language-Team: Russian - UBLinux Team <info@ublinux.com>\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 <support@ublinux.com>\n"
+"Language-Team: Russian - UBLinux Team <support@ublinux.com>\n"
 "Language: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -38,7 +38,6 @@ msgid "Configuration file"
 msgstr "Файл конфигурации"

 #: source/ubl-strings.h:10
-#, fuzzy
 msgid "Choose custom configuration file"
 msgstr "Файл конфигурации"

@ -676,7 +675,6 @@ msgid "Journal/log files were not found"
 msgstr "Файлы журналов/логов не были найдены"

 #: source/ubl-strings.h:198
-#, fuzzy, c-format
 msgid "Journal \"%s\" configuration"
 msgstr "Настройка журналов \"%s\""

@ -738,11 +736,11 @@ msgstr "Сохранение"

 #: source/ubl-strings.h:219
 msgid "Authorization has been elevated"
-msgstr ""
+msgstr "Уровень авторизации повышен"

 #: source/ubl-strings.h:220
 msgid "Authorization has been unelevated"
-msgstr ""
+msgstr "Уровень авторизации не повышен"

 msgid "System event log rotation service"
 msgstr "Служба ротации системных журналов событий"