dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
mdipierro
2013-11-30 16:50:31 -06:00
parent aac892364c ad87d196e5
commit 77b66d6015
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gluon/languages.py
View File

@@ -296,8 +296,7 @@ def write_plural_dict(filename, contents):
return
try:
fp = LockedFile(filename, 'w')
fp.write('# coding: utf-8\n{\n# "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],\n')
# coding: utf8\n{\n')
fp.write('#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n{\n# "singular form (0)": ["first plural form (1)", "second plural form (2)", ...],\n')
for key in sorted(contents, lambda x, y: cmp(unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower())):
forms = '[' + ','.join([repr(Utf8(form))
for form in contents[key]]) + ']'
@@ -320,7 +319,11 @@ def write_dict(filename, contents):
if not settings.global_settings.web2py_runtime_gae:
logging.warning('Unable to write to file %s' % filename)
return
<<<<<<< HEAD
fp.write('# coding: utf-8\n{\n')
=======
fp.write('# -*- coding: utf-8 -*-\n{\n')
>>>>>>> ad87d196e58d2ea0e46485e5b1e7cb710558ae95
for key in sorted(contents, lambda x, y: cmp(unicode(x, 'utf-8').lower(), unicode(y, 'utf-8').lower())):
fp.write('%s: %s,\n' % (repr(Utf8(key)), repr(Utf8(contents[key]))))
fp.write('}\n')