masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Date format: match ordering of components in weechat

This commit is contained in:
Lorenz Hübschle-Schneider 2016-09-19 10:02:31 +02:00
parent e65804c7a7
commit 79e77ffef0
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/connection.js
View File

@ -137,21 +137,39 @@ weechat.factory('connection',
angularFormat = short24; angularFormat = short24;
} }
// Check for day of month in time string // Assemble day of month
if (timeFormat.indexOf("%d") > -1 || timeFormat.indexOf("%e") > -1) { var date_components = [];
angularFormat = "dd" + _timeDelimiter(" ") + angularFormat;
// month, too? // Check for day of month in time format
if (timeFormat.indexOf("%m") > -1) { var day_pos = Math.max(timeFormat.indexOf("%d"),
angularFormat = "MM" + _timeDelimiter("-") + angularFormat; timeFormat.indexOf("%e"));
date_components.push([day_pos, "dd"]);
// month of year?
var month_pos = timeFormat.indexOf("%m");
date_components.push([month_pos, "MM"]);
// year as well? // year as well?
var year_pos = Math.max(timeFormat.indexOf("%y"),
timeFormat.indexOf("%Y"));
if (timeFormat.indexOf("%y") > -1) { if (timeFormat.indexOf("%y") > -1) {
angularFormat = "yy" + _timeDelimiter("-") + angularFormat; date_components.push([year_pos, "yy"]);
} else if (timeFormat.indexOf("%Y") > -1) { } else if (timeFormat.indexOf("%Y") > -1) {
angularFormat = "yyyy" + _timeDelimiter("-") + angularFormat; date_components.push([year_pos, "yyyy"]);
} }
// if there is a date, assemble it in the right order
if (date_components.length > 0) {
date_components.sort();
var format_array = [];
for (var i = 0; i < date_components.length; i++) {
if (date_components[i][0] == -1) continue;
format_array.push(date_components[i][1]);
} }
// TODO: parse delimiter as well? For now, use '/' as it is
// more common internationally than '-'
var date_format = format_array.join(_timeDelimiter("/"));
angularFormat = date_format + _timeDelimiter("&nbsp;") + angularFormat;
} }
$rootScope.angularTimeFormat = angularFormat; $rootScope.angularTimeFormat = angularFormat;