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

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

Issue 2734883003: base: Make TimeDurationFormat* report failures. (Closed)
Patch Set: Created 3 years, 9 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
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/time_formatting.h" 5 #include "base/i18n/time_formatting.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 std::unique_ptr<icu::DateFormat> formatter( 169 std::unique_ptr<icu::DateFormat> formatter(
170 icu::DateFormat::createDateInstance(icu::DateFormat::kFull)); 170 icu::DateFormat::createDateInstance(icu::DateFormat::kFull));
171 return TimeFormat(formatter.get(), time); 171 return TimeFormat(formatter.get(), time);
172 } 172 }
173 173
174 string16 TimeFormatWithPattern(const Time& time, const char* pattern) { 174 string16 TimeFormatWithPattern(const Time& time, const char* pattern) {
175 icu::SimpleDateFormat formatter = CreateSimpleDateFormatter(pattern); 175 icu::SimpleDateFormat formatter = CreateSimpleDateFormatter(pattern);
176 return TimeFormat(&formatter, time); 176 return TimeFormat(&formatter, time);
177 } 177 }
178 178
179 string16 TimeDurationFormat(const TimeDelta time, 179 bool TimeDurationFormat(const TimeDelta time,
180 const DurationFormatWidth width) { 180 const DurationFormatWidth width,
181 string16* out) {
182 DCHECK(out);
181 UErrorCode status = U_ZERO_ERROR; 183 UErrorCode status = U_ZERO_ERROR;
182 const int total_minutes = static_cast<int>(time.InSecondsF() / 60 + 0.5); 184 const int total_minutes = static_cast<int>(time.InSecondsF() / 60 + 0.5);
183 const int hours = total_minutes / 60; 185 const int hours = total_minutes / 60;
184 const int minutes = total_minutes % 60; 186 const int minutes = total_minutes % 60;
185 UMeasureFormatWidth u_width = DurationWidthToMeasureWidth(width); 187 UMeasureFormatWidth u_width = DurationWidthToMeasureWidth(width);
186 188
187 const icu::Measure measures[] = { 189 const icu::Measure measures[] = {
188 icu::Measure(hours, icu::MeasureUnit::createHour(status), status), 190 icu::Measure(hours, icu::MeasureUnit::createHour(status), status),
189 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status)}; 191 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status)};
Daniel Erat 2017/03/06 20:14:58 it seems to be undocumented, but from my reading o
Greg Levin 2017/03/06 21:40:06 jshin@ would know the ICU code better, but that's
190 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status); 192 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status);
Greg Levin 2017/03/06 21:40:06 if (U_FAILURE(status)) LOG(ERROR) << "Failed t
Daniel Erat 2017/03/06 23:19:34 Done.
191 icu::UnicodeString formatted; 193 icu::UnicodeString formatted;
192 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); 194 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
193 measure_format.formatMeasures(measures, 2, formatted, ignore, status); 195 measure_format.formatMeasures(measures, 2, formatted, ignore, status);
Greg Levin 2017/03/06 21:40:06 if (U_FAILURE(status)) LOG(ERROR) << "formatMe
Daniel Erat 2017/03/06 23:19:34 sure, added temporary logging throughout.
194 return base::string16(formatted.getBuffer(), formatted.length()); 196 *out = base::string16(formatted.getBuffer(), formatted.length());
197 return U_SUCCESS(status);
195 } 198 }
196 199
197 string16 TimeDurationFormatWithSeconds(const TimeDelta time, 200 bool TimeDurationFormatWithSeconds(const TimeDelta time,
198 const DurationFormatWidth width) { 201 const DurationFormatWidth width,
202 string16* out) {
203 DCHECK(out);
199 UErrorCode status = U_ZERO_ERROR; 204 UErrorCode status = U_ZERO_ERROR;
200 const int64_t total_seconds = static_cast<int>(time.InSecondsF() + 0.5); 205 const int64_t total_seconds = static_cast<int>(time.InSecondsF() + 0.5);
201 const int hours = total_seconds / 3600; 206 const int hours = total_seconds / 3600;
202 const int minutes = (total_seconds - hours * 3600) / 60; 207 const int minutes = (total_seconds - hours * 3600) / 60;
203 const int seconds = total_seconds % 60; 208 const int seconds = total_seconds % 60;
204 UMeasureFormatWidth u_width = DurationWidthToMeasureWidth(width); 209 UMeasureFormatWidth u_width = DurationWidthToMeasureWidth(width);
205 210
206 const icu::Measure measures[] = { 211 const icu::Measure measures[] = {
207 icu::Measure(hours, icu::MeasureUnit::createHour(status), status), 212 icu::Measure(hours, icu::MeasureUnit::createHour(status), status),
208 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status), 213 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status),
209 icu::Measure(seconds, icu::MeasureUnit::createSecond(status), status)}; 214 icu::Measure(seconds, icu::MeasureUnit::createSecond(status), status)};
210 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status); 215 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status);
211 icu::UnicodeString formatted; 216 icu::UnicodeString formatted;
212 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); 217 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
213 measure_format.formatMeasures(measures, 3, formatted, ignore, status); 218 measure_format.formatMeasures(measures, 3, formatted, ignore, status);
214 return base::string16(formatted.getBuffer(), formatted.length()); 219 *out = base::string16(formatted.getBuffer(), formatted.length());
220 return U_SUCCESS(status);
215 } 221 }
216 222
217 string16 DateIntervalFormat(const Time& begin_time, 223 string16 DateIntervalFormat(const Time& begin_time,
218 const Time& end_time, 224 const Time& end_time,
219 DateFormat format) { 225 DateFormat format) {
220 UErrorCode status = U_ZERO_ERROR; 226 UErrorCode status = U_ZERO_ERROR;
221 227
222 std::unique_ptr<icu::DateIntervalFormat> formatter( 228 std::unique_ptr<icu::DateIntervalFormat> formatter(
223 icu::DateIntervalFormat::createInstance(DateFormatToString(format), 229 icu::DateIntervalFormat::createInstance(DateFormatToString(format),
224 status)); 230 status));
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 // See http://userguide.icu-project.org/formatparse/datetime for details 273 // See http://userguide.icu-project.org/formatparse/datetime for details
268 // about the date/time format syntax. 274 // about the date/time format syntax.
269 if (pattern_unicode.indexOf('a') == -1) { 275 if (pattern_unicode.indexOf('a') == -1) {
270 return k24HourClock; 276 return k24HourClock;
271 } else { 277 } else {
272 return k12HourClock; 278 return k12HourClock;
273 } 279 }
274 } 280 }
275 281
276 } // namespace base 282 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698