(file) Return to LanguageParser.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/LanguageParser.cpp between version 1.29 and 1.34

version 1.29, 2006/10/31 19:38:45 version 1.34, 2008/08/14 17:30:38
Line 34 
Line 34 
 #include <Pegasus/Common/LanguageParser.h> #include <Pegasus/Common/LanguageParser.h>
 #include <Pegasus/Common/InternalException.h> #include <Pegasus/Common/InternalException.h>
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/MessageLoader.h> //l10n  #include <Pegasus/Common/MessageLoader.h>
 #include <cstring> #include <cstring>
  
 #ifdef PEGASUS_HAS_ICU #ifdef PEGASUS_HAS_ICU
 # include <unicode/locid.h> # include <unicode/locid.h>
 #endif #endif
 #if defined(PEGASUS_OS_OS400)  
 # include "EBCDIC_OS400.h"  
 #endif  
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
Line 69 
Line 66 
             Real32 qualityValue;             Real32 qualityValue;
             LanguageParser::_parseAcceptLanguageElement(             LanguageParser::_parseAcceptLanguageElement(
                 languageElements[i], languageTagString, qualityValue);                 languageElements[i], languageTagString, qualityValue);
             acceptLanguages.insert(LanguageTag(languageTagString), qualityValue);              acceptLanguages.insert(
                   LanguageTag(languageTagString), qualityValue);
         }         }
     }     }
     catch (Exception& e)     catch (Exception& e)
Line 151 
Line 149 
     {     {
         // Except for "i" and "x", primary tags must be 2 or 3 characters,         // Except for "i" and "x", primary tags must be 2 or 3 characters,
         // according to RFC 3066.         // 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();         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)     if (subtags.size() == 1)
Line 175 
Line 171 
     {     {
         // The second subtag may not be a single character according to         // The second subtag may not be a single character according to
         // RFC 3066.         // 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();         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)     if (isStandardFormat)
Line 288 
Line 282 
 #if defined(PEGASUS_HAS_MESSAGES) && defined(PEGASUS_HAS_ICU) #if defined(PEGASUS_HAS_MESSAGES) && defined(PEGASUS_HAS_ICU)
     Locale default_loc = Locale::getDefault();     Locale default_loc = Locale::getDefault();
  
 # ifdef PEGASUS_OS_OS400  
     char* tmp = (char*)default_loc.getName();  
     char tmp_[100];  
     EtoA(strcpy(tmp_,tmp));  
     String localeId = tmp_;  
 # else  
     String localeId = default_loc.getName();     String localeId = default_loc.getName();
 # endif  
  
     try     try
     {     {
Line 305 
Line 292 
     catch (const InvalidAcceptLanguageHeader& e)     catch (const InvalidAcceptLanguageHeader& e)
     {     {
         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,         Logger::put_l(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
            "src.Server.cimserver.FAILED_TO_GET_PROCESS_LOCALE",              MessageLoaderParms(
            "Could not convert the system locale to a valid accept-language "                  "src.Server.cimserver.FAILED_TO_SET_PROCESS_LOCALE",
                "format");                  "Cannot convert the system process locale into a valid "
                       "Accept-Language format."));
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
             e.getMessage());             e.getMessage());
         AcceptLanguageList al;         AcceptLanguageList al;

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.34
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2