Mercurial > kallithea

changeset 8347:cd3f326d0ff1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
email templates: fix missing translation of titles and buttons The buttons and titles of email templates were not correctly translated. The corresponding strings were not part of the i18n files because they were not recognized by the extraction logic. Note: this will generate new translation strings. Reported-by: Jan Heylen <jan.heylen@nokia.com>
author Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
date Mon, 06 Apr 2020 21:29:37 +0200
parents f787c028ffc0
children 0864547317c2
files kallithea/templates/email_templates/changeset_comment.html kallithea/templates/email_templates/changeset_comment.txt kallithea/templates/email_templates/default.html kallithea/templates/email_templates/password_reset.html kallithea/templates/email_templates/password_reset.txt kallithea/templates/email_templates/pull_request.html kallithea/templates/email_templates/pull_request.txt kallithea/templates/email_templates/pull_request_comment.html kallithea/templates/email_templates/pull_request_comment.txt kallithea/templates/email_templates/registration.html kallithea/templates/email_templates/registration.txt
diffstat 11 files changed, 26 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/templates/email_templates/changeset_comment.html	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/changeset_comment.html	Mon Apr 06 21:29:37 2020 +0200
@@ -33,7 +33,8 @@
     </tr>
     <tr>
         <td>
-<%include file="button.html" args="url=cs_comment_url,title=_('View Comment'),padding_bottom=False"/>\
+<% title = _('View Comment') %>\
+<%include file="button.html" args="url=cs_comment_url,title=title,padding_bottom=False"/>\
         </td>
     </tr>
 </table>
--- a/kallithea/templates/email_templates/changeset_comment.txt	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/changeset_comment.txt	Mon Apr 06 21:29:37 2020 +0200
@@ -13,4 +13,5 @@
 ${_('by')|n,unicode} \
 ${cs_author.full_name_and_username|n,unicode}.
 
-<%include file="button.txt" args="url=cs_comment_url,title=_('View Comment')"/>\
+<% title = _('View Comment') %>\
+<%include file="button.txt" args="url=cs_comment_url,title=title"/>\
--- a/kallithea/templates/email_templates/default.html	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/default.html	Mon Apr 06 21:29:37 2020 +0200
@@ -1,7 +1,8 @@
 <%inherit file="main.html"/>\
 \
 <%block name="header">\
-<%include file="header.html" args="title=_('Message'),link=None"/>\
+<% title = _('Message') %>\
+<%include file="header.html" args="title=title,link=None"/>\
 </%block>\
 \
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
--- a/kallithea/templates/email_templates/password_reset.html	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/password_reset.html	Mon Apr 06 21:29:37 2020 +0200
@@ -1,7 +1,8 @@
 <%inherit file="main.html"/>\
 \
 <%block name="header">\
-<%include file="header.html" args="title=_('Password Reset Request'),link=None"/>\
+<% title = _('Password Reset Request') %>\
+<%include file="header.html" args="title=title,link=None"/>\
 </%block>\
 \
 <table cellpadding="0" cellspacing="0" border="0" width="100%" style="table-layout:fixed;word-wrap:break-word;">
--- a/kallithea/templates/email_templates/password_reset.txt	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/password_reset.txt	Mon Apr 06 21:29:37 2020 +0200
@@ -1,5 +1,6 @@
 <%block name="header">\
-<%include file="header.txt" args="title=_('Password Reset Request'),link=None"/>\
+<% title = _('Password Reset Request') %>\
+<%include file="header.txt" args="title=title,link=None"/>\
 </%block>\
 \
 ${_('Hello %s') % user|n,unicode},
--- a/kallithea/templates/email_templates/pull_request.html	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/pull_request.html	Mon Apr 06 21:29:37 2020 +0200
@@ -82,7 +82,8 @@
     </tr>
     <tr>
         <td>
-<%include file="button.html" args="url=pr_url,title=_('View Pull Request'),padding_bottom=False"/>\
+<% title = _('View Pull Request') %>\
+<%include file="button.html" args="url=pr_url,title=title,padding_bottom=False"/>\
         </td>
     </tr>
 </table>
--- a/kallithea/templates/email_templates/pull_request.txt	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/pull_request.txt	Mon Apr 06 21:29:37 2020 +0200
@@ -29,4 +29,5 @@
 ${h.shorter(desc, 80, firstline=True)|n,unicode}
 %endfor
 
-<%include file="button.txt" args="url=pr_url,title='View Pull Request'"/>\
+<% title = _('View Pull Request') %>\
+<%include file="button.txt" args="url=pr_url,title=title"/>\
--- a/kallithea/templates/email_templates/pull_request_comment.html	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/pull_request_comment.html	Mon Apr 06 21:29:37 2020 +0200
@@ -40,7 +40,8 @@
     </tr>
     <tr>
         <td>
-<%include file="button.html" args="url=pr_comment_url,title=_('View Comment'),padding_bottom=False"/>\
+<% title = _('View Comment') %>\
+<%include file="button.html" args="url=pr_comment_url,title=title,padding_bottom=False"/>\
         </td>
     </tr>
 </table>
--- a/kallithea/templates/email_templates/pull_request_comment.txt	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/pull_request_comment.txt	Mon Apr 06 21:29:37 2020 +0200
@@ -19,4 +19,5 @@
 ${_('branch')|n,unicode} \
 ${pr_target_branch|n,unicode}
 
-<%include file="button.txt" args="url=pr_comment_url,title=_('View Comment')"/>\
+<% title = _('View Comment') %>\
+<%include file="button.txt" args="url=pr_comment_url,title=title"/>\
--- a/kallithea/templates/email_templates/registration.html	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/registration.html	Mon Apr 06 21:29:37 2020 +0200
@@ -2,7 +2,8 @@
 <%inherit file="main.html"/>\
 \
 <%block name="header">\
-<%include file="header.html" args="title=_('New User Registration'),link=registered_user_url"/>\
+<% title = _('New User Registration') %>\
+<%include file="header.html" args="title=title,link=registered_user_url"/>\
 </%block>\
 \
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
@@ -38,7 +39,8 @@
     </tr>
     <tr>
         <td colspan="2">
-<%include file="button.html" args="url=registered_user_url,title=_('View User Profile'),padding_bottom=False"/>\
+<% title = _('View User Profile') %>\
+<%include file="button.html" args="url=registered_user_url,title=title,padding_bottom=False"/>\
         </td>
     </tr>
 </table>
--- a/kallithea/templates/email_templates/registration.txt	Sun Oct 20 22:03:57 2019 +0200
+++ b/kallithea/templates/email_templates/registration.txt	Mon Apr 06 21:29:37 2020 +0200
@@ -1,5 +1,6 @@
 <%block name="header">\
-<%include file="header.txt" args="title=_('New User Registration'),link=registered_user_url"/>\
+<% title = _('New User Registration') %>\
+<%include file="header.txt" args="title=title,link=registered_user_url"/>\
 </%block>\
 
 ${_('Username')|n,unicode}: ${new_username|n,unicode}
@@ -8,4 +9,5 @@
 
 ${_('Email')|n,unicode}: ${new_email|n,unicode}
 
-<%include file="button.txt" args="url=registered_user_url,title='View User Profile'"/>\
+<% title = _('View User Profile') %>\
+<%include file="button.txt" args="url=registered_user_url,title=title"/>\