ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support plural translations. Fixes #1852.

Browse Source
This commit is contained in:
leper 2015-01-02 21:19:44 +01:00
parent d6c099b50b
commit d21f0ffa2b
4 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/po/update_pot.sh
View File

@ -38,7 +38,8 @@ echo " Generating .pot file..."
# C++ Files
xgettext -d supertuxkart -s --keyword=_ --keyword=N_ --keyword=_LTR \
--keyword=_C:1c,2 --add-comments="I18N:" \
--keyword=_C:1c,2 --keyword=_P:1,2 \
--keyword=_CP:1c,2,3 --add-comments="I18N:" \
-p ./data/po -o supertuxkart.pot $CPP_FILE_LIST \
--package-name=supertuxkart

6
src/online/online_player_profile.cpp
View File

@ -403,8 +403,10 @@ namespace Online
}
else if(to_notify.size() > 3)
{
message = _("%d friends are now online.",
(int)to_notify.size());
//I18N: Only used for count > 3
message = _P("%d friend is now online.",
"%d friends are now online.",
(int)to_notify.size());
}
MessageQueue::add(MessageQueue::MT_FRIEND, message);
}

42
src/utils/translation.cpp
View File

@ -352,10 +352,10 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
}
/**
* \param original Message to translate
* \param context Optional, can be set to differentiate 2 strings that are identical
* in English but could be different in other languages
*/
* \param original Message to translate
* \param context Optional, can be set to differentiate 2 strings that are identical
* in English but could be different in other languages
*/
const wchar_t* Translations::w_gettext(const wchar_t* original, const char* context)
{
return w_gettext( wide_to_utf8(original), context );
@ -403,6 +403,40 @@ const wchar_t* Translations::w_gettext(const char* original, const char* context
return out_ptr;
}
/**
* \param singular Message to translate in singular form
* \param plural Message to translate in plural form (can be the same as the singular form)
* \param num Count used to obtain the correct plural form.
* \param context Optional, can be set to differentiate 2 strings that are identical
* in English but could be different in other languages
*/
const wchar_t* Translations::w_ngettext(const wchar_t* singular, const wchar_t* plural, int num, const char* context)
{
return w_ngettext( wide_to_utf8(singular), wide_to_utf8(plural), num, context);
}
/**
* \param singular Message to translate in singular form
* \param plural Message to translate in plural form (can be the same as the singular form)
* \param num Count used to obtain the correct plural form.
* \param context Optional, can be set to differentiate 2 strings that are identical
* in English but could be different in other languages
*/
const wchar_t* Translations::w_ngettext(const char* singular, const char* plural, int num, const char* context)
{
const std::string& res = (context == NULL ?
m_dictionary.translate_plural(singular, plural, num) :
m_dictionary.translate_ctxt_plural(context, singular, plural, num));
wchar_t* out_ptr = utf8_to_wide(res.c_str());
if (REMOVE_BOM) out_ptr++;
#if TRANSLATE_VERBOSE
std::wcout << L" translation : " << out_ptr << std::endl;
#endif
return out_ptr;
}
bool Translations::isRTLLanguage() const

5
src/utils/translation.hpp
View File

@ -29,6 +29,8 @@
# define _(String, ...) (translations->fribidize(StringUtils::insertValues(translations->w_gettext(String), ##__VA_ARGS__)))
#undef _C
# define _C(Ctx, String, ...) (translations->fribidize(StringUtils::insertValues(translations->w_gettext(String, Ctx), ##__VA_ARGS__)))
# define _P(Singular, Plural, Num, ...) (translations->fribidize(StringUtils::insertValues(translations->w_ngettext(Singular, Plural, Num), Num, ##__VA_ARGS__)))
# define _CP(Ctx, Singular, Plural, Num, ...) (translations->fribidize(StringUtils::insertValues(translations->w_ngettext(Singular, Plural, Num, Ctx), Num, ##__VA_ARGS__)))
# define _LTR(String, ...) (StringUtils::insertValues(translations->w_gettext(String), ##__VA_ARGS__))
# define gettext_noop(String) (String)
# define N_(String) (gettext_noop (String))
@ -54,6 +56,9 @@ public:
const wchar_t *w_gettext(const wchar_t* original, const char* context=NULL);
const wchar_t *w_gettext(const char* original, const char* context=NULL);
const wchar_t *w_ngettext(const wchar_t* singular, const wchar_t* plural, int num, const char* context=NULL);
const wchar_t *w_ngettext(const char* singular, const char* plural, int num, const char* context=NULL);
bool isRTLLanguage() const;
const wchar_t* fribidize(const wchar_t* in_ptr);
const wchar_t* fribidize(const irr::core::stringw &str) { return fribidize(str.c_str()); }