pegasus/src/Pegasus/Common/LanguageParser.cpp - diff

Return to LanguageParser.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/LanguageParser.cpp between version 1.25 and 1.25.2.1

version 1.25, 2006/01/30 16:17:04

version 1.25.2.1, 2006/03/14 20:08:21

Line 53

PEGASUS_NAMESPACE_BEGIN

static char LANGUAGE_TAG_SEPARATOR_CHAR = '-';

static char LOCALE_ID_SEPARATOR_CHAR = '_';

AcceptLanguageList LanguageParser::parseAcceptLanguageHeader(

const String& acceptLanguageHeader)

Line 269

Line 270

return clString;

}

#ifdef PEGASUS_HAS_ICU

String& LanguageParser::convertLocaleIdToLanguageTag(String& localeId)

{

Uint32 index = 0;

while ((index = localeId.find(index, LOCALE_ID_SEPARATOR_CHAR)) !=

PEG_NOT_FOUND)

{

localeId[index] = LANGUAGE_TAG_SEPARATOR_CHAR;

}

return localeId;

}

#endif

AcceptLanguageList LanguageParser::getDefaultAcceptLanguages()

{

#if defined(PEGASUS_HAS_MESSAGES) && defined(PEGASUS_HAS_ICU)

Line 278

Line 292

char* tmp = (char*)default_loc.getName();

char tmp_[100];

EtoA(strcpy(tmp_,tmp));

try

String localeId = tmp_;

{

return LanguageParser::parseAcceptLanguageHeader(tmp_);

}

# else

String localeId = default_loc.getName();

# endif

try

{

return LanguageParser::parseAcceptLanguageHeader(default_loc.getName());

return LanguageParser::parseAcceptLanguageHeader(

convertLocaleIdToLanguageTag(localeId));

}

# endif

catch (const InvalidAcceptLanguageHeader& e)

{

Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,

Legend:

Removed from v.1.25
changed lines
	Added in v.1.25.2.1

No CVS admin address has been configured