From 155ed011a79a27c10ee26ead3eebb907a4e55c8f Mon Sep 17 00:00:00 2001 From: "Adam J. Forster" Date: Thu, 13 Aug 2015 11:37:23 +0100 Subject: [PATCH] Update regular expressions to support PEP 3101 --- rosetta/templates/rosetta/js/rosetta.js | 2 +- rosetta/templatetags/rosetta.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rosetta/templates/rosetta/js/rosetta.js b/rosetta/templates/rosetta/js/rosetta.js index 52c1f24..0fe4055 100644 --- a/rosetta/templates/rosetta/js/rosetta.js +++ b/rosetta/templates/rosetta/js/rosetta.js @@ -89,7 +89,7 @@ google.setOnLoadCallback(function() { $('.translation textarea').blur(function() { if($(this).val()) { $('.alert', $(this).parents('tr')).remove(); - var RX = /%(?:\([^\s\)]*\))?[sdf]/g, + var RX = /%(?:\([^\s\)]*\))?[sdf]|\{[\w\d_]+?\}/g, origs=$('.original', $(this).parents('tr')).html().match(RX), trads=$(this).val().match(RX), error = $('Unmatched variables'); diff --git a/rosetta/templatetags/rosetta.py b/rosetta/templatetags/rosetta.py index 3cb7f09..5ed270d 100644 --- a/rosetta/templatetags/rosetta.py +++ b/rosetta/templatetags/rosetta.py @@ -7,7 +7,7 @@ import six register = template.Library() -rx = re.compile(r'(%(\([^\s\)]*\))?[sd])') +rx = re.compile(r'(%(\([^\s\)]*\))?[sd]|\{[\w\d_]+?\})') def format_message(message):