[#2774] I18n re-enable mangling of some formats

ckan · Aug 6, 2012 · 3fbfe7d · 3fbfe7d
1 parent 899df81
commit 3fbfe7d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
@@ -1549,12 +1549,14 @@ def mangle_po(self):
         pot_path = os.path.join(self.i18n_path, 'ckan.pot')
         po = polib.pofile(pot_path)
         # we don't want to mangle the following items in strings
-        # %(...)s  %s %0.3f etc
+        # %(...)s  %s %0.3f [1:...] {...} etc
 
         # sprintf bit after %
         spf_reg_ex = "\+?(0|'.)?-?\d*(.\d*)?[\%bcdeufosxX"
 
         extract_reg_ex = '(\%\([^\)]*\)' + spf_reg_ex + \
+                         '|\[\d*\:[^\]]*\]' + \
+                         '|\{[^\}]*\}' + \
                          '|\%(\d)*\$' + spf_reg_ex + ')'
 
         for entry in po: