From 86ec8b69d6b5bac7a147676c5604f280fe7238a0 Mon Sep 17 00:00:00 2001
From: Ivan Yarcev <yarcev.id@ublinux.ru>
Date: Tue, 20 May 2025 17:49:38 +0600
Subject: [PATCH] Fixed localisation building

---
 Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 24ac260..6df4b42 100644
--- a/Makefile
+++ b/Makefile
@@ -105,16 +105,15 @@ uninstall:
 install: check uninstall
 	@echo "Install ..."
 	@for FILE_PO in $(wildcard *.po); do \
-		LANG=$${FILE_PO##*_}; LANG=$${LANG%.*}; \
+		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}"; \
 	done
-	@for LANG in $$(for FILE in *.po; do echo $${FILE##*_} | sed 's/\.po//'; done | sort -u); do \
-		PO_FILES=$$(ls *$${LANG}.po); \
-		TMP_MERGED_PO=$$(mktemp); \
-		msgcat --use-first $$PO_FILES -o "$$TMP_MERGED_PO"; \
-		msgfmt "$$TMP_MERGED_PO" -v -f -o "${DESTDIR}/usr/share/locale/$$LANG/LC_MESSAGES/${PKGNAME}.mo"; \
-		rm -f "$$TMP_MERGED_PO"; \
-	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"; \
@@ -136,6 +135,7 @@ install: check uninstall
 	@echo "Install: OK"
 
 
+
 clean:
 	@echo "Clean ..."
 	@$(RM) -rd ${CMAKE_BUILD_DIR}