anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix uncodable author warning

Browse Source 
The old code was not threadsafe, and the restriction to one message box per
author name did not work if more than two authors were uncodable.
This commit is contained in:
Georg Baum 2014-07-05 14:49:51 +02:00
parent 5093893b59
commit 2a677592a5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Changes.cpp
View File

@ -27,6 +27,7 @@
#include "support/gettext.h"
#include "support/lassert.h"
#include "support/lstrings.h"
#include "support/mutex.h"
#include "frontends/alert.h"
@ -348,9 +349,7 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
if (macro.empty())
return docstring();
// FIXME THREAD
static docstring warned_author = docstring();
docstring uncodable_author = warned_author;
docstring uncodable_author;
odocstringstream ods;
ods << macro;
@ -367,8 +366,12 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
ods << author_latexed.first << "}{" << chgTime << "}{";
// warn user (once) if we found uncodable glyphs.
if (uncodable_author != warned_author) {
frontend::Alert::warning(_("Uncodable character in author name"),
if (!uncodable_author.empty()) {
static std::set<docstring> warned_authors;
static Mutex warned_mutex;
Mutex::Locker locker(&warned_mutex);
if (warned_authors.find(uncodable_author) == warned_authors.end()) {
frontend::Alert::warning(_("Uncodable character in author name"),
support::bformat(_("The author name '%1$s',\n"
"used for change tracking, contains the following glyphs that\n"
"cannot be represented in the current encoding: %2$s.\n"
@ -376,7 +379,8 @@ docstring getLaTeXMarkup(docstring const & macro, docstring const & author,
"Choose an appropriate document encoding (such as utf8)\n"
"or change the spelling of the author name."),
uncodable_author, author_latexed.second));
warned_author = uncodable_author;
warned_authors.insert(uncodable_author);
}
}
return ods.str();