[wesnoth-commits] [wesnoth/wesnoth] 29e214: i18n: Make dsngettext() strip caret annotations fr...

Iris Morelle noreply at github.com
Sat Sep 18 08:51:55 UTC 2021


  Branch: refs/heads/1.16
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 29e214cf5a84831bac16d81e90696092b3235ab1
      https://github.com/wesnoth/wesnoth/commit/29e214cf5a84831bac16d81e90696092b3235ab1
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-09-18 (Sat, 18 Sep 2021)

  Changed paths:
    M src/gettext.cpp

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

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 4852283ab3e1916c66d7d6660d61f9dc2cae38c6,
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.


  Commit: c97d9ce79c2a661b043af2d397f23241ae6b8eae
      https://github.com/wesnoth/wesnoth/commit/c97d9ce79c2a661b043af2d397f23241ae6b8eae
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-09-18 (Sat, 18 Sep 2021)

  Changed paths:
    M changelog.md

  Log Message:
  -----------
  Update changelog

[ci skip]


Compare: https://github.com/wesnoth/wesnoth/compare/d1c86c1c466a...c97d9ce79c2a



More information about the Commits mailing list