chrome/browser/resources/settings/device_page/night_light_slider.js - Issue 2951483003: [Night Light] CL9: Add localization for time's AM and PM

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/settings/device_page/night_light_slider.js

Issue 2951483003: [Night Light] CL9: Add localization for time's AM and PM (Closed)

Patch Set: Created 3 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/device_page/night_light_slider.html ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/device_page/night_light_slider.js

diff --git a/chrome/browser/resources/settings/device_page/night_light_slider.js b/chrome/browser/resources/settings/device_page/night_light_slider.js

index 64e3aa5ac0648791c9254318c4054f488fe1015d..37b87d330e25cfa83c26891dd1cc8b1e5121a782 100644

--- a/chrome/browser/resources/settings/device_page/night_light_slider.js

+++ b/chrome/browser/resources/settings/device_page/night_light_slider.js

@@ -214,13 +214,13 @@ Polymer({

* @private

offsetMinutesToTimeString_: function(offsetMinutes) {

- // TODO(afakhry): Check if these values need to be localized.

var hour = Math.floor(offsetMinutes / 60);

- var amPm = hour >= 12 ? ' PM' : ' AM';

+ var amPm = hour >= 12 ? this.i18n('displayNightLightTimePm')

+ : this.i18n('displayNightLightTimeAm');

hour %= 12;

hour = hour == 0 ? 12 : hour;

var minute = Math.floor(offsetMinutes % 60);

- return hour + ':' + this.pad2_(minute) + amPm;

+ return hour + ':' + this.pad2_(minute) + ' ' + amPm;

stevenjb 2017/06/20 00:36:43 Looking around, it seems like we should be using D

afakhry 2017/06/20 16:47:43 Oh Wow, I had no idea about this. Thank you very m

/**