The branch, kill-gettext, has been updated. - Log -----------------------------------------------------------------
commit 1b8d5650fcf4b80e21d45f8deff03a7e7a169a5c Author: Vincent van Ravesteijn <[email protected]> Date: Tue May 14 12:11:23 2013 +0200 fixup! Implement native reading of mo files. This fixes a merge conflict due to fec57fe9. diff --git a/src/support/Messages.cpp b/src/support/Messages.cpp index 1f56f4d..d2907ac 100644 --- a/src/support/Messages.cpp +++ b/src/support/Messages.cpp @@ -113,11 +113,16 @@ void cleanTranslation(docstring & trans) */ static docstring const ctx_start = from_ascii("[["); static docstring const ctx_end = from_ascii("]]"); - size_t const pos1 = trans.find(ctx_start); - if (pos1 != docstring::npos) { - size_t const pos2 = trans.find(ctx_end, pos1); - if (pos2 != docstring::npos) - trans.erase(pos1, pos2 - pos1 + 2); + while (true) { + size_t const pos1 = trans.find(ctx_start); + if (pos1 != docstring::npos) { + size_t const pos2 = trans.find(ctx_end, pos1); + if (pos2 != docstring::npos) { + trans.erase(pos1, pos2 - pos1 + 2); + continue; + } + } + break; } } ----------------------------------------------------------------------- Summary of changes: src/support/Messages.cpp | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) hooks/post-receive -- Repository for new features
