nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace intltool with gettext. Bug 771643.

Browse source 
Signed-off-by: Niels De Graef <nielsdegraef@gmail.com>
This commit is contained in:
Niels De Graef 2016-12-23 00:02:09 +01:00 • committed by Michael James Gratton
parent 97f880b190
commit 39ef8e3e2d
11 changed files with 149 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CMakeLists.txt
View file

@ -137,12 +137,17 @@ endif()
find_package(Git QUIET)
# intl
include(Gettext)
# xgettext
include(FindXGettext)
SET(MIN_XGETTEXT_VERSION "0.19.8")
if (XGETTEXT_FOUND)
message(STATUS "xgettext found")
if (XGETTEXT_VERSION VERSION_LESS MIN_XGETTEXT_VERSION)
message (FATAL_ERROR "xgettext found, but version is ${XGETTEXT_VERSION} (minimum version required is ${MIN_XGETTEXT_VERSION}).")
else ()
message(STATUS "xgettext found, version ${XGETTEXT_VERSION}")
endif ()
else ()
message(STATUS "xgettext not found")
message (FATAL_ERROR "xgettext not found")
endif ()
# GResources

4
INSTALL
View file

@ -63,7 +63,7 @@
Fedora 25 and later ships with the correct versions of the
required libraries. Install them by running this command:
$ sudo dnf install vala gobject-introspection-devel intltool cmake \
$ sudo yum install vala gobject-introspection-devel cmake \
desktop-file-utils gnome-doc-utils libcanberra-devel libgee-devel \
glib2-devel gmime-devel gtk3-devel libnotify-devel sqlite-devel \
webkitgtk4-devel libsecret-devel libxml2-devel vala-tools \
@ -82,7 +82,7 @@
Install them by running this command:
$ sudo apt-get install valac libgirepository1.0-dev intltool \
$ sudo apt-get install valac libgirepository1.0-dev \
cmake desktop-file-utils gnome-doc-utils libcanberra-dev \
libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev \
libsecret-1-dev libxml2-dev libnotify-dev libsqlite3-dev \

44
cmake/FindIntltool.cmake
View file

@ -1,44 +0,0 @@
# FindIntltool.cmake
#
# Jim Nelson <jim@yorba.org>
# Copyright 2016 Software Freedom Conservancy Inc.
find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
if (INTLTOOL_MERGE_EXECUTABLE)
set (INTLTOOL_MERGE_FOUND TRUE)
else (INTLTOOL_MERGE_EXECUTABLE)
set (INTLTOOL_MERGE_FOUND FALSE)
endif (INTLTOOL_MERGE_EXECUTABLE)
if (INTLTOOL_MERGE_FOUND)
macro (INTLTOOL_MERGE_APPDATA appstream_name po_dir)
add_custom_target (${appstream_name}.in ALL
${INTLTOOL_MERGE_EXECUTABLE} --xml-style ${CMAKE_SOURCE_DIR}/${po_dir}
${CMAKE_CURRENT_SOURCE_DIR}/${appstream_name}.in ${appstream_name}
)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${appstream_name} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
endmacro (INTLTOOL_MERGE_APPDATA appstream_name po_dir)
macro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
add_custom_target (org.gnome.Geary.desktop ALL
${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.in ${desktop_id}
)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Geary.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
endmacro (INTLTOOL_MERGE_DESKTOP desktop_id po_dir)
macro (INTLTOOL_MERGE_AUTOSTART_DESKTOP desktop_id po_dir)
add_custom_target (geary-autostart.desktop ALL
${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.in ${desktop_id}
)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-autostart.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
endmacro (INTLTOOL_MERGE_AUTOSTART_DESKTOP desktop_id po_dir)
macro (INTLTOOL_MERGE_CONTRACT desktop_id po_dir)
add_custom_target (geary-attach.contract ALL
${INTLTOOL_MERGE_EXECUTABLE} --desktop-style ${CMAKE_SOURCE_DIR}/${po_dir}
${CMAKE_CURRENT_SOURCE_DIR}/${desktop_id}.in ${desktop_id}
)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-attach.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
endmacro (INTLTOOL_MERGE_CONTRACT desktop_id po_dir)
endif (INTLTOOL_MERGE_FOUND)

84
cmake/Gettext.cmake → cmake/FindXGettext.cmake
View file

@ -21,6 +21,7 @@
# GETTEXT_FOUND: True if gettext has been found.
# XGETTEXT_EXECUTABLE: the full path to the xgettext.
# XGETTEXT_FOUND: True if xgettext has been found.
# XGETTEXT_VERSION: The xgettext version.
#
#===================================================================
# Macros:
@ -55,66 +56,81 @@ 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})
# Check for gettext
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")
MESSAGE(FATAL_ERROR "GetText not found")
ENDIF (GetText_REQUIRED)
ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE AND GETTEXT_MSGCAT_EXECUTABLE)
# Check xgettext and the version
IF(XGETTEXT_EXECUTABLE)
SET(XGETTEXT_FOUND TRUE)
# Liberally taken from
# https://github.com/boghison/mixcloudscope/blob/master/cmake/FindXGettext.cmake
execute_process(COMMAND ${XGETTEXT_EXECUTABLE} --version
OUTPUT_VARIABLE _xgettext_version
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
if (_xgettext_version MATCHES "^xgettext \\(.*\\) [0-9]")
string(
REGEX REPLACE "^xgettext \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*" "\\1"
XGETTEXT_VERSION "${_xgettext_version}"
)
endif()
unset(_xgettext_version)
ELSE(XGETTEXT_EXECUTABLE)
MESSAGE(STATUS "xgettext not found.")
SET(XGETTTEXT_FOUND FALSE)
ENDIF(XGETTEXT_EXECUTABLE)
# Set the default options if not specified
IF(NOT DEFINED XGETTEXT_OPTIONS)
SET(XGETTEXT_OPTIONS ${XGETTEXT_OPTIONS_DEFAULT})
ENDIF(NOT DEFINED XGETTEXT_OPTIONS)
# Add translations target
IF(XGETTEXT_FOUND)
MACRO(GETTEXT_CREATE_TRANSLATIONS _firstLang)
SET(_gmoFiles)
SET(_addToAll)
SET(_is_comment FALSE)
SET(_gmoFiles)
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)
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_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
DEPENDS ${_absFile}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
#MESSAGE("_absFile=${_absFile} _abs_PATH=${_abs_PATH} _lang=${_lang} curr_bin=${CMAKE_CURRENT_BINARY_DIR}")
ADD_CUSTOM_COMMAND(
OUTPUT ${_gmoFile}
COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
DEPENDS ${_absFile}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${GETTEXT_PACKAGE}.mo)
SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
ENDIF()
ENDFOREACH (_currentLang )
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)
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)

1
debian/control vendored
View file

@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 8),
libsqlite3-dev (>= 3.7.4),
libmessaging-menu-dev (>= 12.10.2),
libunity-dev (>= 5.12.0),
intltool,
libgirepository1.0-dev (>= 1.32.0),
desktop-file-utils,
gnome-doc-utils,

51
desktop/CMakeLists.txt
View file

@ -2,24 +2,34 @@
# Build and install org.gnome.Geary.desktop
#
include (FindIntltool)
include (FindDesktopFileValidate)
if (INTLTOOL_MERGE_FOUND)
INTLTOOL_MERGE_APPDATA (org.gnome.Geary.appdata.xml po)
INTLTOOL_MERGE_DESKTOP (org.gnome.Geary.desktop po)
INTLTOOL_MERGE_AUTOSTART_DESKTOP (geary-autostart.desktop po)
if (DESKTOP_VALIDATE)
if (DESKTOP_FILE_VALIDATE_FOUND)
VALIDATE_DESKTOP_FILE (org.gnome.Geary.desktop)
VALIDATE_DESKTOP_FILE (geary-autostart.desktop)
else (DESKTOP_FILE_VALIDATE_FOUND)
message (FATAL_ERROR "desktop-file-validate must be installed to validate generated .desktop file")
endif (DESKTOP_FILE_VALIDATE_FOUND)
endif (DESKTOP_VALIDATE)
else (INTLTOOL_MERGE_FOUND)
message (FATAL_ERROR "intltool must be installed to generate .desktop file")
endif (INTLTOOL_MERGE_FOUND)
add_custom_target (org.gnome.Geary.appdata.xml ALL
${GETTEXT_MSGFMT_EXECUTABLE} --xml -d '${CMAKE_SOURCE_DIR}/po'
--template '${CMAKE_CURRENT_SOURCE_DIR}/org.gnome.Geary.appdata.xml.in' -o org.gnome.Geary.appdata.xml
)
add_custom_target (org.gnome.Geary.desktop ALL
${GETTEXT_MSGFMT_EXECUTABLE} --desktop -d '${CMAKE_SOURCE_DIR}/po'
--template '${CMAKE_CURRENT_SOURCE_DIR}/org.gnome.Geary.desktop.in' -o org.gnome.Geary.desktop
)
add_custom_target (geary-autostart.desktop ALL
${GETTEXT_MSGFMT_EXECUTABLE} --desktop -d '${CMAKE_SOURCE_DIR}/po'
--template '${CMAKE_CURRENT_SOURCE_DIR}/geary-autostart.desktop.in' -o geary-autostart.desktop
)
if (DESKTOP_VALIDATE)
if (DESKTOP_FILE_VALIDATE_FOUND)
VALIDATE_DESKTOP_FILE (org.gnome.Geary.desktop)
VALIDATE_DESKTOP_FILE (geary-autostart.desktop)
else (DESKTOP_FILE_VALIDATE_FOUND)
message (FATAL_ERROR "desktop-file-validate must be installed to validate generated .desktop file")
endif (DESKTOP_FILE_VALIDATE_FOUND)
endif (DESKTOP_VALIDATE)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Geary.appdata.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Geary.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-autostart.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/geary-attach.contract DESTINATION ${CMAKE_INSTALL_PREFIX}/share/contractor)
# Optional: run update-desktop-database at install time.
# (This has to happen after the org.gnome.Geary.desktop file is installed.)
@ -48,8 +58,11 @@ if (DISABLE_CONTRACT)
message (STATUS "Install Contractor contract: OFF")
else (DISABLE_CONTRACT)
message (STATUS "Install Contractor contract: ON")
if (INTLTOOL_MERGE_FOUND)
INTLTOOL_MERGE_CONTRACT (geary-attach.contract po)
if (GETTEXT_FOUND)
add_custom_target (geary-attach.contract ALL
${GETTEXT_MSGFMT_EXECUTABLE} --desktop -d '${CMAKE_SOURCE_DIR}/po'
--template '${CMAKE_CURRENT_SOURCE_DIR}/geary-attach.contract.in' -o geary-attach.contract
)
# Can't validate Contractor file since it isn't a valid Desktop
# file according to desktop-file-validate from desktop-file-utils 0.22:
@ -63,6 +76,6 @@ else (DISABLE_CONTRACT)
# VALIDATE_DESKTOP_FILE (geary-attach.contract)
# endif (DESKTOP_FILE_VALIDATE_FOUND)
# endif (DESKTOP_VALIDATE)
endif (INTLTOOL_MERGE_FOUND)
endif (GETTEXT_FOUND)
install (PROGRAMS geary-attach DESTINATION bin)
endif (DISABLE_CONTRACT)

4
desktop/geary-attach.contract.in
View file

@ -1,6 +1,6 @@
[Contractor Entry]
_Name=Send by email
Name=Send by email
Icon=mail-send
_Description=Send files using Geary
Description=Send files using Geary
MimeType=!inode;
Exec=geary-attach %F

10
desktop/geary-autostart.desktop.in
View file

@ -1,9 +1,9 @@
[Desktop Entry]
_Name=Geary
_GenericName=Email
_X-GNOME-FullName=Geary Mail
_Comment=Send and receive email
_Keywords=Email;E-mail;Mail;
Name=Geary
GenericName=Email
X-GNOME-FullName=Geary Mail
Comment=Send and receive email
Keywords=Email;E-mail;Mail;
Icon=geary
TryExec=geary
Exec=geary --hidden

28
desktop/org.gnome.Geary.appdata.xml.in
View file

@ -8,29 +8,29 @@
<update_contact>geary-list@gnome.org</update_contact>
<!-- Translators: The application name -->
<_name>Geary</_name>
<name>Geary</name>
<!-- Translators: The development team's name -->
<_developer_name>Geary Development Team</_developer_name>
<developer_name>Geary Development Team</developer_name>
<!-- Translators: The application's summary / tagline -->
<_summary>Send and receive email</_summary>
<summary>Send and receive email</summary>
<description>
<_p>
<p>
Geary is an email application built around conversations, for
the GNOME 3 desktop. It allows you to read, find and send email
with a straightforward, modern interface.
</_p>
<_p>
</p>
<p>
Conversations allow you to read a complete discussion without
having to find and click from message to message.
</_p>
<_p>Geary’s features include:</_p>
</p>
<p>Geary’s features include:</p>
<ul>
<_li>Quick email account setup</_li>
<_li>Shows related messages together in conversations</_li>
<_li>Fast, full text and keyword search</_li>
<_li>Full-featured HTML and plain text message composer</_li>
<_li>Desktop notification of new mail</_li>
<_li>Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers</_li>
<li>Quick email account setup</li>
<li>Shows related messages together in conversations</li>
<li>Fast, full text and keyword search</li>
<li>Full-featured HTML and plain text message composer</li>
<li>Desktop notification of new mail</li>
<li>Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers</li>
</ul>
</description>

12
desktop/org.gnome.Geary.desktop.in
View file

@ -1,10 +1,10 @@
[Desktop Entry]
_Name=Geary
_GenericName=Email
_X-GNOME-FullName=Geary Email
_Comment=Send and receive email
Name=Geary
GenericName=Email
X-GNOME-FullName=Geary Email
Comment=Send and receive email
# Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
_Keywords=Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;
Keywords=Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;
Icon=geary
TryExec=geary
Exec=geary %U
@ -16,5 +16,5 @@ StartupNotify=true
Actions=Compose;
[Desktop Action Compose]
_Name=Compose Message
Name=Compose Message
Exec=geary mailto:

59
po/POTFILES.in
View file

@ -1,8 +1,7 @@
[encoding: UTF-8]
desktop/org.gnome.Geary.appdata.xml.in
desktop/org.gnome.Geary.desktop.in
desktop/geary-autostart.desktop.in
[type: gettext/ini]desktop/geary-attach.contract.in
desktop/geary-attach.contract.in
src/geary-version.vala.in
src/client/accounts/account-dialog-account-list-pane.vala
src/client/accounts/account-dialog-add-edit-pane.vala
@ -385,31 +384,31 @@ src/engine/util/util-time.vala
src/engine/util/util-timeout-manager.vala
src/engine/util/util-trillian.vala
src/mailer/main.vala
[type: gettext/glade]ui/account_cannot_remove.glade
[type: gettext/glade]ui/account_list.glade
[type: gettext/glade]ui/account_spinner.glade
[type: gettext/glade]ui/certificate_warning_dialog.glade
[type: gettext/glade]ui/composer-headerbar.ui
[type: gettext/glade]ui/composer-link-popover.ui
[type: gettext/glade]ui/composer-menus.ui
[type: gettext/glade]ui/composer-widget.ui
[type: gettext/glade]ui/conversation-email.ui
[type: gettext/glade]ui/conversation-email-attachment-view.ui
[type: gettext/glade]ui/conversation-email-menus.ui
[type: gettext/glade]ui/conversation-message-menus.ui
[type: gettext/glade]ui/conversation-message.ui
[type: gettext/glade]ui/conversation-viewer.ui
[type: gettext/glade]ui/edit_alternate_emails.glade
[type: gettext/glade]ui/empty-placeholder.ui
[type: gettext/glade]ui/find_bar.glade
[type: gettext/glade]ui/folder-popover.ui
[type: gettext/glade]ui/gtk/help-overlay.ui
[type: gettext/glade]ui/gtk/menus.ui
[type: gettext/glade]ui/login.glade
[type: gettext/glade]ui/main-toolbar.ui
[type: gettext/glade]ui/main-toolbar-menus.ui
[type: gettext/glade]ui/main-window.ui
[type: gettext/glade]ui/password-dialog.glade
[type: gettext/glade]ui/preferences-dialog.ui
[type: gettext/glade]ui/remove_confirm.glade
[type: gettext/glade]ui/upgrade_dialog.glade
ui/account_cannot_remove.glade
ui/account_list.glade
ui/account_spinner.glade
ui/certificate_warning_dialog.glade
ui/composer-headerbar.ui
ui/composer-link-popover.ui
ui/composer-menus.ui
ui/composer-widget.ui
ui/conversation-email.ui
ui/conversation-email-attachment-view.ui
ui/conversation-email-menus.ui
ui/conversation-message-menus.ui
ui/conversation-message.ui
ui/conversation-viewer.ui
ui/edit_alternate_emails.glade
ui/empty-placeholder.ui
ui/find_bar.glade
ui/folder-popover.ui
ui/gtk/help-overlay.ui
ui/gtk/menus.ui
ui/login.glade
ui/main-toolbar.ui
ui/main-window.ui
ui/main-toolbar-menus.ui
ui/password-dialog.glade
ui/preferences-dialog.ui
ui/remove_confirm.glade
ui/upgrade_dialog.glade