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

Fix the merge

Browse Source
This commit is contained in:
Flakebi 2015-08-17 00:31:55 +02:00
parent 80a649fc2d
commit eef55b04f8
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/race/grand_prix_data.hpp
View File

@ -167,8 +167,8 @@ public:
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
enum GPReverseType getReverseType() enum GPReverseType getReverseType()
const { return m_reverse_type; } const { return m_reverse_type; }
static const char* getRandomGPID() { return "random"; } static const char* getRandomGPID() { return "random"; }
static const wchar_t* getRandomGPName() { return _LTR("Random Grand Prix");} static irr::core::stringw getRandomGPName() { return _LTR("Random Grand Prix"); }
}; // GrandPrixData }; // GrandPrixData
#endif #endif

13
src/utils/translation.cpp
View File

@ -385,25 +385,22 @@ const wchar_t* Translations::fribidize(const wchar_t* in_ptr)
std::reverse(input_lines.begin(), input_lines.end()); std::reverse(input_lines.begin(), input_lines.end());
// Fribidize and concat lines // Fribidize and concat lines
core::stringw converted_string;
for (std::vector<core::stringw>::iterator it = input_lines.begin(); for (std::vector<core::stringw>::iterator it = input_lines.begin();
it != input_lines.end(); it++) it != input_lines.end(); it++)
{ {
if (it == input_lines.begin()) if (it == input_lines.begin())
m_converted_string = fribidizeLine(*it); converted_string = fribidizeLine(*it);
else else
{ {
m_converted_string += "\n"; converted_string += "\n";
m_converted_string += fribidizeLine(*it); converted_string += fribidizeLine(*it);
} }
} }
wchar_t *converted_string = fromFribidiChar(fribidiOutput);
delete[] fribidiOutput;
// Save it in the map // Save it in the map
m_fribidized_strings.insert(std::pair<const irr::core::stringw, const irr::core::stringw>( m_fribidized_strings.insert(std::pair<const irr::core::stringw, const irr::core::stringw>(
in_ptr, converted_string)); in_ptr, converted_string));
freeFribidiChar(converted_string);
found = m_fribidized_strings.find(in_ptr); found = m_fribidized_strings.find(in_ptr);
return found->second.c_str(); return found->second.c_str();
@ -473,7 +470,7 @@ const wchar_t* Translations::w_gettext(const char* original, const char* context
if (original_t == original) if (original_t == original)
{ {
static irr::core::stringw converted_string; static irr::core::stringw converted_string;
converted_string = utf8_to_wide(original); converted_string = StringUtils::utf8_to_wide(original);
#if TRANSLATE_VERBOSE #if TRANSLATE_VERBOSE
std::wcout << L" translation : " << converted_string << std::endl; std::wcout << L" translation : " << converted_string << std::endl;