mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #6690: Compilation with ICU 61

pull/6694/head
Charles Pigott 2018-04-08 01:06:18 +01:00 committed by frosch
parent 11c592ef0f
commit 19076c24c1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/language.h
View File

@ -105,7 +105,7 @@ extern LanguageList _languages;
extern const LanguageMetadata *_current_language; extern const LanguageMetadata *_current_language;
#ifdef WITH_ICU_SORT #ifdef WITH_ICU_SORT
extern Collator *_current_collator; extern icu::Collator *_current_collator;
#endif /* WITH_ICU_SORT */ #endif /* WITH_ICU_SORT */
bool ReadLanguagePack(const LanguageMetadata *lang); bool ReadLanguagePack(const LanguageMetadata *lang);

4
src/strings.cpp
View File

@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang
TextDirection _current_text_dir; ///< Text direction of the currently selected language. TextDirection _current_text_dir; ///< Text direction of the currently selected language.
#ifdef WITH_ICU_SORT #ifdef WITH_ICU_SORT
Collator *_current_collator = NULL; ///< Collator for the language currently in use. icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use.
#endif /* WITH_ICU_SORT */ #endif /* WITH_ICU_SORT */
static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam.
@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang)
/* Create a collator instance for our current locale. */ /* Create a collator instance for our current locale. */
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
_current_collator = Collator::createInstance(Locale(_current_language->isocode), status); _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status);
/* Sort number substrings by their numerical value. */ /* Sort number substrings by their numerical value. */
if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status);
/* Avoid using the collator if it is not correctly set. */ /* Avoid using the collator if it is not correctly set. */