Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: base/i18n/rtl.cc

Issue 7086017: Fix the loading of ca@valencia.pak, which is available in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comment Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/base/l10n/l10n_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/i18n/rtl.h" 5 #include "base/i18n/rtl.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "base/sys_string_conversions.h" 11 #include "base/sys_string_conversions.h"
12 #include "unicode/coll.h" 12 #include "unicode/coll.h"
13 #include "unicode/locid.h" 13 #include "unicode/locid.h"
14 #include "unicode/uchar.h" 14 #include "unicode/uchar.h"
15 #include "unicode/uscript.h" 15 #include "unicode/uscript.h"
16 16
17 #if defined(TOOLKIT_USES_GTK) 17 #if defined(TOOLKIT_USES_GTK)
18 #include <gtk/gtk.h> 18 #include <gtk/gtk.h>
19 #endif 19 #endif
20 20
21 namespace { 21 namespace {
22 22
23 // Extract language and country, ignore keywords, concatenate using dash. 23 // Extract language, country and variant, but ignore keywords. For example,
24 // en-US, ca@valencia, ca-ES@valencia.
24 std::string GetLocaleString(const icu::Locale& locale) { 25 std::string GetLocaleString(const icu::Locale& locale) {
25 const char* language = locale.getLanguage(); 26 const char* language = locale.getLanguage();
26 const char* country = locale.getCountry(); 27 const char* country = locale.getCountry();
28 const char* variant = locale.getVariant();
27 29
28 std::string result = 30 std::string result =
29 (language != NULL && *language != '\0') ? language : "und"; 31 (language != NULL && *language != '\0') ? language : "und";
30 32
31 if (country != NULL && *country != '\0') { 33 if (country != NULL && *country != '\0') {
32 result += '-'; 34 result += '-';
33 result += country; 35 result += country;
34 } 36 }
35 37
38 if (variant != NULL && *variant != '\0') {
39 std::string variant_str(variant);
40 StringToLowerASCII(&variant_str);
41 result += '@' + variant_str;
42 }
43
36 return result; 44 return result;
37 } 45 }
38 46
39 } // namespace 47 } // namespace
40 48
41 namespace base { 49 namespace base {
42 namespace i18n { 50 namespace i18n {
43 51
44 // Represents the locale-specific ICU text direction. 52 // Represents the locale-specific ICU text direction.
45 static TextDirection g_icu_text_direction = UNKNOWN_DIRECTION; 53 static TextDirection g_icu_text_direction = UNKNOWN_DIRECTION;
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 begin == kRightToLeftOverride) 312 begin == kRightToLeftOverride)
305 ++begin_index; 313 ++begin_index;
306 size_t end_index = text.length() - 1; 314 size_t end_index = text.length() - 1;
307 if (text[end_index] == kPopDirectionalFormatting) 315 if (text[end_index] == kPopDirectionalFormatting)
308 --end_index; 316 --end_index;
309 return text.substr(begin_index, end_index - begin_index + 1); 317 return text.substr(begin_index, end_index - begin_index + 1);
310 } 318 }
311 319
312 } // namespace i18n 320 } // namespace i18n
313 } // namespace base 321 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | ui/base/l10n/l10n_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698