Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 |
| 189 // TODO(derat): Delete the |status| checks and LOG(ERROR) calls throughout | |
| 190 // this function once the cause of http://crbug.com/677043 is tracked down. | |
| 187 const icu::Measure measures[] = { | 191 const icu::Measure measures[] = { |
| 188 icu::Measure(hours, icu::MeasureUnit::createHour(status), status), | 192 icu::Measure(hours, icu::MeasureUnit::createHour(status), status), |
| 189 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status)}; | 193 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status)}; |
| 194 if (U_FAILURE(status)) { | |
| 195 LOG(ERROR) << "Creating MeasureUnit or Measure failed for " << hours << "h" | |
| 196 << minutes << "m: " << u_errorName(status); | |
| 197 return false; | |
| 198 } | |
| 199 | |
| 190 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status); | 200 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status); |
| 201 if (U_FAILURE(status)) { | |
| 202 LOG(ERROR) << "Creating MeasureFormat failed: " << u_errorName(status); | |
| 203 return false; | |
| 204 } | |
| 205 | |
| 191 icu::UnicodeString formatted; | 206 icu::UnicodeString formatted; |
| 192 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); | 207 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); |
| 193 measure_format.formatMeasures(measures, 2, formatted, ignore, status); | 208 measure_format.formatMeasures(measures, 2, formatted, ignore, status); |
| 194 return base::string16(formatted.getBuffer(), formatted.length()); | 209 if (U_FAILURE(status)) { |
| 210 LOG(ERROR) << "formatMeasures failed: " << u_errorName(status); | |
| 211 return false; | |
| 212 } | |
| 213 | |
| 214 *out = base::string16(formatted.getBuffer(), formatted.length()); | |
| 215 return true; | |
| 195 } | 216 } |
| 196 | 217 |
| 197 string16 TimeDurationFormatWithSeconds(const TimeDelta time, | 218 bool TimeDurationFormatWithSeconds(const TimeDelta time, |
| 198 const DurationFormatWidth width) { | 219 const DurationFormatWidth width, |
| 220 string16* out) { | |
| 221 DCHECK(out); | |
| 199 UErrorCode status = U_ZERO_ERROR; | 222 UErrorCode status = U_ZERO_ERROR; |
| 200 const int64_t total_seconds = static_cast<int>(time.InSecondsF() + 0.5); | 223 const int64_t total_seconds = static_cast<int>(time.InSecondsF() + 0.5); |
| 201 const int hours = total_seconds / 3600; | 224 const int hours = total_seconds / 3600; |
| 202 const int minutes = (total_seconds - hours * 3600) / 60; | 225 const int minutes = (total_seconds - hours * 3600) / 60; |
| 203 const int seconds = total_seconds % 60; | 226 const int seconds = total_seconds % 60; |
| 204 UMeasureFormatWidth u_width = DurationWidthToMeasureWidth(width); | 227 UMeasureFormatWidth u_width = DurationWidthToMeasureWidth(width); |
| 205 | 228 |
| 206 const icu::Measure measures[] = { | 229 const icu::Measure measures[] = { |
| 207 icu::Measure(hours, icu::MeasureUnit::createHour(status), status), | 230 icu::Measure(hours, icu::MeasureUnit::createHour(status), status), |
| 208 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status), | 231 icu::Measure(minutes, icu::MeasureUnit::createMinute(status), status), |
| 209 icu::Measure(seconds, icu::MeasureUnit::createSecond(status), status)}; | 232 icu::Measure(seconds, icu::MeasureUnit::createSecond(status), status)}; |
| 210 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status); | 233 icu::MeasureFormat measure_format(icu::Locale::getDefault(), u_width, status); |
| 211 icu::UnicodeString formatted; | 234 icu::UnicodeString formatted; |
| 212 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); | 235 icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); |
| 213 measure_format.formatMeasures(measures, 3, formatted, ignore, status); | 236 measure_format.formatMeasures(measures, 3, formatted, ignore, status); |
| 214 return base::string16(formatted.getBuffer(), formatted.length()); | 237 *out = base::string16(formatted.getBuffer(), formatted.length()); |
| 238 return U_SUCCESS(status); | |
|
Greg Levin
2017/03/06 23:43:21
I think this UBool -> bool conversion (well, the p
Daniel Erat
2017/03/06 23:50:56
ah, thanks; i didn't look at that failure closely
| |
| 215 } | 239 } |
| 216 | 240 |
| 217 string16 DateIntervalFormat(const Time& begin_time, | 241 string16 DateIntervalFormat(const Time& begin_time, |
| 218 const Time& end_time, | 242 const Time& end_time, |
| 219 DateFormat format) { | 243 DateFormat format) { |
| 220 UErrorCode status = U_ZERO_ERROR; | 244 UErrorCode status = U_ZERO_ERROR; |
| 221 | 245 |
| 222 std::unique_ptr<icu::DateIntervalFormat> formatter( | 246 std::unique_ptr<icu::DateIntervalFormat> formatter( |
| 223 icu::DateIntervalFormat::createInstance(DateFormatToString(format), | 247 icu::DateIntervalFormat::createInstance(DateFormatToString(format), |
| 224 status)); | 248 status)); |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 267 // See http://userguide.icu-project.org/formatparse/datetime for details | 291 // See http://userguide.icu-project.org/formatparse/datetime for details |
| 268 // about the date/time format syntax. | 292 // about the date/time format syntax. |
| 269 if (pattern_unicode.indexOf('a') == -1) { | 293 if (pattern_unicode.indexOf('a') == -1) { |
| 270 return k24HourClock; | 294 return k24HourClock; |
| 271 } else { | 295 } else { |
| 272 return k12HourClock; | 296 return k12HourClock; |
| 273 } | 297 } |
| 274 } | 298 } |
| 275 | 299 |
| 276 } // namespace base | 300 } // namespace base |
| OLD | NEW |