Merge lp:~leonardolemos/pantheon-calculator/fix-1577995 into lp:~elementary-apps/pantheon-calculator/trunk

[Leonardo Lemos]

Update CMake modules and fix missing translations

[Corentin Noël (tintou)]

review: Approve

[lp:~leonardolemos/pantheon-calculator/fix-1577995]

214. By Leonardo Lemos on 2016-05-16

Update CMake modules and fix missing translations

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2015-01-01 13:13:13 +0000
+++ cmake/Translations.cmake	2016-05-04 15:25:30 +0000
@@ -1,4 +1,5 @@
 # Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+include(CMakeParseArguments)
 
 macro (add_translations_directory NLS_PACKAGE)
     add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
@@ -85,16 +86,44 @@
     endif ()
 endmacro (create_po_file)
 
+macro (configure_file_translation SOURCE RESULT PO_DIR)
+    find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+    set(EXTRA_PO_DIR ${PO_DIR}/extra/)
+    get_filename_component(EXTRA_PO_DIR ${EXTRA_PO_DIR} ABSOLUTE)
+
+    # Intltool can't create a new directory.
+    get_filename_component(SOURCE_DIRECTORY ${SOURCE} DIRECTORY)
+    file(MAKE_DIRECTORY ${SOURCE_DIRECTORY})
+
+    set (INTLTOOL_FLAG "")
+    if (${SOURCE} MATCHES ".desktop")
+        set (INTLTOOL_FLAG "--desktop-style")
+    elseif (${SOURCE} MATCHES ".gschema")
+        set (INTLTOOL_FLAG "--schemas-style")
+    elseif (${SOURCE} MATCHES ".xml")
+        set (INTLTOOL_FLAG "--xml-style")
+    endif ()
+    execute_process (WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --quiet ${INTLTOOL_FLAG} ${EXTRA_PO_DIR} ${SOURCE} ${RESULT})
+endmacro ()
+
 macro (add_translations_catalog NLS_PACKAGE)
+    cmake_parse_arguments (ARGS "" "" "DESKTOP_FILES;APPDATA_FILES;SCHEMA_FILES" ${ARGN})
     add_custom_target (pot COMMENT “Building translation catalog.”)
     find_program (XGETTEXT_EXECUTABLE xgettext)
+    find_program (INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
+
+    set(EXTRA_PO_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extra)
 
     set(C_SOURCE "")
     set(VALA_SOURCE "")
     set(GLADE_SOURCE "")
 
     foreach(FILES_INPUT ${ARGN})
-        set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+        if((${FILES_INPUT} MATCHES ${CMAKE_SOURCE_DIR}) OR (${FILES_INPUT} MATCHES ${CMAKE_BINARY_DIR}))
+            set(BASE_DIRECTORY ${FILES_INPUT})
+        else ()
+            set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+        endif ()
 
         file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c)
         foreach(C_FILE ${SOURCE_FILES})
@@ -102,22 +131,30 @@
         endforeach()
 
         file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala)
-        foreach(VALA_C_FILE ${SOURCE_FILES})
-            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE})
+        foreach(VALA_FILE ${SOURCE_FILES})
+            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_FILE})
         endforeach()
 
         file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui)
-        foreach(GLADE_C_FILE ${SOURCE_FILES})
-            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_C_FILE})
+        foreach(GLADE_FILE ${SOURCE_FILES})
+            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_FILE})
         endforeach()
     endforeach()
 
+    set (XGETTEXT_C_ARGS --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g")
     set(BASE_XGETTEXT_COMMAND
         ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
         -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g" --from-code=UTF-8)
-
-   set(CONTINUE_FLAG "")
+        ${XGETTEXT_C_ARGS} --from-code=UTF-8)
+
+    set(EXTRA_XGETTEXT_COMMAND
+        ${XGETTEXT_EXECUTABLE} -d extra
+        -o ${EXTRA_PO_DIR}/extra.pot --no-location --from-code=UTF-8)
+
+    set (INTLTOOL_EXTRACT_COMMAND
+        ${INTLTOOL_EXTRACT_EXECUTABLE} --local --srcdir=/)
+
+    set(CONTINUE_FLAG "")
 
     IF(NOT "${C_SOURCE}" STREQUAL "")
         add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
@@ -131,5 +168,36 @@
 
     IF(NOT "${GLADE_SOURCE}" STREQUAL "")
         add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
-    ENDIF()  
+    ENDIF()
+
+    # We need to create the directory if one extra content exists.
+    IF((NOT "${ARGS_DESKTOP_FILES}" STREQUAL "") OR (NOT "${ARGS_APPDATA_SOURCE}" STREQUAL "") OR (NOT "${ARGS_SCHEMA_SOURCE}" STREQUAL ""))
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/extra/)
+    ENDIF()
+
+    set(CONTINUE_FLAG "")
+
+    foreach(DESKTOP_SOURCE ${ARGS_DESKTOP_FILES})
+        get_filename_component(DESKTOP_SOURCE ${DESKTOP_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/keys ${DESKTOP_SOURCE})
+        get_filename_component(DESKTOP_SOURCE_NAME ${DESKTOP_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${DESKTOP_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+
+    foreach(APPDATA_SOURCE ${ARGS_APPDATA_FILES})
+        get_filename_component(APPDATA_SOURCE ${APPDATA_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/xml ${APPDATA_SOURCE})
+        get_filename_component(APPDATA_SOURCE_NAME ${APPDATA_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${APPDATA_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
+
+    foreach(SCHEMA_SOURCE ${ARGS_SCHEMA_FILES})
+        get_filename_component(SCHEMA_SOURCE ${SCHEMA_SOURCE} ABSOLUTE)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${INTLTOOL_EXTRACT_COMMAND} --type=gettext/schemas ${SCHEMA_SOURCE})
+        get_filename_component(SCHEMA_SOURCE_NAME ${SCHEMA_SOURCE} NAME)
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${EXTRA_XGETTEXT_COMMAND} ${CONTINUE_FLAG} ${XGETTEXT_C_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/tmp/${SCHEMA_SOURCE_NAME}.h)
+        set(CONTINUE_FLAG "-j")
+    endforeach()
 endmacro ()

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2015-01-01 13:13:13 +0000
+++ cmake/ValaPrecompile.cmake	2016-05-04 15:25:30 +0000
@@ -1,6 +1,6 @@
 ##
 # Copyright 2009-2010 Jakob Westhoff. All rights reserved.
-# Copyright 2012 elementary.
+# Copyright 2012-2016 elementary LLC.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,8 +28,8 @@
 # either expressed or implied, of Jakob Westhoff
 ##
 
-include(ParseArguments)
 find_package(Vala REQUIRED)
+include(CMakeParseArguments)
 
 ##
 # Compile vala files to their c equivalents for further processing. 
@@ -115,7 +115,7 @@
 ##
 
 macro(vala_precompile output target_name)
-    parse_arguments(ARGS "TARGET;PACKAGES;OPTIONS;DIRECTORY;GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
+    cmake_parse_arguments (ARGS "" "GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;DIRECTORY" "PACKAGES;OPTIONS;CUSTOM_VAPIS" ${ARGN})
 
     if(ARGS_DIRECTORY)
         set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
@@ -132,7 +132,7 @@
     set(out_files_display "")
     set(${output} "")
 
-    foreach(src ${ARGS_DEFAULT_ARGS})
+    foreach(src ${ARGS_UNPARSED_ARGUMENTS})
         string(REGEX MATCH "^/" IS_MATCHED ${src})
         if(${IS_MATCHED} MATCHES "/")
             set(src_file_path ${src})
@@ -156,12 +156,14 @@
 
     set(custom_vapi_arguments "")
     if(ARGS_CUSTOM_VAPIS)
+        # Check for relative and absolute paths
         foreach(vapi ${ARGS_CUSTOM_VAPIS})
-            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+            string(REGEX MATCH "^/" IS_MATCHED ${vapi})
+            if(${IS_MATCHED} MATCHES "/")
                 list(APPEND custom_vapi_arguments ${vapi})
-            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+            else()
                 list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
-            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+            endif()
         endforeach(vapi ${ARGS_CUSTOM_VAPIS})
     endif(ARGS_CUSTOM_VAPIS)
 

=== modified file 'cmake/ValaVersion.cmake'
--- cmake/ValaVersion.cmake	2014-11-16 14:48:25 +0000
+++ cmake/ValaVersion.cmake	2016-05-04 15:25:30 +0000
@@ -27,8 +27,8 @@
 # either expressed or implied, of Jakob Westhoff
 ##
 
-include(ParseArguments)
 find_package(Vala REQUIRED)
+include(CMakeParseArguments)
 
 ##
 # Ensure a certain valac version is available
@@ -52,7 +52,7 @@
 # If no option is specified the version will be treated as a minimal version.
 ##
 macro(ensure_vala_version version)
-    parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN})
+    cmake_parse_arguments (ARGS "" "MINIMUM;MAXIMUM;EXACT" "" ${ARGN})
 	set(compare_message "")
 	set(error_message "")
 	if(ARGS_MINIMUM)

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2015-12-14 22:35:47 +0000
+++ data/CMakeLists.txt	2016-05-04 15:25:30 +0000
@@ -1,3 +1,4 @@
 configure_file(pantheon-calculator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop)
+configure_file_translation(${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop ${CMAKE_SOURCE_DIR}/po/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/pantheon-calculator.desktop DESTINATION share/applications)
 install (FILES pantheon-calculator.appdata.xml DESTINATION share/appdata)

=== modified file 'data/pantheon-calculator.desktop.in'
--- data/pantheon-calculator.desktop.in	2016-02-18 07:31:47 +0000
+++ data/pantheon-calculator.desktop.in	2016-05-04 15:25:30 +0000
@@ -1,15 +1,14 @@
 [Desktop Entry]
-Name=Calculator
-Comment=Solve simple equations
+_Name=Calculator
+_Comment=Solve simple equations
 Exec=pantheon-calculator %U
 Icon=accessories-calculator
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Utility;Calculator;
-X-GNOME-Gettext-Domain=pantheon-calculator
 Actions=AboutDialog;
 
 [Desktop Action AboutDialog]
-Name=About Calculator
+_Name=About Calculator
 Exec=pantheon-calculator --about

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2014-11-30 09:29:11 +0000
+++ po/CMakeLists.txt	2016-05-04 15:25:30 +0000
@@ -3,4 +3,6 @@
 add_translations_catalog (${GETTEXT_PACKAGE}
     ../src
     ../src/widgets
+    DESKTOP_FILES
+        ../data/pantheon-calculator.desktop.in
 )

=== added directory 'po/extra'
=== added file 'po/extra/extra.pot'
--- po/extra/extra.pot	1970-01-01 00:00:00 +0000
+++ po/extra/extra.pot	2016-05-04 15:25:30 +0000
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-05-04 19:19+0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Calculator"
+msgstr ""
+
+msgid "Solve simple equations"
+msgstr ""
+
+msgid "About Calculator"
+msgstr ""

=== modified file 'po/pantheon-calculator.pot'
--- po/pantheon-calculator.pot	2015-09-15 22:34:08 +0000
+++ po/pantheon-calculator.pot	2016-05-04 15:25:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-16 00:15+0200\n"
+"POT-Creation-Date: 2016-05-04 19:19+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/HistoryDialog.vala:35 ../src/MainWindow.vala:89
+#: ../src/HistoryDialog.vala:35 ../src/MainWindow.vala:88
 msgid "History"
 msgstr ""
 
@@ -37,115 +37,106 @@
 msgid "Close"
 msgstr ""
 
-#: ../src/HistoryDialog.vala:99 ../src/MainWindow.vala:140
+#: ../src/HistoryDialog.vala:99 ../src/MainWindow.vala:135
 msgid "Add"
 msgstr ""
 
-#: ../src/Core/Scanner.vala:80
-msgid "'%s' is invalid."
-msgstr ""
-
-#: ../src/Core/Scanner.vala:164
-msgid "'%s' is unknown."
-msgstr ""
-
-#: ../src/MainWindow.vala:75 ../src/PantheonCalculator.vala:25
-#: ../src/PantheonCalculator.vala:26
+#: ../src/MainWindow.vala:75
 msgid "Calculator"
 msgstr ""
 
-#: ../src/MainWindow.vala:83 ../src/MainWindow.vala:384
+#: ../src/MainWindow.vala:83 ../src/MainWindow.vala:378
 msgid "Show extended functionality"
 msgstr ""
 
-#: ../src/MainWindow.vala:131
+#: ../src/MainWindow.vala:126
 msgid "Calculate Result"
 msgstr ""
 
-#: ../src/MainWindow.vala:134
+#: ../src/MainWindow.vala:129
 msgid "Add last result"
 msgstr ""
 
-#: ../src/MainWindow.vala:136
+#: ../src/MainWindow.vala:131
 msgid "Backspace"
 msgstr ""
 
-#: ../src/MainWindow.vala:137
+#: ../src/MainWindow.vala:132
 msgid "Clear entry"
 msgstr ""
 
-#: ../src/MainWindow.vala:143
+#: ../src/MainWindow.vala:138
 msgid "Subtract"
 msgstr ""
 
-#: ../src/MainWindow.vala:146
+#: ../src/MainWindow.vala:141
 msgid "Multiply"
 msgstr ""
 
-#: ../src/MainWindow.vala:149
+#: ../src/MainWindow.vala:144
 msgid "Divide"
 msgstr ""
 
-#: ../src/MainWindow.vala:155
+#: ../src/MainWindow.vala:150
 msgid "Percentage"
 msgstr ""
 
-#: ../src/MainWindow.vala:227
+#: ../src/MainWindow.vala:221
 msgid "Start Group"
 msgstr ""
 
-#: ../src/MainWindow.vala:228
+#: ../src/MainWindow.vala:222
 msgid "End Group"
 msgstr ""
 
-#: ../src/MainWindow.vala:229
+#: ../src/MainWindow.vala:223
 msgid "Exponent"
 msgstr ""
 
-#: ../src/MainWindow.vala:231
+#: ../src/MainWindow.vala:225
 msgid "Root"
 msgstr ""
 
-#: ../src/MainWindow.vala:232
+#: ../src/MainWindow.vala:226
 msgid "Sine"
 msgstr ""
 
-#: ../src/MainWindow.vala:233
+#: ../src/MainWindow.vala:227
 msgid "Hyperbolic Sine"
 msgstr ""
 
-#: ../src/MainWindow.vala:234
+#: ../src/MainWindow.vala:228
 msgid "Cosine"
 msgstr ""
 
-#: ../src/MainWindow.vala:235
+#: ../src/MainWindow.vala:229
 msgid "Hyperbolic Cosine"
 msgstr ""
 
-#: ../src/MainWindow.vala:236
+#: ../src/MainWindow.vala:230
 msgid "Tangent"
 msgstr ""
 
-#: ../src/MainWindow.vala:237
+#: ../src/MainWindow.vala:231
 msgid "Hyperbolic Tangent"
 msgstr ""
 
-#: ../src/MainWindow.vala:238
+#: ../src/MainWindow.vala:232
 msgid "Pi"
 msgstr ""
 
-#: ../src/MainWindow.vala:239
+#: ../src/MainWindow.vala:233
 msgid "Euler's Number"
 msgstr ""
 
-#: ../src/MainWindow.vala:379
+#: ../src/MainWindow.vala:373
 msgid "Hide extended functionality"
 msgstr ""
 
-#: ../src/PantheonCalculator.vala:28
-msgid "Calculate in an elementary way."
+#: ../src/Core/Scanner.vala:80
+msgid "'%s' is invalid."
 msgstr ""
 
-#: ../src/PantheonCalculator.vala:29
-msgid "About Calculator"
+#: ../src/Core/Scanner.vala:164
+msgid "'%s' is unknown."
 msgstr ""

=== modified file 'src/PantheonCalculator.vala'
--- src/PantheonCalculator.vala	2015-03-22 11:10:13 +0000
+++ src/PantheonCalculator.vala	2016-05-04 15:25:30 +0000
@@ -18,16 +18,6 @@
 
 namespace PantheonCalculator { 
     public class PantheonCalculatorApp : Granite.Application {
-        /**
-         * Translatable launcher (.desktop) strings to be added to template (.pot) file.
-         * These strings should reflect any changes in these launcher keys in .desktop file
-         */
-        public const string CALCULATOR = N_("Calculator");
-        public const string PROGRAM_NAME = N_("Calculator");
-
-        public const string COMMENT = N_("Calculate in an elementary way.");
-        public const string ABOUT_STOCK = N_("About Calculator");
-
         construct {
             application_id = "org.pantheon.calculator";
             flags = ApplicationFlags.FLAGS_NONE;