From c88c570c43d5c2e9a927b8ca1f349c679adbb350 Mon Sep 17 00:00:00 2001 From: cboos Date: Wed, 1 Feb 2017 10:28:07 +0000 Subject: [PATCH] (#12639) adapt to Jinja2 [https://github.com/pallets/jinja/issues/490 issue 490], fixed in 2.9. And make this version the minimal required version. git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@15449 af82e41b-90c4-0310-8c96-b1721e28e2e2 --- contrib/make_status.py | 1 + setup.py | 4 ++-- trac/admin/templates/jadmin_plugins.html | 2 +- trac/prefs/templates/jprefs_localization.html | 2 +- trac/templates/jattachment.html | 2 +- trac/templates/jdiff_options.html | 2 +- trac/templates/jerror.html | 2 +- trac/templates/jlist_of_attachments.html | 2 +- trac/ticket/templates/jadmin_components.html | 2 +- trac/ticket/templates/jadmin_enums.html | 2 +- trac/ticket/templates/jadmin_milestones.html | 2 +- trac/ticket/templates/jadmin_versions.html | 4 ++-- trac/ticket/templates/jquery.html | 2 +- trac/ticket/templates/jreport_delete.html | 2 +- trac/ticket/templates/jreport_edit.html | 6 +++--- trac/ticket/templates/jreport_list.html | 2 +- trac/ticket/templates/jticket.html | 2 +- trac/ticket/templates/jticket_box.html | 2 +- trac/ticket/templates/jticket_change.html | 2 +- trac/timeline/templates/jtimeline.html | 4 ++-- .../templates/jadmin_repositories.html | 6 +++--- trac/versioncontrol/templates/jbrowser.html | 4 ++-- .../templates/jchangeset_content.html | 18 +++++++++--------- .../versioncontrol/templates/jrevisionlog.html | 4 ++-- trac/wiki/templates/jwiki_edit_comment.html | 2 +- 25 files changed, 42 insertions(+), 41 deletions(-) diff --git a/contrib/make_status.py b/contrib/make_status.py index b5f72ddf0d..c9f6413562 100755 --- a/contrib/make_status.py +++ b/contrib/make_status.py @@ -28,6 +28,7 @@ def _genshi_version(): PACKAGES = [ ("Python", 'sys.version'), ("Setuptools", 'setuptools.__version__'), + ("Jinja2", 'jinja2.__version__'), ("Genshi", '__main__._genshi_version()'), ("Babel", 'babel.__version__'), ("sqlite3", ('sqlite3.version', diff --git a/setup.py b/setup.py index c606cafbcd..a094544b59 100755 --- a/setup.py +++ b/setup.py @@ -86,11 +86,11 @@ zip_safe = True, setup_requires = [ - 'jinja2>=2.8', + 'jinja2>=2.9.3', ], install_requires = [ 'setuptools>=0.6', - 'jinja2>=2.8', + 'jinja2>=2.9.3', ], extras_require = { 'genshi': ['Genshi>=0.6'], diff --git a/trac/admin/templates/jadmin_plugins.html b/trac/admin/templates/jadmin_plugins.html index f89ec3186b..e9a3e11582 100644 --- a/trac/admin/templates/jadmin_plugins.html +++ b/trac/admin/templates/jadmin_plugins.html @@ -68,7 +68,7 @@

# set nb_plugins (${len(plugins)}) # endset - # trans nb_plugins = nb_plugins|safe + # trans nb_plugins = nb_plugins Manage Plugins ${nb_plugins} diff --git a/trac/prefs/templates/jprefs_localization.html b/trac/prefs/templates/jprefs_localization.html index 1170bca6bd..67ce183d89 100644 --- a/trac/prefs/templates/jprefs_localization.html +++ b/trac/prefs/templates/jprefs_localization.html @@ -97,7 +97,7 @@ ${trac_admin} # endif # endset - # trans project_admin = project_admin|safe + # trans project_admin = project_admin Please contact your ${project_admin} to enable existing translations. diff --git a/trac/templates/jattachment.html b/trac/templates/jattachment.html index aa7e522279..b82bd0a83f 100644 --- a/trac/templates/jattachment.html +++ b/trac/templates/jattachment.html @@ -76,7 +76,7 @@

${tag_("Add Attachment to %(parent)s", # endset # if author == 'anonymous':

- # trans preferences_link = preferences_link|safe + # trans preferences_link = preferences_link E-mail address and name can be saved in the ${preferences_link}. diff --git a/trac/templates/jdiff_options.html b/trac/templates/jdiff_options.html index df3da36b45..4c2114ecaa 100644 --- a/trac/templates/jdiff_options.html +++ b/trac/templates/jdiff_options.html @@ -32,7 +32,7 @@ value="${'all' if diff.options.contextlines is lessthan(0) else diff.options.contextlines}"/> # endset - # trans radio = radio_contextall_0|safe, text = text_contextlines|safe + # trans radio = radio_contextall_0, text = text_contextlines # endtrans diff --git a/trac/templates/jerror.html b/trac/templates/jerror.html index 2ae9c42892..1fc391a4d6 100644 --- a/trac/templates/jerror.html +++ b/trac/templates/jerror.html @@ -116,7 +116,7 @@

${_("Oops…")}

${trac_admin} # endif # endset - # trans project_admin = project_admin|safe + # trans project_admin = project_admin There was an internal error in Trac. It is recommended that you notify your local ${project_admin} with the information diff --git a/trac/templates/jlist_of_attachments.html b/trac/templates/jlist_of_attachments.html index 528608a486..ef30e89311 100644 --- a/trac/templates/jlist_of_attachments.html +++ b/trac/templates/jlist_of_attachments.html @@ -30,7 +30,7 @@ # set author = authorinfo(attachment.author) # set date = pretty_dateinfo(attachment.date) # set title = _('%(size)s bytes', size=attachment.size) -# trans attachment_links = attachment_links|safe, size, author, date, title +# trans attachment_links = attachment_links, size, author, date, title ${attachment_links}(${size}) - added by ${author} ${date}. diff --git a/trac/ticket/templates/jadmin_components.html b/trac/ticket/templates/jadmin_components.html index 4610d16211..9c18586823 100644 --- a/trac/ticket/templates/jadmin_components.html +++ b/trac/ticket/templates/jadmin_components.html @@ -69,7 +69,7 @@

${_("Manage Components")} # set wikiformatting WikiFormatting # endset - # trans wikiformatting=wikiformatting|safe + # trans wikiformatting=wikiformatting Description: (you may use ${wikiformatting} here) diff --git a/trac/ticket/templates/jadmin_enums.html b/trac/ticket/templates/jadmin_enums.html index 0a59a84bae..bfdadae94b 100644 --- a/trac/ticket/templates/jadmin_enums.html +++ b/trac/ticket/templates/jadmin_enums.html @@ -27,7 +27,7 @@

(${len(enums)}) # endif # endset - # trans label_plural, nb_enums = nb_enums|safe + # trans label_plural, nb_enums = nb_enums Manage ${label_plural} ${nb_enums} diff --git a/trac/ticket/templates/jadmin_milestones.html b/trac/ticket/templates/jadmin_milestones.html index 19ca9adc66..833a443c28 100644 --- a/trac/ticket/templates/jadmin_milestones.html +++ b/trac/ticket/templates/jadmin_milestones.html @@ -38,7 +38,7 @@

(${len(milestones)}) # endif # endset - # trans nb_milestones = nb_milestones|safe + # trans nb_milestones = nb_milestones Manage Milestones ${nb_milestones} diff --git a/trac/ticket/templates/jadmin_versions.html b/trac/ticket/templates/jadmin_versions.html index b0a3311895..bf012b0b89 100644 --- a/trac/ticket/templates/jadmin_versions.html +++ b/trac/ticket/templates/jadmin_versions.html @@ -32,7 +32,7 @@

(${len(versions)}) # endif # endset - # trans nb_versions = nb_versions|safe + # trans nb_versions = nb_versions Manage Versions ${nb_versions} @@ -65,7 +65,7 @@

# set wikiformatting WikiFormatting # endset - # trans wikiformatting = wikiformatting|safe + # trans wikiformatting = wikiformatting Description: (you may use ${wikiformatting} here) diff --git a/trac/ticket/templates/jquery.html b/trac/ticket/templates/jquery.html index 09cbca2560..e053111869 100644 --- a/trac/ticket/templates/jquery.html +++ b/trac/ticket/templates/jquery.html @@ -202,7 +202,7 @@

${title} (${ value="${end}" size="14" class="trac-${date_or_datetime}picker" /> # endset - # trans start_picker = start_picker|safe, end_picker = end_picker|safe + # trans start_picker = start_picker, end_picker = end_picker ${start_picker} ${end_picker} # endtrans diff --git a/trac/ticket/templates/jreport_delete.html b/trac/ticket/templates/jreport_delete.html index bf9ce2e9e7..8824d7bc3d 100644 --- a/trac/ticket/templates/jreport_delete.html +++ b/trac/ticket/templates/jreport_delete.html @@ -42,7 +42,7 @@

{${report.id}} ${report.title}

# set trac_reports TracReports # endset - # trans trac_reports = trac_reports|safe + # trans trac_reports = trac_reports Note: See ${trac_reports} for help on using and creating reports. diff --git a/trac/ticket/templates/jreport_edit.html b/trac/ticket/templates/jreport_edit.html index 270547fb24..496ccb508a 100644 --- a/trac/ticket/templates/jreport_edit.html +++ b/trac/ticket/templates/jreport_edit.html @@ -68,7 +68,7 @@

WikiFormatting # endset - # trans wiki_formatting = wiki_formatting|safe + # trans wiki_formatting = wiki_formatting Description: (you may use ${wiki_formatting} here) @@ -89,7 +89,7 @@

TracQuery # endset - # trans trac_query = trac_query|safe + # trans trac_query = trac_query Query: (can be either SQL or, if starting with query:, a ${trac_query} expression) @@ -112,7 +112,7 @@

# set trac_reports TracReports # endset - # trans trac_reports = trac_reports|safe + # trans trac_reports = trac_reports Note: See ${trac_reports} for help on using and creating reports. diff --git a/trac/ticket/templates/jreport_list.html b/trac/ticket/templates/jreport_list.html index 8073df8aae..24e2f47291 100644 --- a/trac/ticket/templates/jreport_list.html +++ b/trac/ticket/templates/jreport_list.html @@ -115,7 +115,7 @@

${_("SQL reports and saved custom queries")} }|htmlattr}>${_("Title")} # endset - # trans a_identifier = a_identifier|safe, a_title = a_title|safe + # trans a_identifier = a_identifier, a_title = a_title Sort by: ${a_identifier} ${a_title} diff --git a/trac/ticket/templates/jticket.html b/trac/ticket/templates/jticket.html index a0f029b962..066e50bfac 100644 --- a/trac/ticket/templates/jticket.html +++ b/trac/ticket/templates/jticket.html @@ -291,7 +291,7 @@

Modify Ticket

${ _("Preferences")} # endset - # trans prefs = preferences|safe + # trans prefs = preferences E-mail address and name can be saved in the ${prefs} diff --git a/trac/ticket/templates/jticket_box.html b/trac/ticket/templates/jticket_box.html index 9303ddc391..975dc227ba 100644 --- a/trac/ticket/templates/jticket_box.html +++ b/trac/ticket/templates/jticket_box.html @@ -73,7 +73,7 @@

Version ${version} # endif # endset - # trans version_link = version_link|safe + # trans version_link = version_link — at ${version_link} # endtrans # endif diff --git a/trac/ticket/templates/jticket_change.html b/trac/ticket/templates/jticket_change.html index d75f111194..a595a2e220 100644 --- a/trac/ticket/templates/jticket_change.html +++ b/trac/ticket/templates/jticket_change.html @@ -132,7 +132,7 @@

title="${_("Download")}" class="trac-rawlink">​ # endset - # trans attachment_link = attachment_link|safe + # trans attachment_link = attachment_link ${attachment_link} added # endtrans # elif 'rendered' in field: diff --git a/trac/timeline/templates/jtimeline.html b/trac/timeline/templates/jtimeline.html index a6447a1eff..b0561e5015 100644 --- a/trac/timeline/templates/jtimeline.html +++ b/trac/timeline/templates/jtimeline.html @@ -43,7 +43,7 @@

${_("Timeline")}

# set authors_input # endset - # trans fromdate = fromdate_input|safe, daysback = daysback_input|safe, authors = authors_input|safe + # trans fromdate = fromdate_input, daysback = daysback_input, authors = authors_input

@@ -77,7 +77,7 @@

${day}: ${_("Today") if day == today else _("Yesterday") if # endset # set title = event.render('title', context) # if event.author: - # trans time = time|safe, title, author = authorinfo(event.author) + # trans time = time, title, author = authorinfo(event.author) ${time} ${title} by ${author} # endtrans # else: diff --git a/trac/versioncontrol/templates/jadmin_repositories.html b/trac/versioncontrol/templates/jadmin_repositories.html index 2d59ae3f11..8a3bd72aa1 100644 --- a/trac/versioncontrol/templates/jadmin_repositories.html +++ b/trac/versioncontrol/templates/jadmin_repositories.html @@ -33,7 +33,7 @@

(${len(repositories)}) # endif # endset - # trans nb_repos = nb_repos|safe + # trans nb_repos = nb_repos Manage Repositories ${nb_repos} @@ -146,7 +146,7 @@

# set tracreposadmin ${_("explicit synchronization")} # endset - # trans tracreposadmin = tracreposadmin|safe + # trans tracreposadmin = tracreposadmin Not recommended. See ${tracreposadmin} for more info. @@ -166,7 +166,7 @@

# set wikiformatting WikiFormatting # endset - # trans wikiformatting = wikiformatting|safe + # trans wikiformatting = wikiformatting Description: (you may use ${wikiformatting} here) diff --git a/trac/versioncontrol/templates/jbrowser.html b/trac/versioncontrol/templates/jbrowser.html index b9205b1c7c..7e11365b41 100644 --- a/trac/versioncontrol/templates/jbrowser.html +++ b/trac/versioncontrol/templates/jbrowser.html @@ -202,14 +202,14 @@

title="${_("View changeset %(rev)s", rev=drev)}">${drev} #- endset # if stickyrev: - # trans last_change = last_change_link|safe, stickyrev = display_rev(stickyrev), rev = rev_link|safe, author, age + # trans last_change = last_change_link, stickyrev = display_rev(stickyrev), rev = rev_link, author, age ${last_change} on this file since ${stickyrev} was ${rev}, checked in by ${author}, ${age} # endtrans # else: - # trans last_change = last_change_link|safe, rev = rev_link|safe, author, age + # trans last_change = last_change_link, rev = rev_link, author, age ${last_change} on this file was ${rev}, checked in by ${author}, ${age} diff --git a/trac/versioncontrol/templates/jchangeset_content.html b/trac/versioncontrol/templates/jchangeset_content.html index 8ae621993d..a1ddbaa10f 100644 --- a/trac/versioncontrol/templates/jchangeset_content.html +++ b/trac/versioncontrol/templates/jchangeset_content.html @@ -39,19 +39,19 @@

# if reponame: # if changeset and restricted: - # trans newrev = newrev|safe, newpath = newpath|safe, reponame + # trans newrev = newrev, newpath = newpath, reponame Changeset ${newrev} in ${reponame} for ${newpath} # endtrans # elif not changeset and restricted: - # trans newpath = newpath|safe, logoldnew = logoldnew|safe, reponame + # trans newpath = newpath, logoldnew = logoldnew, reponame Changes in ${newpath} ${logoldnew} in ${reponame} # endtrans # elif not changeset and not restricted: - # trans reponame, oldpath = oldpath|safe, oldrrev = oldrrev|safe, newpath = newpath|safe, newrrev = newrrev|safe + # trans reponame, oldpath = oldpath, oldrrev = oldrrev, newpath = newpath, newrrev = newrrev Changes in ${reponame} from ${oldpath} at ${oldrev} to ${newpath} at ${newrev} @@ -59,7 +59,7 @@

# endtrans # else: # if annotated: - # trans shortnewrev = shortnewrev|safe, reponame + # trans shortnewrev = shortnewrev, reponame Changeset ${shortnewrev} in ${reponame} @@ -74,26 +74,26 @@

# endif # else: # if changeset and restricted: - # trans newrev = newrev|safe, newpath=newpath|safe + # trans newrev = newrev, newpath=newpath Changeset ${newrev} for ${newpath} # endtrans # elif not changeset and restricted: - # trans newpath = newpath|safe, logoldnew = logoldnew|safe + # trans newpath = newpath, logoldnew = logoldnew Changes in ${newpath} ${logoldnew} # endtrans # elif not changeset and not restricted: - # trans oldpath = oldpath|safe, oldrrev = oldrrev|safe, newpath = newpath|safe, newrrev = newrrev|safe + # trans oldpath = oldpath, oldrrev = oldrrev, newpath = newpath, newrrev = newrrev Changes from ${oldpath} at ${oldrrev} to ${newpath} at ${newrrev} # endtrans # else: # if annotated: - # trans shortnewrev = shortnewrev|safe + # trans shortnewrev = shortnewrev Changeset ${shortnewrev} @@ -157,7 +157,7 @@

old_rev=display_rev(item.old.rev))}"> ${item.old.path} # endset - # trans kind, oldpath = oldpath|safe + # trans kind, oldpath = oldpath (${kind} from ${oldpath}) # endtrans diff --git a/trac/versioncontrol/templates/jrevisionlog.html b/trac/versioncontrol/templates/jrevisionlog.html index 6b7268e59e..785e82a701 100644 --- a/trac/versioncontrol/templates/jrevisionlog.html +++ b/trac/versioncontrol/templates/jrevisionlog.html @@ -88,7 +88,7 @@

# endset - # trans input_start = input_start|safe, input_end = input_end|safe + # trans input_start = input_start, input_end = input_end @@ -101,7 +101,7 @@

# endset - # trans input_max = input_max|safe + # trans input_max = input_max diff --git a/trac/wiki/templates/jwiki_edit_comment.html b/trac/wiki/templates/jwiki_edit_comment.html index 3810bde893..c634b18848 100644 --- a/trac/wiki/templates/jwiki_edit_comment.html +++ b/trac/wiki/templates/jwiki_edit_comment.html @@ -31,7 +31,7 @@

# set name ${page.name} # endset - # trans version = page.version, name = name|safe + # trans version = page.version, name = name Edit comment for version ${version} of ${name}