(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.21 and 1.22

version 1.21, 2005/12/19 21:51:37 version 1.22, 2005/12/20 21:27:37
Line 51 
Line 51 
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 static char LANGUAGE_TAG_SEPARATOR_CHAR = '-'; static char LANGUAGE_TAG_SEPARATOR_CHAR = '-';
   static char LOCALE_ID_SEPARATOR_CHAR = '_';
  
 AcceptLanguages LanguageParser::parseAcceptLanguageHeader( AcceptLanguages LanguageParser::parseAcceptLanguageHeader(
     const String& acceptLanguageHeader)     const String& acceptLanguageHeader)
Line 113 
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 278 
Line 288 
     EtoA(strcpy(tmp_,tmp));     EtoA(strcpy(tmp_,tmp));
     try     try
     {     {
         return AcceptLanguages(tmp_);          return LanguageParser::parseAcceptLanguageHeader(tmp_);
     }     }
 # else # else
     try     try
     {     {
         return AcceptLanguages(default_loc.getName());          return LanguageParser::parseAcceptLanguageHeader(default_loc.getName());
     }     }
 # endif # endif
     catch (const InvalidAcceptLanguageHeader& e)     catch (const InvalidAcceptLanguageHeader& e)
Line 294 
Line 304 
                "format");                "format");
         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,         Logger::put(Logger::ERROR_LOG, System::CIMSERVER, Logger::SEVERE,
             e.getMessage());             e.getMessage());
         return AcceptLanguages("*");          AcceptLanguages al;
           al.insert(LanguageTag("*"), 1);
           return al;
     }     }
 #endif  #else
   
     return AcceptLanguages();     return AcceptLanguages();
   #endif
 } }
  
 void LanguageParser::_parseLanguageHeader( void LanguageParser::_parseLanguageHeader(


Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2