Files
@ 3cc963a1b00c
Branch filter:
Location: kallithea/scripts/logformat.py - annotation
3cc963a1b00c
1.7 KiB
text/x-python
i18n: de: fix syntax error
Weblate reports:
msgmerge --no-wrap --backup=none --previous --update /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/de/LC_MESSAGES/kallithea.po /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/kallithea.pot
/home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/de/LC_MESSAGES/kallithea.po:1709: end-of-line within string
/home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/de/LC_MESSAGES/kallithea.po:1709:6: syntax error
msgmerge: found 2 fatal errors
Problem introduced in commit 0add693c626bade1f86a587d83375c84b69df881
Weblate reports:
msgmerge --no-wrap --backup=none --previous --update /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/de/LC_MESSAGES/kallithea.po /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/kallithea.pot
/home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/de/LC_MESSAGES/kallithea.po:1709: end-of-line within string
/home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/de/LC_MESSAGES/kallithea.po:1709:6: syntax error
msgmerge: found 2 fatal errors
Problem introduced in commit 0add693c626bade1f86a587d83375c84b69df881
8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 8bc8366a6874 665dfa112f2c 8bc8366a6874 8bc8366a6874 665dfa112f2c | #!/usr/bin/env python2
import re
import sys
if len(sys.argv) < 2:
print 'Cleanup of superfluous % formatting of log statements.'
print 'Usage:'
print ''' hg revert `hg loc '*.py'|grep -v logformat.py` && scripts/logformat.py `hg loc '*.py'` && hg diff'''
raise SystemExit(1)
logre = r'''
(log\.(?:error|info|warning|debug)
[(][ \n]*
)
%s
(
[ \n]*[)]
)
'''
res = [
# handle % () - keeping spaces around the old %
(re.compile(logre % r'''("[^"]*"|'[^']*') ([\n ]*) % ([\n ]*) \( ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) \) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# handle % without () - keeping spaces around the old %
(re.compile(logre % r'''("[^"]*"|'[^']*') ([\n ]*) % ([\n ]*) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# remove extra space if it is on next line
(re.compile(logre % r'''("[^"]*"|'[^']*') , (\n [ ]) ([ ][\n ]*) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# remove extra space if it is on same line
(re.compile(logre % r'''("[^"]*"|'[^']*') , [ ]+ () ( [\n ]+) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* ) ''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
# remove trailing , and space
(re.compile(logre % r'''("[^"]*"|'[^']*') , () ( [\n ]*) ( (?:[^()]|\n)* (?: \( (?:[^()]|\n)* \) (?:[^()]|\n)* )* [^(), \n] ) [ ,]*''', flags=re.MULTILINE|re.VERBOSE), r'\1\2,\3\4\5\6'),
]
for f in sys.argv[1:]:
s = open(f).read()
for r, t in res:
s = r.sub(t, s)
open(f, 'w').write(s)
|