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

i18n: Make dsngettext() strip caret annotations from plural forms too

Browse source 
This affects operation of dsngettext() and its users (e.g. _n() and
VNGETTEXT()) specifically when the plural version of a string is chosen.

Apparently back in 2007 in commit 4852283ab3,
this function and its late sibling were made to only strip carets from
singular forms under the probable assumption that disambiguation won't
be needed for plurals because of the way GNU gettext pairs them with
their singular msgid under a single unique entry. Like everything else
related to our gettext functionality, this wasn't documented in the C++
code.

However, there's no guarantee that this will remain the case forever if
we some day decide to replace the GNU gettext format with something
without this guarantee. It's also likely to confuse more people later
down the line (especially now that the Lua API exposes this
functionality).

Closes #6093.
This commit is contained in:
Iris Morelle 2021-09-16 14:05:05 -03:00
parent 3fcba6aa1c
commit f22e18c33a
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;
}