Bug fix: Translate: CLD2 imcompatibility

chrome/common/translate/language_detection_util.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/translate/language_detection_util.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 136 matching lines @@
 #if !defined(CLD_VERSION) || CLD_VERSION==1
       case 1:
         language =
             LanguageCodeWithDialects(static_cast<Language>(cld_language));
         break;
 #endif
 #if !defined(CLD_VERSION) || CLD_VERSION==2
       case 2:
         if (cld_language == CLD2::CHINESE) {
           language = "zh-CN";
+        } else if (cld_language == CLD2::CHINESE_T) {
+          language = "zh-TW";

[Takashi Toyoshima, 2013/10/01 06:20:17]

Do you have any reason to handle them as special cases here. Can you change
CLD2::LanguageCode to return expected language names?

Anyway, at least, we should have some comments on these two conversion, "zh-CN"
and "zh-TW".

[hajimehoshi, 2013/10/02 01:13:25]

We decided not to update CLD2 for this.  I'll add comments.

         } else {
           language =
               CLD2::LanguageCode(static_cast<CLD2::Language>(cld_language));
         }
         break;
 #endif
       default:
         NOTREACHED();
     }
   }
@@ skipping 205 matching lines @@
     case 2:
       return CLD2::DetectLanguageVersion();
 #endif
     default:
       NOTREACHED();
   }
   return "";
 }
 
 }  // namespace LanguageDetectionUtil