iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix couple of bugs in i18n when source string contains non-ASCII characters.

Browse Source
This commit is contained in:
Alexey Sokolov
2016-02-04 21:21:37 +00:00
parent 5b624a7a99
commit f01076cc6e
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Translation.cpp
View File

@@ -52,6 +52,7 @@ CString CTranslation::Plural(const CString& sDomain, const CString& sContext,
const std::locale& CTranslation::LoadTranslation(const CString& sDomain) {
CString sLanguage = m_sLanguageStack.empty() ? "" : m_sLanguageStack.back();
if (sLanguage.empty()) sLanguage = "C";
#ifdef HAVE_I18N
// Not using built-in support for multiple domains in single std::locale
// via overloaded call to .str() because we need to be able to reload

33
translation_pot.py
View File

@@ -32,20 +32,6 @@ args = parser.parse_args()
pot_list = []
# .cpp
main_pot = args.tmp_prefix + '_main.pot'
subprocess.check_call(['xgettext',
'--omit-header',
'-D', args.include_dir,
'-o', main_pot,
'--keyword=t:1,1t', '--keyword=t:1,2c,2t',
'--keyword=f:1,1t', '--keyword=f:1,2c,2t',
'--keyword=p:1,2,3t', '--keyword=p:1,2,4c,4t',
'--keyword=d:1,1t', '--keyword=d:1,2c,2t',
] + args.explicit_sources)
if os.path.isfile(main_pot):
pot_list.append(main_pot)
# .tmpl
tmpl_pot = args.tmp_prefix + '_tmpl.pot'
tmpl_uniq_pot = args.tmp_prefix + '_tmpl_uniq.pot'
@@ -71,11 +57,30 @@ for tmpl_dir in args.tmpl_dirs:
tmpl.append('')
if tmpl:
with open(tmpl_pot, 'w') as f:
print('msgid ""', file=f)
print('msgstr ""', file=f)
print(r'"Content-Type: text/plain; charset=UTF-8\n"', file=f)
print(r'"Content-Transfer-Encoding: 8bit\n"', file=f)
print(file=f)
for line in tmpl:
print(line, file=f)
subprocess.check_call(['msguniq', '-o', tmpl_uniq_pot, tmpl_pot])
pot_list.append(tmpl_uniq_pot)
# .cpp
main_pot = args.tmp_prefix + '_main.pot'
subprocess.check_call(['xgettext',
'--omit-header',
'-D', args.include_dir,
'-o', main_pot,
'--keyword=t:1,1t', '--keyword=t:1,2c,2t',
'--keyword=f:1,1t', '--keyword=f:1,2c,2t',
'--keyword=p:1,2,3t', '--keyword=p:1,2,4c,4t',
'--keyword=d:1,1t', '--keyword=d:1,2c,2t',
] + args.explicit_sources)
if os.path.isfile(main_pot):
pot_list.append(main_pot)
# combine
if pot_list:
subprocess.check_call(['msgcat', '-o', args.output] + pot_list)