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.32 and 1.35

version 1.32, 2008/01/08 20:15:10

version 1.35, 2008/12/01 17:49:52

Line 1

//%2006////////////////////////////////////////////////////////////////////////

//%LICENSE////////////////////////////////////////////////////////////////

// Licensed to The Open Group (TOG) under one or more contributor license

// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.

// agreements. Refer to the OpenPegasusNOTICE.txt file distributed with

// this work for additional information regarding copyright ownership.

// IBM Corp.; EMC Corporation, The Open Group.

// Each contributor licenses this file to you under the OpenPegasus Open

// Source License; you may not use this file except in compliance with the

// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.

// License.

// EMC Corporation; VERITAS Software Corporation; The Open Group.

// EMC Corporation; Symantec Corporation; The Open Group.

// Permission is hereby granted, free of charge, to any person obtaining a copy

// Permission is hereby granted, free of charge, to any person obtaining a

// of this software and associated documentation files (the "Software"), to

// copy of this software and associated documentation files (the "Software"),

// deal in the Software without restriction, including without limitation the

// to deal in the Software without restriction, including without limitation

// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or

// the rights to use, copy, modify, merge, publish, distribute, sublicense,

// sell copies of the Software, and to permit persons to whom the Software is

// and/or sell copies of the Software, and to permit persons to whom the

// furnished to do so, subject to the following conditions:

// Software is furnished to do so, subject to the following conditions:

// THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN

// The above copyright notice and this permission notice shall be included

// ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED

// in all copies or substantial portions of the Software.

// "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT

// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR

// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

// ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//==============================================================================

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY

// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

//////////////////////////////////////////////////////////////////////////

//%/////////////////////////////////////////////////////////////////////////////

Line 149

Line 147

{

// Except for "i" and "x", primary tags must be 2 or 3 characters,

// according to RFC 3066.

MessageLoaderParms parms(

"Common.LanguageParser.INVALID_LANGUAGE_TAG",

// Do not localize this message; it could cause recursion.

"Invalid language tag \"$0\".", languageTagString);

PEG_METHOD_EXIT();

// throw Exception(MessageLoader::getMessage(parms));

throw Exception(Formatter::format(

// do not localize message, requires a language tag for this

"Invalid language tag \"$0\".",

// localization can cause recursion here

languageTagString));

throw Exception(parms.toString());

}

if (subtags.size() == 1)

Line 173

Line 169

{

// The second subtag may not be a single character according to

// RFC 3066.

MessageLoaderParms parms(

"Common.LanguageParser.INVALID_LANGUAGE_TAG",

// Do not localize this message; it could cause recursion.

"Invalid language tag \"$0\".", languageTagString);

PEG_METHOD_EXIT();

// throw Exception(MessageLoader::getMessage(parms));

throw Exception(Formatter::format(

// do not localize message, requires a language tag for this

"Invalid language tag \"$0\".",

// localization can cause recursion here

languageTagString));

throw Exception(parms.toString());

}

if (isStandardFormat)

Line 296

Line 290

catch (const InvalidAcceptLanguageHeader& e)

{

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

MessageLoaderParms(

"src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",

"Cannot convert the system process locale into a valid "

"Accept-Language format.");

"Accept-Language format."));

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

e.getMessage());

AcceptLanguageList al;

Legend:

Removed from v.1.32
changed lines
	Added in v.1.35

No CVS admin address has been configured