diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ set(QT_REQUIRED_VERSION "5.10.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintSupport) set(LIBKDEPIM_LIB_VERSION_LIB "5.11.40") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.40") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.41") set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.11.40") set(PIMCOMMON_LIB_VERSION_LIB "5.11.40") set(LIBKLEO_LIB_VERSION "5.11.40") diff --git a/src/printing/grantlee/themes/big-theme-example/theme.html b/src/printing/grantlee/themes/big-theme-example/theme.html --- a/src/printing/grantlee/themes/big-theme-example/theme.html +++ b/src/printing/grantlee/themes/big-theme-example/theme.html @@ -4,7 +4,9 @@ {% if contacts %} {% for contact in contacts %}

{{ contact.realName|safe }}

-

{{ contact.emails|safe }}

+

{% for email in contact.emails %} + {{ email.email }}{% if not forloop.last %}, {% endif %} +{% endfor %}

{% if contact.note %}

{{ contact.note|safe }}

{% endif %} diff --git a/src/printing/grantlee/themes/default/theme.html b/src/printing/grantlee/themes/default/theme.html --- a/src/printing/grantlee/themes/default/theme.html +++ b/src/printing/grantlee/themes/default/theme.html @@ -40,7 +40,11 @@ {% if contact.emails %} {{ contacti18n.emailsi18n }} - {{ contact.emails|safe }} + + {% for email in contact.emails %} + {{ email.email }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% endif %} {% if contact.organization %} diff --git a/src/printing/grantlee/themes/full/theme.html b/src/printing/grantlee/themes/full/theme.html --- a/src/printing/grantlee/themes/full/theme.html +++ b/src/printing/grantlee/themes/full/theme.html @@ -40,7 +40,11 @@ {% if contact.emails %} {{ contacti18n.emailsi18n }} - {{ contact.emails|safe }} + + {% for email in contact.emails %} + {{ email.email }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% endif %} {% if contact.organization %}