Skip to content

Commit

Permalink
Merge pull request #4673 from filakhtov/patch-1
Browse files Browse the repository at this point in the history
Removed dateFormat from toLocaleTimeString() call
  • Loading branch information
clefebvre committed Oct 8, 2015
2 parents 5e9265f + ae4c0e4 commit f90546a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions js/ui/messageTray.js
Expand Up @@ -446,7 +446,6 @@ Notification.prototype = {
this._imageBin = null;
this._timestamp = new Date();
this._inNotificationBin = false;
this.dateFormat = _("%l:%M %p");

this.enter_id = 0;
this.leave_id = 0;
Expand Down Expand Up @@ -588,7 +587,7 @@ Notification.prototype = {
this.title = title;
title = title ? _fixMarkup(title.replace(/\n/g, ' '), params.titleMarkup) : '';
this._titleLabel.clutter_text.set_markup('<b>' + title + '</b>');
this._timeLabel.clutter_text.set_markup(this._timestamp.toLocaleTimeString(this.dateFormat));
this._timeLabel.clutter_text.set_markup(this._timestamp.toLocaleTimeString());
this._timeLabel.hide();
if (Pango.find_base_dir(title, -1) == Pango.Direction.RTL)
this._titleDirection = St.TextDirection.RTL;
Expand Down

0 comments on commit f90546a

Please sign in to comment.