Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Year format for Date variable #392

Open
wants to merge 1 commit into
base: Main
Choose a base branch
from
Open

Added Year format for Date variable #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions chrome/content/modules/utils.jsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ var quicktextUtils = {
options["date-short"] = { dateStyle: "short" };
options["date-long"] = { dateStyle: "long" };
options["date-monthname"] = { month: "long" };
options["date-year"] = { year: "numeric" };
options["time-noseconds"] = { timeStyle: "short" };
options["time-seconds"] = { timeStyle: "long" };
return new Services.intl.DateTimeFormat(undefined, options[format.toLowerCase()]).format(timeStamp)
Expand All @@ -24,6 +25,7 @@ var quicktextUtils = {
options["date-short"] = { year: "numeric", month: "2-digit", day: "2-digit" };
options["date-long"] = { weekday: "long", year: "numeric", month: "long", day: "2-digit" };
options["date-monthname"] = { month: "long" };
options["date-year"] = { year: "numeric" };
options["time-noseconds"] = { hour: "2-digit", minute: "2-digit" };
options["time-seconds"] = { hour: "2-digit", minute: "2-digit", second: "2-digit" };
return new Intl.DateTimeFormat(undefined, options[format.toLowerCase()]).format(timeStamp);
Expand All @@ -42,6 +44,8 @@ var quicktextUtils = {
return dateTimeService.FormatTime("", dateTimeService.timeFormatSeconds, timeStamp.getHours(), timeStamp.getMinutes(), timeStamp.getSeconds())
case "date-monthname":
return dateTimeService.FormatDate("", dateTimeService.dateFormatLong, timeStamp.getMonth()+1);
case "date-year":
return dateTimeService.FormatDate("", dateTimeService.dateFormatLong, timeStamp.getFullYear());

}
}
Expand Down
2 changes: 1 addition & 1 deletion chrome/content/modules/wzQuicktextVar.jsm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ getcarddata_from: function(aData, aIdentity)
this.mData['TIME'].data = {};

var timeStamp = new Date();
let fields = ["DATE-long", "DATE-short", "DATE-monthname", "TIME-seconds", "TIME-noseconds"];
let fields = ["DATE-long", "DATE-short", "DATE-monthname", "DATE-year", "TIME-seconds", "TIME-noseconds"];
for (let i=0; i < fields.length; i++) {
let field = fields[i];
let fieldinfo = field.split("-");
Expand Down
2 changes: 1 addition & 1 deletion chrome/content/quicktext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ var quicktext = {
{
// Set the date/time in the variablemenu
var timeStamp = new Date();
let fields = ["date-short", "date-long", "date-monthname", "time-noseconds", "time-seconds"];
let fields = ["date-short", "date-long", "date-monthname", "date-year", "time-noseconds", "time-seconds"];
for (let i=0; i < fields.length; i++) {
let field = fields[i];
let fieldtype = field.split("-")[0];
Expand Down
1 change: 1 addition & 0 deletions chrome/content/scripts/messengercompose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ function onLoad(activatedWhileWindowOpen) {
<menuitem id="date-short" oncommand="quicktext.insertVariable('DATE');" />
<menuitem id="date-long" oncommand="quicktext.insertVariable('DATE=long');" />
<menuitem id="date-monthname" oncommand="quicktext.insertVariable('DATE=monthname');" />
<menuitem id="date-year" oncommand="quicktext.insertVariable('DATE=year');" />
<menuitem id="time-noseconds" oncommand="quicktext.insertVariable('TIME');" />
<menuitem id="time-seconds" oncommand="quicktext.insertVariable('TIME=seconds');" />
</menupopup>
Expand Down
2 changes: 1 addition & 1 deletion chrome/content/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ var quicktext = {

// Set the date/time in the variablemenu
var timeStamp = new Date();
let fields = ["date-short", "date-long", "date-monthname", "time-noseconds", "time-seconds"];
let fields = ["date-short", "date-long", "date-monthname", "date-year", "time-noseconds", "time-seconds"];
for (let i=0; i < fields.length; i++) {
let field = fields[i];
let fieldtype = field.split("-")[0];
Expand Down
1 change: 1 addition & 0 deletions chrome/content/settings.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@
<menuitem id="date-short" oncommand="quicktext.insertVariable('DATE');" />
<menuitem id="date-long" oncommand="quicktext.insertVariable('DATE=long');" />
<menuitem id="date-monthname" oncommand="quicktext.insertVariable('DATE=monthname');" />
<menuitem id="date-year" oncommand="quicktext.insertVariable('DATE=year');" />
<menuitem id="time-noseconds" oncommand="quicktext.insertVariable('TIME');" />
<menuitem id="time-seconds" oncommand="quicktext.insertVariable('TIME=seconds');" />
</menupopup>
Expand Down