From 6b6267e3a417a9442aaaea7a0a45146bd36c45c6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 28 Aug 2020 00:49:23 +0200
Subject: [PATCH] i18n: check for gettext rather than just calling msgfmt

- *secretly* this is already done in the KF5 i18n modules,
  so the resizefs was already requiring FindGettext.
- we don't actually use the gettext modules' CMake macros,
  so explain why in the module.
---
 CMakeModules/CalamaresAddTranslations.cmake | 28 ++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/CMakeModules/CalamaresAddTranslations.cmake b/CMakeModules/CalamaresAddTranslations.cmake
index be5ce201d..56953187c 100644
--- a/CMakeModules/CalamaresAddTranslations.cmake
+++ b/CMakeModules/CalamaresAddTranslations.cmake
@@ -12,6 +12,15 @@
 
 include( CMakeParseArguments )
 
+# The Gettext module is still old-fashioned, ALLCAPS variables
+find_package( Gettext )
+set_package_properties( GETTEXT PROPERTIES
+    DESCRIPTION "GNU gettext (translation) tools."
+    URL "https://www.gnu.org/software/gettext/"
+    PURPOSE "Gettext is used in the translation of Python modules."
+    TYPE REQUIRED
+)
+
 # Installs a directory containing language-code-labeled subdirectories with
 # gettext data into the appropriate system directory. Allows renaming the
 # .mo files during install to avoid namespace clashes.
@@ -44,8 +53,13 @@ function( install_calamares_gettext_translations )
     endif()
     string( REGEX REPLACE ".mo$" ".po" TRANSLATION_SOURCE_FILENAME "${TRANSLATION_FILENAME}" )
 
-    message(STATUS "Installing gettext translations for ${TRANSLATION_NAME}")
-    message(STATUS "  Installing ${TRANSLATION_FILENAME} from ${TRANSLATION_SOURCE_DIR}")
+    if ( GETTEXT_FOUND AND GETTEXT_MSGFMT_EXECUTABLE )
+        message( STATUS "Installing gettext translations for ${TRANSLATION_NAME}")
+        message( STATUS "  Installing ${TRANSLATION_FILENAME} from ${TRANSLATION_SOURCE_DIR}")
+    else()
+        message( WARNING "Gettext translations requested for ${TRANSLATION_NAME}, but gettext was not found." )
+        return()
+    endif()
 
     set( TARGET_NAME calamares-gettext-translations-${NAME} )
     if( NOT TARGET "${TARGET_NAME}" )
@@ -62,10 +76,18 @@ function( install_calamares_gettext_translations )
         if( lang STREQUAL "en" )
             message( STATUS "  Skipping ${TRANSLATION_NAME} translations for en_US" )
         else()
+            # We **don't** use the gettext macro's here because the source
+            # structure doesn't match: we are calling this once per language
+            # for all of Calamares's languages, while the gettext module
+            # expects it to be called once, for a given language source-dir.
+            #
+            # Using any of the gettext macros just gets us multiple rules
+            # for python.gmo, and it wants to use msgmerge, besides, which
+            # doesn't fit our Transifex workflow.
             make_directory( ${lang_mo_dir} )
             add_custom_command(
                 OUTPUT ${lang_mo}
-                COMMAND msgfmt
+                COMMAND ${GETTEXT_MSGFMT_EXECUTABLE}
                 ARGS -o ${lang_mo} ${lang_po}
                 MAIN_DEPENDENCY ${lang_po}
                 )