mirror of https://github.com/OpenTTD/OpenTTD.git
Fix #6690: Compilation with ICU 61
This commit is contained in:
parent
11c592ef0f
commit
19076c24c1
|
@ -105,7 +105,7 @@ extern LanguageList _languages;
|
|||
extern const LanguageMetadata *_current_language;
|
||||
|
||||
#ifdef WITH_ICU_SORT
|
||||
extern Collator *_current_collator;
|
||||
extern icu::Collator *_current_collator;
|
||||
#endif /* WITH_ICU_SORT */
|
||||
|
||||
bool ReadLanguagePack(const LanguageMetadata *lang);
|
||||
|
|
|
@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang
|
|||
TextDirection _current_text_dir; ///< Text direction of the currently selected language.
|
||||
|
||||
#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 */
|
||||
|
||||
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. */
|
||||
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. */
|
||||
if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status);
|
||||
/* Avoid using the collator if it is not correctly set. */
|
||||
|
|
Loading…
Reference in New Issue