Skip to content
This repository has been archived by the owner on Nov 3, 2021. It is now read-only.

Bug 797792 - [Clock] If next alarm comes more than 24 HOURS, it should display in DAYS instead of HOURS in countdown indicator #7750

Closed
wants to merge 3 commits into from

Conversation

sergi
Copy link
Contributor

@sergi sergi commented Jan 23, 2013

Fixes bug 797792.

This fix expresses the remaining time for the alarm to fire in days and hours only in cas that the remaining time is longer than 24 hours. I've added extra locale strings for en-US and fr, but ar and zh-TW should be eventually completed.

@@ -321,7 +328,6 @@ var AlarmList = {
handleEvent: function al_handleEvent(evt) {

var link = evt.target;
var currentTarget = evt.currentTarget;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like out of update. The line have been removed. You should rebase your patch to fix the conflict.

Conflicts:
	apps/clock/locales/clock.ar.properties
@sergi
Copy link
Contributor Author

sergi commented Feb 4, 2013

I updated the patch, it is ready to be reviewed now.

@ian-liu
Copy link
Contributor

ian-liu commented Feb 5, 2013

r+, Thanks for Sergi's help. We can merge the pr now.

@ian-liu
Copy link
Contributor

ian-liu commented Feb 5, 2013

@sergivila
Could you please squash your pull request? (git rebase -i)
We need to follow the rule for merging a pr.

@sergi
Copy link
Contributor Author

sergi commented Feb 5, 2013

Please use PR at #7958. It has been squashed and should be ready to commit.

@sergi sergi closed this Feb 5, 2013
@sergi sergi deleted the 797792 branch February 5, 2013 09:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants