0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bug/6093'

Browse source 
Closes #6094.
This commit is contained in:
Iris Morelle 2021-09-17 04:55:11 -03:00
commit bd793bd6e8
No known key found for this signature in database
GPG key ID: E312033F4023A753
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gettext.cpp
View file

@ -411,15 +411,33 @@ std::string dsgettext (const char * domainname, const char *msgid)
return msgval;
}
namespace {
inline const char* is_unlocalized_string2(const std::string& str, const char* singular, const char* plural)
{
if (str == singular) {
return singular;
}
if (str == plural) {
return plural;
}
return nullptr;
}
}
std::string dsngettext (const char * domainname, const char *singular, const char *plural, int n)
{
//TODO: only the next line needs to be in the lock.
std::scoped_lock lock(get_mutex());
std::string msgval = bl::dngettext(domainname, singular, plural, n, get_manager().get_locale());
if (msgval == singular) {
const char* firsthat = std::strchr (singular, '^');
auto original = is_unlocalized_string2(msgval, singular, plural);
if (original) {
const char* firsthat = std::strchr (original, '^');
if (firsthat == nullptr)
msgval = singular;
msgval = original;
else
msgval = firsthat + 1;
}