(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.22.2.2 and 1.23

version 1.22.2.2, 2006/03/13 15:34:13 version 1.23, 2006/01/10 19:41:15
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%2005////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // 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 copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 116 
Line 114 
 } }
  
 void LanguageParser::parseLanguageTag( void LanguageParser::parseLanguageTag(
     const String& languageTagString,      const String& languageTagString_,
     String& language,     String& language,
     String& country,     String& country,
     String& variant)     String& variant)
 { {
     PEG_METHOD_ENTER(TRC_L10N, "LanguageParser::parseLanguageTag");     PEG_METHOD_ENTER(TRC_L10N, "LanguageParser::parseLanguageTag");
  
       // Convert locale ID format to language tag format
       String languageTagString = languageTagString_;
       Uint32 index = 0;
       while ((index = languageTagString.find(index, LOCALE_ID_SEPARATOR_CHAR)) !=
           PEG_NOT_FOUND)
       {
           languageTagString[index] = LANGUAGE_TAG_SEPARATOR_CHAR;
       }
   
     language.clear();     language.clear();
     country.clear();     country.clear();
     variant.clear();     variant.clear();
Line 270 
Line 277 
     return clString;     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() AcceptLanguageList LanguageParser::getDefaultAcceptLanguages()
 { {
 #if defined(PEGASUS_HAS_MESSAGES) && defined(PEGASUS_HAS_ICU) #if defined(PEGASUS_HAS_MESSAGES) && defined(PEGASUS_HAS_ICU)
Line 292 
Line 286 
     char* tmp = (char*)default_loc.getName();     char* tmp = (char*)default_loc.getName();
     char tmp_[100];     char tmp_[100];
     EtoA(strcpy(tmp_,tmp));     EtoA(strcpy(tmp_,tmp));
     String localeId = tmp_;      try
       {
           return LanguageParser::parseAcceptLanguageHeader(tmp_);
       }
 # else # else
     String localeId = default_loc.getName();  
 # endif  
   
     try     try
     {     {
         return LanguageParser::parseAcceptLanguageHeader(          return LanguageParser::parseAcceptLanguageHeader(default_loc.getName());
             convertLocaleIdToLanguageTag(localeId));  
     }     }
   # endif
     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,


Legend:
Removed from v.1.22.2.2  
changed lines
  Added in v.1.23

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2