multiple changes regarding translations

- moved translations from locale to po - moved cpack modules from ./cmake/modules to ./cmake - renamed cmake/cpack.cmake to cmake/CPackDefines.cmake - added cmake/Gettext.cmake to find gettext tools - removed venom.mo file and building it at buildtime - creating/updating venom.pot at buildtime - installing .mo files - removed static linking option as it's non functional
naxuroqa · Jun 14, 2014 · 3174599 · 3174599
1 parent 1088b71
commit 3174599
Show file tree

Hide file tree

Showing 18 changed files with 239 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,7 +20,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
 PROJECT(Venom C)
 
-LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 SET(VENOM_VERSION_MAJOR 0)
 SET(VENOM_VERSION_MINOR 2)
@@ -55,29 +55,26 @@ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
   SET(ARCHITECTURE 32)
 ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 
+#put binary in root on windows
 IF(WIN32)
   SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION .)
 ELSE(WIN32)
   SET(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION bin)
 ENDIF(WIN32)
 
-IF(BUILD_STATIC_EXECUTABLES)
-  SET(CMAKE_EXE_LINKER_FLAGS "-static -static-libgcc")
-  SET(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-  SET(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)       # remove -Wl,-Bdynamic
-  SET(CMAKE_SHARED_LIBRARY_C_FLAGS)         # remove -fPIC
-  SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)    # remove -rdynamic
-ENDIF(BUILD_STATIC_EXECUTABLES) 
-
 SET(COMMON_DATA_DIR share)
-SET(VENOM_THEME_INSTALL_DESTINATION "${COMMON_DATA_DIR}/venom/theme")
+
+#i18n
+INCLUDE(Gettext)
+SET(GETTEXT_PACKAGE "venom")
+SET(GETTEXT_PATH "${COMMON_DATA_DIR}/locale")
 
 ADD_SUBDIRECTORY(misc)
 ADD_SUBDIRECTORY(icons)
 ADD_SUBDIRECTORY(theme)
-
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(po)
 
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/cpack.cmake)
+INCLUDE(CPackDefines)
 
 # vim:set ts=2 sw=2 et:
diff --git a/cmake/cpack.cmake → cmake/CPackDefines.cmake b/cmake/cpack.cmake → cmake/CPackDefines.cmake
diff --git a/cmake/modules/FindDJBDns.cmake → cmake/FindDJBDns.cmake b/cmake/modules/FindDJBDns.cmake → cmake/FindDJBDns.cmake
diff --git a/cmake/modules/FindVala.cmake → cmake/FindVala.cmake b/cmake/modules/FindVala.cmake → cmake/FindVala.cmake
diff --git a/cmake/modules/GResource.cmake → cmake/GResource.cmake b/cmake/modules/GResource.cmake → cmake/GResource.cmake
diff --git a/cmake/Gettext.cmake b/cmake/Gettext.cmake
@@ -0,0 +1,176 @@
+# Gettext support: Create/Update pot file and
+#
+# To use: INCLUDE(Gettext)
+#
+# Most of the gettext support code is from FindGettext.cmake of cmake,
+# but it is included here because:
+#
+# 1. Some system like RHEL5 does not have FindGettext.cmake
+# 2. Bug of GETTEXT_CREATE_TRANSLATIONS make it unable to be include in 'All'
+# 3. It does not support xgettext
+#
+#===================================================================
+# Constants:
+#  XGETTEXT_OPTIONS_DEFAULT: Default xgettext option:
+#===================================================================
+# Variables:
+#  XGETTEXT_OPTIONS: Options pass to xgettext
+#      Default:  XGETTEXT_OPTIONS_DEFAULT
+#  GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
+#  GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
+#  GETTEXT_FOUND: True if gettext has been found.
+#  XGETTEXT_EXECUTABLE: the full path to the xgettext.
+#  XGETTEXT_FOUND: True if xgettext has been found.
+#
+#===================================================================
+# Macros:
+# GETTEXT_CREATE_POT(potFile
+#    [OPTION xgettext_options]
+#    SRC list_of_source_file_that_contains_msgid
+# )
+#
+# Generate .pot file.
+#    OPTION xgettext_options: Override XGETTEXT_OPTIONS
+#
+# * Produced targets: pot_file
+#
+#-------------------------------------------------------------------
+# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] locale1 ... localeN
+#     [COMMENT comment] )
+#
+#     This will create a target "translations" which will convert the
+#     given input po files into the binary output mo file. If the
+#     ALL option is used, the translations will also be created when
+#     building the default target.
+#
+# * Produced targets: translations
+#-------------------------------------------------------------------
+
+FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
+FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+FIND_PROGRAM(GETTEXT_MSGCAT_EXECUTABLE msgcat)
+FIND_PROGRAM(XGETTEXT_EXECUTABLE xgettext)
+
+SET(XGETTEXT_OPTIONS_DEFAULT
+    --language=C --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 -s
+    --escape --add-comments="/" --package-name=${PROJECT_NAME} --package-version=${VERSION})
+
+IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_MSGCAT_EXECUTABLE)
+    SET(GETTEXT_FOUND TRUE)
+ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE)
+    SET(GETTEXT_FOUND FALSE)
+    IF (GetText_REQUIRED)
+	MESSAGE(FATAL_ERROR "GetText not found")
+    ENDIF (GetText_REQUIRED)
+ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_MSGCAT_EXECUTABLE)
+
+IF(XGETTEXT_EXECUTABLE)
+    SET(XGETTEXT_FOUND TRUE)
+ELSE(XGETTEXT_EXECUTABLE)
+    MESSAGE(STATUS "xgettext not found.")
+    SET(XGETTTEXT_FOUND FALSE)
+ENDIF(XGETTEXT_EXECUTABLE)
+
+IF(NOT DEFINED XGETTEXT_OPTIONS)
+    SET(XGETTEXT_OPTIONS ${XGETTEXT_OPTIONS_DEFAULT})
+ENDIF(NOT DEFINED XGETTEXT_OPTIONS)
+
+IF(XGETTEXT_FOUND)
+    MACRO(GETTEXT_CREATE_POT _potFile _pot_options )
+	SET(_xgettext_options_list)
+	SET(_src_list)
+	SET(_src_list_abs)
+	SET(_glade_list)
+	SET(_glade_list_abs)
+	SET(_stage "SRC")
+	FOREACH(_pot_option ${_pot_options} ${ARGN})
+		IF(_pot_option STREQUAL "OPTION")
+			SET(_stage "OPTION")
+		ELSEIF(_pot_option STREQUAL "SRC")
+			SET(_stage "SRC")
+		ELSEIF(_pot_option STREQUAL "GLADE")
+			SET(_stage "GLADE")
+		ELSE(_pot_option STREQUAL "OPTION")
+			IF(_stage STREQUAL "OPTION")
+				SET(_xgettext_options_list ${_xgettext_options_list} ${_pot_option})
+			ELSEIF(_stage STREQUAL "GLADE")
+				FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/${_pot_option})
+				GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
+				SET(_glade_list ${_glade_list} ${_relFile})
+				SET(_glade_list_abs ${_glade_list_abs} ${_absFile})
+			ELSEIF(_stage STREQUAL "SRC")
+				FILE(RELATIVE_PATH _relFile ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${_pot_option})
+				GET_FILENAME_COMPONENT(_absFile ${_pot_option} ABSOLUTE)
+				SET(_src_list ${_src_list} ${_relFile})
+				SET(_src_list_abs ${_src_list_abs} ${_absFile})
+			ENDIF(_stage STREQUAL "OPTION")
+		ENDIF(_pot_option STREQUAL "OPTION")
+	ENDFOREACH(_pot_option ${_pot_options} ${ARGN})
+
+	IF (_xgettext_options_list)
+	    SET(_xgettext_options ${_xgettext_options_list})
+	ELSE(_xgettext_options_list)
+	    SET(_xgettext_options ${XGETTEXT_OPTIONS})
+	ENDIF(_xgettext_options_list)
+
+	#MESSAGE("${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o ${_potFile} ${_src_list}")
+	ADD_CUSTOM_COMMAND(OUTPUT pot_file
+	    COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options} -o ${_potFile} ${_src_list}
+	    DEPENDS ${_src_list_abs} ${GLADE_FILES}
+	    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	    )
+
+	ADD_CUSTOM_TARGET(pot_file
+	    COMMAND ${XGETTEXT_EXECUTABLE} ${_xgettext_options_list} -o _source.pot ${_src_list}
+	    COMMAND ${XGETTEXT_EXECUTABLE} --language=Glade --omit-header -o _glade.pot ${_glade_list}
+	    COMMAND ${GETTEXT_MSGCAT_EXECUTABLE} -o ${_potFile} --use-first _source.pot _glade.pot
+	    DEPENDS ${_src_list_abs}
+	    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+	    COMMENT "Extract translatable messages to ${_potFile}"
+	    )
+    ENDMACRO(GETTEXT_CREATE_POT _potFile _pot_options)
+
+
+    MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstLang)
+	SET(_gmoFiles)
+	GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+	GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
+
+	SET(_addToAll)
+	SET(_is_comment FALSE)
+
+	FOREACH (_currentLang ${_firstLang} ${ARGN})
+	    IF(_currentLang STREQUAL "ALL")
+		SET(_addToAll "ALL")
+	    ELSEIF(_currentLang STREQUAL "COMMENT")
+		SET(_is_comment TRUE)
+	    ELSEIF(_is_comment)
+		SET(_is_comment FALSE)
+		SET(_comment ${_currentLang})
+	    ELSE()
+		SET(_lang ${_currentLang})
+		GET_FILENAME_COMPONENT(_absFile ${_currentLang}.po ABSOLUTE)
+		GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)
+		SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.mo)
+
+		#MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} curr_bin=${CMAKE_CURRENT_BINARY_DIR}")
+		ADD_CUSTOM_COMMAND(
+		    OUTPUT ${_gmoFile}
+		    COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
+		    COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
+		    DEPENDS ${_absPotFile} ${_absFile}
+		    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+		    )
+
+		INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
+		SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
+	    ENDIF()
+	ENDFOREACH (_currentLang )
+
+	IF(DEFINED _comment)
+	    ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles} COMMENT ${_comment})
+	ELSE(DEFINED _comment)
+	    ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
+	ENDIF(DEFINED _comment)
+    ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
+ENDIF(XGETTEXT_FOUND)
diff --git a/cmake/modules/PkgCheckModulesFullpath.cmake → cmake/PkgCheckModulesFullpath.cmake b/cmake/modules/PkgCheckModulesFullpath.cmake → cmake/PkgCheckModulesFullpath.cmake
diff --git a/cmake/modules/Rsvg.cmake → cmake/Rsvg.cmake b/cmake/modules/Rsvg.cmake → cmake/Rsvg.cmake
diff --git a/cmake/modules/UseVala.cmake → cmake/UseVala.cmake b/cmake/modules/UseVala.cmake → cmake/UseVala.cmake
diff --git a/locale/de_DE/LC_MESSAGES/venom.mo b/locale/de_DE/LC_MESSAGES/venom.mo
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
@@ -0,0 +1,29 @@
+#
+#    Copyright (C) 2013-2014 Venom authors and contributors
+#
+#    This file is part of Venom.
+#
+#    Venom is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Venom is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Venom.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+SET(TRANSLATIONS
+  de
+)
+
+IF (XGETTEXT_FOUND)
+  GETTEXT_CREATE_TRANSLATIONS(${GETTEXT_PACKAGE}.pot ALL ${TRANSLATIONS} COMMENT "Creating translations.")
+ELSE ()
+  message(STATUS "xgettext not found")
+ENDIF()
+
diff --git a/locale/de_DE/LC_MESSAGES/venom.po → po/de.po b/locale/de_DE/LC_MESSAGES/venom.po → po/de.po
diff --git a/venom.pot → po/venom.pot b/venom.pot → po/venom.pot
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -83,7 +83,7 @@ IF(LINK_GIO_STATIC)
   ENDIF(WIN32)
 ENDIF(LINK_GIO_STATIC)
 
-SET(GETTEXT_CFLAGS "-DGETTEXT_PACKAGE=\\\"venom\\\"")
+SET(GETTEXT_CFLAGS "-DGETTEXT_PACKAGE=\\\"${GETTEXT_PACKAGE}\\\"")
 
 # add cflags and cflags_other of all dependencies to our cflags
 SET(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${GETTEXT_CFLAGS}
@@ -145,6 +145,20 @@ SET( VENOM_SRC
   ui/SettingsWindow.vala
 )
 
+SET( VENOM_GLADE
+  src/ui/add_contact_dialog.ui
+  src/ui/chat_filetransfer.ui
+  src/ui/contact_list.ui
+  src/ui/conversation_window.ui
+  src/ui/settings_window.ui
+  src/ui/user_info_window.ui
+)
+
+IF (XGETTEXT_FOUND)
+  # create new pot file with "make pot_file"
+  GETTEXT_CREATE_POT(${GETTEXT_PACKAGE}.pot OPTION ${XGETTEXT_OPTIONS} SRC ${VENOM_SRC} GLADE ${VENOM_GLADE})
+ENDIF()
+
 # precompile all vala code to c via valac
 VALA_PRECOMPILE( VALA_C_VENOM
     ${VENOM_SRC}

diff --git a/src/Main.vala b/src/Main.vala
@@ -18,7 +18,6 @@
  *    You should have received a copy of the GNU General Public License
  *    along with Venom.  If not, see <http://www.gnu.org/licenses/>.
  */
-const string GETTEXT_PACKAGE = "venom";
 
 namespace Venom {
 
@@ -36,10 +35,10 @@ public class Main : GLib.Object {
 	  };
 
     public static int main (string[] args) {
-           GLib.Intl.setlocale(GLib.LocaleCategory.MESSAGES, "");
-           GLib.Intl.textdomain(GETTEXT_PACKAGE); 
-           GLib.Intl.bind_textdomain_codeset(GETTEXT_PACKAGE, "utf-8"); 
-           GLib.Intl.bindtextdomain(GETTEXT_PACKAGE, "../locale");
+      GLib.Intl.setlocale(GLib.LocaleCategory.MESSAGES, "");
+      GLib.Intl.textdomain(Config.GETTEXT_PACKAGE); 
+      GLib.Intl.bind_textdomain_codeset(Config.GETTEXT_PACKAGE, "utf-8");
+      GLib.Intl.bindtextdomain(Config.GETTEXT_PACKAGE, Config.GETTEXT_PATH);
       try {
 		    GLib.OptionContext option_context = new GLib.OptionContext("");
 		    option_context.set_help_enabled(true);

diff --git a/src/config.h.in b/src/config.h.in
@@ -31,4 +31,6 @@
 #define VENOM_SHORT_DESCRIPTION "@VENOM_SHORT_DESCRIPTION@"
 #define VENOM_WEBSITE "@VENOM_WEBSITE@"
 
+#define VENOM_GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+#define VENOM_GETTEXT_PATH "@GETTEXT_PATH@"
 #endif
diff --git a/src/vapi/config.vapi b/src/vapi/config.vapi
@@ -29,4 +29,7 @@ namespace Venom.Config {
   public const string COPYRIGHT_NOTICE;
   public const string SHORT_DESCRIPTION;
   public const string WEBSITE;
+
+  public const string GETTEXT_PACKAGE;
+  public const string GETTEXT_PATH;
 }
diff --git a/theme/CMakeLists.txt b/theme/CMakeLists.txt
@@ -20,5 +20,4 @@
 SET(VENOM_THEMES
   default.css
 )
-
-INSTALL(FILES ${VENOM_THEMES} DESTINATION ${VENOM_THEME_INSTALL_DESTINATION})
+INSTALL(FILES ${VENOM_THEMES} DESTINATION "${COMMON_DATA_DIR}/venom/theme")