From c553781033ca9f803a22f678ba3267d96d1d8070 Mon Sep 17 00:00:00 2001 From: MomentQYC Date: Mon, 6 Mar 2023 13:28:36 +0800 Subject: [PATCH 1/8] 'feat:i18n(#13)' --- app.js | 44 ++++- config/api-example.js | 3 +- helpers.js | 20 ++- locales/en-US.json | 158 ++++++++++++++++++ package-lock.json | 1 + package.json | 1 + routes.js | 2 +- views/404.handlebars | 4 +- views/event.handlebars | 142 ++++++++-------- views/eventgroup.handlebars | 74 ++++---- views/home.handlebars | 12 +- views/layouts/main.handlebars | 2 +- views/login.handlebars | 16 +- views/newevent.handlebars | 18 +- views/optionsform.handlebars | 16 +- views/partials/editeventgroupmodal.handlebars | 30 ++-- views/partials/editeventmodal.handlebars | 73 ++++---- views/partials/importeventform.handlebars | 14 +- views/partials/neweventform.handlebars | 78 ++++----- views/partials/neweventgroupform.handlebars | 42 ++--- views/partials/sidebar-dropdown.handlebars | 8 +- views/partials/sidebar.handlebars | 6 +- views/register.handlebars | 8 +- 23 files changed, 489 insertions(+), 283 deletions(-) create mode 100644 locales/en-US.json diff --git a/app.js b/app.js index c6e0647..a21ca73 100755 --- a/app.js +++ b/app.js @@ -5,16 +5,22 @@ const cors = require('cors'); const routes = require('./routes'); const hbs = require('express-handlebars'); const bodyParser = require('body-parser'); +const i18n = require('i18n'); const app = express(); - // Configuration // - //app.use(cors()); //app.use(bodyParser.json()); //app.use(session({ secret: 'slartibartfast', cookie: { maxAge: 60000 }, resave: false, saveUninitialized: false })); - - +app.use(session({ + secret: 'Py0Bf3aWZC8kYkYTpRztmYMyS22pFFGi' +})); +i18n.configure({ + locales:['en-US'], //声明包含的语言 + directory: __dirname + '/locales', //翻译json文件的路径 + defaultLocale: 'en-US' //默认的语言，即为上述标准4 +}); +app.use(i18n.init); // View engine // hbsInstance = hbs.create({ defaultLayout: 'main', @@ -51,4 +57,34 @@ app.use(bodyParser.json({ type: "application/activity+json" })); // support json app.use(bodyParser.urlencoded({ extended: true })); app.use('/', routes); +app.use(setLocale); module.exports = app; + +// 定义setLocale中间件 +function setLocale(req, res, next){ + var locale; + // 当req进入i18n中间件的时候，已经通过sessionId信息获取了用户数据 + // 获取用户数据中的locale数据 + if(req.user){ + locale = req.user.locale; + } + // 获取cookie中的locale数据 + else if(req.signedCookies['locale']){ + locale = req.signedCookies['locale']; + } + // 获取浏览器第一个偏好语言，这个函数是express提供的 + else if(req.acceptsLanguages()){ + locale = req.acceptsLanguages(); + } + // 没有语言偏好的时候网站使用的语言为中文 + else{ + locale = 'en-US'; + } + // 如果cookie中保存的语言偏好与此处使用的语言偏好不同，更新cookie中的语言偏好设置 + if(req.signedCookies['locale'] !== locale){ + res.cookie('locale', locale, { signed: true, httpOnly: true }); + } + // 设置i18n对这个请求所使用的语言 + req.setLocale(locale); + next(); +}; \ No newline at end of file diff --git a/config/api-example.js b/config/api-example.js index 9202f0a..4f66ff8 100644 --- a/config/api-example.js +++ b/config/api-example.js @@ -4,5 +4,6 @@ module.exports = { 'smtpServer': '', // If using Nodemailer, your SMTP server hostname goes here 'smtpPort': '', // If using Nodemailer, your SMTP server port goes here 'smtpUsername': '', // If using Nodemailer, your SMTP server username goes here - 'smtpPassword': '' // If using Nodemailer, your SMTP password goes here + 'smtpPassword': '', // If using Nodemailer, your SMTP password goes here + 'smtpSecure': true // true for 465, false for other ports }; diff --git a/helpers.js b/helpers.js index bf95e27..1cd638f 100644 --- a/helpers.js +++ b/helpers.js @@ -5,7 +5,7 @@ const mongoose = require('mongoose'); const Log = mongoose.model('Log'); var moment = require('moment-timezone'); const icalGenerator = require('ical-generator'); - +var i18n = require('i18n'); // LOGGING function addToLog(process, status, message) { @@ -51,7 +51,23 @@ function exportIcal(events, calendarName) { return string; } +function getI18nHelpers() { + var _helpers = {}; + // 声明handlebar中的i18n helper函数 + // __函数不考虑单复数 + _helpers.__ = function () { + return i18n.__.apply(this, arguments); + }; + // __n函数考虑单复数 + _helpers.__n = function () { + return i18n.__n.apply(this, arguments); + }; + + return _helpers; +} + module.exports = { addToLog, exportIcal, -} + getI18nHelpers, +} \ No newline at end of file diff --git a/locales/en-US.json b/locales/en-US.json new file mode 100644 index 0000000..5df38e0 --- /dev/null +++ b/locales/en-US.json @@ -0,0 +1,158 @@ +{ + "notfound": "Event not found!", + "404desc": "It may have never existed, or if it finished more than a week ago, it's been removed from the server. Don't despair - why not create a new one? I for one would love to come to your ocarina recital.", + "eventedit": "Edit event", + "started": "Started", + "ended": "Ended", + "hostedby": "Hosted by {{eventData.hostName}}", + "partof": "Part of {{eventData.eventGroup.name}}", + "copy": "Copy", + "addtoGC": "Add to Google Calendar", + "ICSexport": "Export as ICS", + "showonGM": "Show on Google Maps", + "showonOM": "Show on OpenStreetMap", + "concludeddel": "This event has concluded. It can no longer be edited, and will be automatically deleted .", + "eventwelcome": "Welcome to your event!", + "eventattention": "Your secret editing password for this event is: {{eventData.editToken}}. It's been saved in your browser storage, and if you supplied your email, it's also been sent to you. If you didn't supply your email, you must save it somewhere safe, because it won't be shown again!", + "eventshare": "To share your event, use the link you can see just above this message - that way your attendees won't be able to edit or delete your event!", + "about": "About", + "attendees": "Attendees", + "addme": "Add me", + "removeme": "Remove me", + "eventcapacity": "This event is at capacity.", + "remaining": "remaining - add yourself now!", + "removeuser": "Remove user from event", + "noattendees": "No attendees yet!", + "addself": "Add yourself to '{{eventData.name}}'", + "joinname": "Your name", + "peoplenum": "How many people in your party?", + "joinemail": "Your Email (optional)", + "joinemaildesc": "If you provide your email, you will receive updates to the event.", + "notspam": "We won't spam you", + "delpasswd": "Deletion password", + "delpwddesc": "You will need this password if you want to remove yourself from the list of event attendees. If you provided your email, you'll receive it by email. Otherwise, write it down now because it will not be shown again.", + "close": "Close", + "addmyself": "Add myself", + "selfremove": "Remove yourself from '{{eventData.name}}'", + "pwddel": "Your deletion password", + "lostpwd": "Lost your password? Get in touch with the event organiser.", + "rmmyself": "Remove myself", + "rmattendee": "Remove attendee from '{{eventData.name}}'", + "confirmrmA": "Are you sure you want to remove this attendee from the event? This action cannot be undone.", + "rmA": "Remove attendee", + "discussion": "Discussion", + "send": "Send", + "reply": "Reply", + "del": "Delete", + "editpwd": "Enter editing password", + "editpwddesc": "Enter the editing password you received by email or were shown when the event was created.", + "eventdelconfirm": "Are you sure you want to delete this event? This action cannot be undone.", + "eventdel": "Delete event", + "copied": "Copied!", + "incorrectpwd": "That editing password is incorrect. Try again.", + "numlimit": "Please enter a number between 1 and ${response.data.freeSpots}", + "editgroup": "Edit group", + "groupwelcome": "Welcome to your event group! We've just sent you an email with your secret editing link, which you can also see in the address bar above. Haven't got the email? Check your spam or junk folder. To share your event group, use the link you can see just below this message - that way your attendees won't be able to edit or delete your event group!", + "urlpaste": "Paste this URL into your calendar app\nto subscribe to a live feed of events from this group.", + "subscribe": "Subscribe to updates", + "groupaddevent": "To add an event to this group, copy and paste the two codes below into the 'Event Group' box when creating a new event or editing an existing event.", + "eventgroupid": "Event group ID", + "eventgroupeditpwd": "Event group editing password", + "eventupcome": "Upcoming events", + "noevents": "No events!", + "groupdelconfirm": "Are you sure you want to delete this event group? This action cannot be undone.", + "groupdeldesc": "This will not delete the individual events contained in this group. They can be linked to another group later.", + "groupdel": "Delete event group", + "groupsub": "Subscribe to '{{eventGroupData.name}}'", + "receivegroup": "Enter your email address to receive updates\nwhenever a new event is created in this group.", + "sub": "Subscribe", + "intro": "A quick and easy way to make and share events which respects your privacy.", + "desc": "You don't need to sign up for an account. When you create an event, we generate a password which allows you to edit the event. Send all your guests the public link, and all your co-hosts the secret editing link containing the password. A week after the event finishes, it's deleted from our servers for ever, and your email goes with it.", + "privacy": "Also, we don't show you ads, don't sell your data, and never send you unnecessary emails.", + "attention": "But remember: all our events are visible to anyone who knows the link, so probably don't use gathio to plot your surprise birthday party or revolution. Or whatever, you do you.", + "kofi": "If you find yourself using and enjoying gathio, consider buying me a coffee. It'll help keep the site running!", + "support": "Support Me on Ko-fi", + "accountdesc": "Register or log in to your account to be able to show this event on your profile, edit it, and delete it. Associating an event with an account is optional, but keep in mind that an unassociated event can not be modified in any way and will be automatically deleted 30 days after it concludes.", + "paccount": "You must register or log in to your account to create a private event.", + "oaccount": "You must register or log in to an organisation account to create an organisation event.", + "emailaddr": "Email address", + "password": "Password", + "register": "Register", + "forgotpwd": "Forgot password", + "neweventpage": "New event", + "newevent": "Events are visible to anyone who knows the link.", + "createnew": "Create a new event", + "importnew": "Import an existing event", + "newgroup": "Create a new event group", + "options": "Options", + "selfmark": "Users can mark themselves as attending this event", + "displaymod": "{{#if isPrivate}}Privately display{{else}}Publicly display{{/if}} the list of attendees", + "commentmod": "Users can post comments on this event", + "listdisplay": "Display the list of attendees", + "edit": "Edit", + "name": "Name", + "description": "Description", + "link": "Link", + "host": "Host or organisation name", + "coverimg": "Cover image", + "recommendeddimensions": "Recommended dimensions (w x h): 920px by 300px.", + "delgroup": "Delete this event group", + "delegroup": "Delete event group", + "save": "Save changes", + "eventname": "Event name", + "location": "Location", + "starts": "Starts", + "ends": "Ends", + "timezone": "Timezone", + "mdsupport": "Markdown formatting\nsupported.", + "hostname": "Host name", + "choosefile": "Choose file", + "imgdel": "Delete image", + "grouppart": "This event is part of an event group", + "linktogroup": "Link this event to an event group", + "shortstringdesc": "You can find this short string of characters in the\nevent group's link, in your confirmation email, or on the event group's\npage.", + "groupsecretcode": "Event group secret\nediting code", + "longstringdesc": "You can find this long string of characters in the\nconfirmation email you received when you created the event group.", + "limitset": "Set a limit on the maximum number of attendees", + "attendeelimit": "Attendee limit", + "delevent": "Delete this event", + "importevent": "Import an existing event", + "importdesc": "Upload an .ics file here to instantly create an event. You can save a Facebook event as an .ics file by clicking on the context menu next to the 'Import' and 'Edit' buttons on the event page and choosing the 'Export Event' option. Then select the 'Save to calendar' option and save the file on your computer.", + "selectfile": "Select file", + "youremail": "Your email", + "emaildesc": "We will send your secret editing link to this email address.", + "import": "Import", + "createevent": "Create an event", + "mdsupportA": "Markdown formatting supported.", + "eventpwd": "Event password", + "emaildescA": "If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event.", + "shortstringdescA": "You can find this short string of characters in the event group's link, in your confirmation email, or on the event group's page.", + "groupeditpwd": "Event group secret editing code", + "longstringdescA": "You can find this long string of characters in the confirmation email you received when you created the event group.", + "changefile": "Change file", + "groupcreate": "Create an event group", + "groupdesc": "An event group is a holding area for a set of linked events, like a series of film nights, a festival, or a band tour. You can share a public link to your event group just like an individual event link, and people who know the secret editing code (sent in an email when you create the event group) will be able to add future events to the group.", + "groupattention": "Event groups do not get automatically removed like events do, but events which have been removed from {{siteName}} will of course not show up in an event group.", + "groupname": "Event group name", + "private": "Private", + "public": "Public", + "org": "Organization", + "nicerevent": "Nicer events", + "create": "Create", + "or": "Or an alias, perhaps...", + "eventask": "What would you like to ask?", + "eventreply": "What would you like to reply?", + "right": "Get it right!", + "notspamlogin": "We will never spam you or share your email.", + "notforget": "Don't forget it!", + "snappy": "Make it snappy.", + "moreinfo": "For tickets or a page with more information (optional).", + "isshowgroup": "Will be shown on the event group page (optional).", + "specific": "Be specific.", + "anotherpage": "For tickets or another event page (optional).", + "isshowpage": "Will be shown on the event page (optional).", + "enternum": "Enter a number.", + "click": "Click me!", + "editlater": "You can always edit it later.", + "notspamA": "We won't spam you <3 (optional)" +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b19767b..b0a30bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,6 +24,7 @@ "greenlock-express": "^2.7.18", "ical": "^0.6.0", "ical-generator": "^1.11.0", + "i18n": "^0.15.1", "jimp": "^0.16.1", "jsonwebtoken": "^9.0.0", "marked": "^4.0.10", diff --git a/package.json b/package.json index 8963fd2..127195a 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "generate-rsa-keypair": "^0.2.1", "greenlock": "^2.8.8", "greenlock-express": "^2.7.18", + "i18n": "^0.15.1", "ical": "^0.6.0", "ical-generator": "^1.11.0", "jimp": "^0.16.1", diff --git a/routes.js b/routes.js index c9867e3..05b2919 100755 --- a/routes.js +++ b/routes.js @@ -103,7 +103,7 @@ if (mailService) { nodemailerTransporter = nodemailer.createTransport({ host: apiCredentials.smtpServer, port: apiCredentials.smtpPort, - secure: false, // true for 465, false for other ports + secure: apiCredentials.smtpSecure, // true for 465, false for other ports auth: { user: apiCredentials.smtpUsername, // generated ethereal user pass: apiCredentials.smtpPassword, // generated ethereal password diff --git a/views/404.handlebars b/views/404.handlebars index 832f81a..128dcdd 100755 --- a/views/404.handlebars +++ b/views/404.handlebars @@ -1,5 +1,5 @@

404

-

Event not found!

+

{{{__ "notfound"}}}

-

It may have never existed, or if it finished more than a week ago, it's been removed from the server. Don't despair - why not create a new one? I for one would love to come to your ocarina recital.

+

{{{__ "404desc"}}}

diff --git a/views/event.handlebars b/views/event.handlebars index 88856f3..c787c68 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -10,9 +10,9 @@
{{#if editingEnabled}} - + {{else}} - + {{/if}}
@@ -36,7 +36,7 @@
- {{#if eventHasBegun}}{{#unless eventHasConcluded}}Started {{else}}Ended {{/unless}}{{/if}}{{fromNow}} + {{#if eventHasBegun}}{{#unless eventHasConcluded}}{{{__ "started"}}} {{else}}{{{__ "ended"}}} {{/unless}}{{/if}}{{fromNow}} {{#if eventHasHost}} @@ -44,7 +44,7 @@ - Hosted by {{eventData.hostName}} + {{{__ "hostedby"}}} {{/if}} {{#if eventData.eventGroup}} @@ -52,7 +52,7 @@ - Part of {{eventData.eventGroup.name}} + {{{__ "partof"}}} {{/if}} {{#if eventData.url}} @@ -71,7 +71,7 @@ https://{{domain}}/{{eventData.id}} {{#if isFederated}} @@ -81,7 +81,7 @@ @{{eventData.id}}@{{domain}} {{/if}} @@ -90,17 +90,17 @@
@@ -109,7 +109,7 @@ {{#if eventHasConcluded}} {{/if}} {{#if firstLoad}} @@ -117,13 +117,13 @@ -

Welcome to your event!

-

Your secret editing password for this event is: {{eventData.editToken}}. It's been saved in your browser storage, and if you supplied your email, it's also been sent to you. If you didn't supply your email, you must save it somewhere safe, because it won't be shown again!

-

To share your event, use the link you can see just above this message - that way your attendees won't be able to edit or delete your event!

+

{{{__ "eventwelcome"}}}

+

{{{__ "eventattention"}}}

+

{{{__ "eventshare"}}}

{{/if}}
-
About
+
{{{__ "about"}}}
{{{parsedDescription}}}
@@ -131,30 +131,30 @@ {{#if eventData.usersCanAttend}}
-
Attendees {{#if eventAttendees}}({{numberOfAttendees}}){{/if}} +
{{{__ "attendees"}}} {{#if eventAttendees}}({{numberOfAttendees}}){{/if}}
{{#unless noMoreSpots}} - + {{/unless}} - +
{{#if eventData.maxAttendees}} {{#if noMoreSpots}} -
This event is at capacity.
+
{{{__ "eventcapacity"}}}
{{else}} -
{{spotsRemaining}} {{plural spotsRemaining "spot(s)"}} remaining - add yourself now!
+
{{spotsRemaining}} {{plural spotsRemaining "spot(s)"}} {{{__ "remaining"}}}
{{/if}} {{/if}} {{#if eventAttendees}}
    {{#each eventAttendees}} - {{this.name}}{{#if ../editingEnabled}} {{/if}} + {{this.name}}{{#if ../editingEnabled}} {{/if}} {{/each}}
{{else}} -

No attendees yet!

+

{{{__ "noattendees"}}}

{{/if}}
@@ -163,7 +163,7 @@
- + @@ -171,34 +171,34 @@
- +
- +
- +
- -

If you provide your email, you will receive updates to the event.

+ +

{{{__ "joinemaildesc"}}}

- +
- -

You will need this password if you want to remove yourself from the list of event attendees. If you provided your email, you'll receive it by email. Otherwise, write it down now because it will not be shown again.

+ +

{{{__ "delpwddesc"}}}

- - + +
@@ -209,7 +209,7 @@
- + @@ -217,15 +217,15 @@
- -

Lost your password? Get in touch with the event organiser.

+ +

{{{__ "lostpwd"}}}

- - + +
@@ -237,18 +237,18 @@
- +
-

Are you sure you want to remove this attendee from the event? This action cannot be undone.

+

{{{__ "confirmrmA"}}}

- - + +
@@ -260,17 +260,17 @@ {{#if eventData.usersCanComment}}
-
Discussion
+
{{{__ "discussion"}}}
- +
- +
- +
@@ -300,12 +300,12 @@
{{#if ../editingEnabled}} {{/if}} @@ -315,13 +315,13 @@
- +
- +
- +
@@ -340,7 +340,7 @@
- + @@ -348,9 +348,9 @@
-

Enter the editing password you received by email or were shown when the event was created.

+

{{{__ "editpwddesc"}}}

- +
@@ -358,8 +358,8 @@
- - + +
@@ -375,18 +375,18 @@
- +
-

Are you sure you want to delete this event? This action cannot be undone.

+

{{{__ "eventdelconfirm"}}}

- - + +
@@ -514,8 +514,8 @@ input_field: "#image-upload", preview_box: "#image-preview", label_field: "#image-label", - label_default: "Choose file", - label_selected: "Change file", + label_default: "{{{__ "choosefile"}}}", + label_selected: "{{{__ "changefile"}}}", no_label: false }); $("#image-preview").css("background-image", "url('/events/{{eventData.image}}')"); @@ -534,13 +534,13 @@ }) }) $("#copyEventLink").click(function(){ - $(this).html(' Copied!'); - setTimeout(function(){ $("#copyEventLink").html(' Copy');}, 5000); + $(this).html(' {{{__ "copied"}}}'); + setTimeout(function(){ $("#copyEventLink").html(' {{{__ "copy"}}}');}, 5000); }) new ClipboardJS('#copyAPLink'); $("#copyAPLink").click(function(){ - $(this).html(' Copied!'); - setTimeout(function(){ $("#copyAPLink").html(' Copy');}, 5000); + $(this).html(' {{{__ "copied"}}}'); + setTimeout(function(){ $("#copyAPLink").html(' {{{__ "copy"}}}');}, 5000); }) $(".daysToDeletion").html(moment("{{eventEndISO}}").add(7, 'days').fromNow()); if ($("#joinCheckbox").is(':checked')){ @@ -590,7 +590,7 @@ if (response.data.freeSpots !== undefined) { modal.find('#attendeeNumber') .attr('data-validation-allowing', `range[1;${response.data.freeSpots}]`) - .attr('data-validation-error-msg', `Please enter a number between 1 and ${response.data.freeSpots}`); + .attr('data-validation-error-msg', `{{{__ "numlimit"}}}`); } modal.modal(); }) @@ -615,7 +615,7 @@ } }, error: function(response, status, xhr) { - form.find('.alert').text('That editing password is incorrect. Try again.').show(); + form.find('.alert').text('{{{__ "incorrectpwd"}}}').show(); } }); }); diff --git a/views/eventgroup.handlebars b/views/eventgroup.handlebars index 9afee2c..dcdba9d 100755 --- a/views/eventgroup.handlebars +++ b/views/eventgroup.handlebars @@ -9,9 +9,9 @@
{{#if editingEnabled}} - + {{else}} - + {{/if}}
@@ -20,7 +20,7 @@ - Welcome to your event group! We've just sent you an email with your secret editing link, which you can also see in the address bar above. Haven't got the email? Check your spam or junk folder. To share your event group, use the link you can see just below this message - that way your attendees won't be able to edit or delete your event group! + {{{__ "groupwelcome"}}}
{{/if}}
@@ -34,7 +34,7 @@ - Hosted by {{eventGroupData.hostName}} + {{{__ "hostedby"}}} {{/if}} {{#if eventGroupData.url}} @@ -53,7 +53,7 @@ https://{{domain}}/group/{{eventGroupData.id}}
  • @@ -65,10 +65,9 @@ -

    Paste this URL into your calendar app - to subscribe to a live feed of events from this group.

    +

    {{{__ "urlpaste"}}}

    • @@ -79,11 +78,11 @@
    @@ -92,15 +91,15 @@ {{#if editingEnabled}}
    -

    To add an event to this group, copy and paste the two codes below into the 'Event Group' box when creating a new event or editing an existing event.

    +

    {{{__ "groupaddevent"}}}

    - + - +
    Event group ID{{{__ "eventgroupid"}}} {{eventGroupData.id}}
    Event group editing password{{{__ "eventgroupeditpwd"}}} {{eventGroupData.editToken}}
    @@ -110,13 +109,13 @@ {{/if}}
    -
    About
    +
    {{{__ "about"}}}
    {{{parsedDescription}}}
    -
    Upcoming events
    +
    {{{__ "eventupcome"}}}
    {{#if upcomingEventsExist}} {{#each events}} @@ -129,7 +128,7 @@ {{/unless}} {{/each}} {{else}} -
    No events!
    +
    {{{__ "noevents"}}}
    {{/if}}
    @@ -141,19 +140,19 @@
    - +
    -

    Are you sure you want to delete this event group? This action cannot be undone.

    -

    This will not delete the individual events contained in this group. They can be linked to another group later.

    +

    {{{__ "groupdelconfirm"}}}

    +

    {{{__ "groupdeldesc"}}}

    - - + +
    @@ -167,7 +166,7 @@
    - + @@ -175,8 +174,7 @@
    -

    Enter your email address to receive updates - whenever a new event is created in this group.

    +

    {{{__ "receivegroup"}}}

    - - + +
    @@ -196,7 +194,7 @@
    - + @@ -204,9 +202,9 @@
    -

    Enter the editing password you received by email or were shown when the event was created.

    +

    {{{__ "editpwddesc"}}}

    - +
    @@ -214,8 +212,8 @@
    - - + +
    @@ -277,8 +275,8 @@ input_field: "#eventGroupImageUpload", preview_box: "#eventGroupImagePreview", label_field: "#eventGroupImageLabel", - label_default: "Choose file", - label_selected: "Change file", + label_default: "{{{__ "choosefile"}}}", + label_selected: "{{{__ "changefile"}}}", no_label: false }); $("#eventGroupImagePreview").css("background-image", "url('/events/{{eventGroupData.image}}')"); @@ -294,12 +292,12 @@ }) }) $("#copyEventLink").click(function(){ - $(this).html(' Copied!'); - setTimeout(function(){ $("#copyEventLink").html(' Copy');}, 5000); + $(this).html(' {{{__ "copied"}}}'); + setTimeout(function(){ $("#copyEventLink").html(' {{{__ "copy"}}}');}, 5000); }); $("#copyFeedLink").click(function(){ - $(this).html(' Copied!'); - setTimeout(function(){ $("#copyFeedLink").html(' Copy');}, 5000); + $(this).html(' {{{__ "copied"}}}'); + setTimeout(function(){ $("#copyFeedLink").html(' {{{__ "copy"}}}');}, 5000); }); $('#verifyTokenForm').on('submit', function(e) { @@ -317,7 +315,7 @@ } }, error: function(response, status, xhr) { - form.find('.alert').text('That editing password is incorrect. Try again.').show(); + form.find('.alert').text('{{{__ "incorrectpwd"}}}').show(); } }); }); diff --git a/views/home.handlebars b/views/home.handlebars index 4db9bb4..5a459b6 100755 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -1,22 +1,22 @@ -

    A quick and easy way to make and share events which respects your privacy.

    +

    {{{__ "intro"}}}

    -

    You don't need to sign up for an account. When you create an event, we generate a password which allows you to edit the event. Send all your guests the public link, and all your co-hosts the secret editing link containing the password. A week after the event finishes, it's deleted from our servers for ever, and your email goes with it.

    +

    {{{__ "desc"}}}

    -

    Also, we don't show you ads, don't sell your data, and never send you unnecessary emails.

    +

    {{{__ "privacy"}}}

    -

    But remember: all our events are visible to anyone who knows the link, so probably don't use gathio to plot your surprise birthday party or revolution. Or whatever, you do you.

    +

    {{{__ "attention"}}}

    {{#if showKofi}}
    -

    If you find yourself using and enjoying gathio, consider buying me a coffee. It'll help keep the site running!

    - +

    {{{__ "kofi"}}}

    +
    {{/if}} diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars index ee6817b..5edc5a1 100755 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -74,4 +74,4 @@
    - + \ No newline at end of file diff --git a/views/login.handlebars b/views/login.handlebars index a08f5b4..5e9f427 100755 --- a/views/login.handlebars +++ b/views/login.handlebars @@ -2,24 +2,24 @@
    {{#if isPublic}} -

    Register or log in to your account to be able to show this event on your profile, edit it, and delete it. Associating an event with an account is optional, but keep in mind that an unassociated event can not be modified in any way and will be automatically deleted 30 days after it concludes.

    +

    {{{__ "accountdesc"}}}

    {{else if isPrivate}} -

    You must register or log in to your account to create a private event.

    +

    {{{__ "paccount"}}}

    {{else if isOrganisation}} -

    You must register or log in to an organisation account to create an organisation event.

    +

    {{{__ "oaccount"}}}

    {{/if}}
    - +
    - +
    - +
    - +
    @@ -28,5 +28,5 @@

    - Register | Forgot password + {{{__ "register"}}} | {{{__ "forgotpwd"}}}

    diff --git a/views/newevent.handlebars b/views/newevent.handlebars index 5e7752f..92660d4 100755 --- a/views/newevent.handlebars +++ b/views/newevent.handlebars @@ -1,7 +1,7 @@ -

    New event

    +

    {{{__ "neweventpage"}}}

    @@ -12,13 +12,13 @@
    - +
    - +
    - +
    @@ -37,7 +37,7 @@ + \ No newline at end of file diff --git a/views/optionsform.handlebars b/views/optionsform.handlebars index a844d12..dfadfb1 100755 --- a/views/optionsform.handlebars +++ b/views/optionsform.handlebars @@ -1,46 +1,46 @@
    -
    Options
    +
    {{{__ "options"}}}
    -
    Options
    +
    {{{__ "options"}}}
    diff --git a/views/partials/editeventgroupmodal.handlebars b/views/partials/editeventgroupmodal.handlebars index 3b8f55a..32da18c 100644 --- a/views/partials/editeventgroupmodal.handlebars +++ b/views/partials/editeventgroupmodal.handlebars @@ -2,7 +2,7 @@
    - + @@ -10,42 +10,42 @@
    - - + +
    - + - Markdown formatting supported. + {{{__ "mdsupportA"}}}
    - - + +
    - - + +
    - +
    - Recommended dimensions (w x h): 920px by 300px. + {{{__ "recommendeddimensions"}}}
    -
    Delete this event group
    +
    {{{__ "delgroup"}}}
    - +
    - - + +
    diff --git a/views/partials/editeventmodal.handlebars b/views/partials/editeventmodal.handlebars index b4b0ea6..8fb4657 100644 --- a/views/partials/editeventmodal.handlebars +++ b/views/partials/editeventmodal.handlebars @@ -2,7 +2,7 @@
    - + @@ -11,93 +11,88 @@
    - +
    - +
    - +
    - +
    - +
    - + - Markdown formatting - supported. + {{{__ "mdsupport"}}}
    - +
    - +
    - +
    - +
    - Recommended dimensions (w x h): 920px by 300px. + {{{__ "recommendeddimensions"}}} {{#if eventData.image}} - + {{/if}}
    -
    Options
    +
    {{{__ "options"}}}
    - Link this event to an event group + {{{__ "linktogroup"}}}
    - +
    - You can find this short string of characters in the - event group's link, in your confirmation email, or on the event group's - page. + {{{__ "shortstringdesc"}}}
    - +
    - You can find this long string of characters in the - confirmation email you received when you created the event group. + {{{__ "longstringdesc"}}}
    @@ -106,7 +101,7 @@
    @@ -114,7 +109,7 @@ type="checkbox" id="joinCheckbox" name="joinCheckbox" {{#if eventData.usersCanAttend}}checked{{/if}}>
    - +
    -
    Delete this event
    +
    {{{__ "delevent"}}}
    - +
    - - + +
    diff --git a/views/partials/importeventform.handlebars b/views/partials/importeventform.handlebars index 9ad038a..b730863 100644 --- a/views/partials/importeventform.handlebars +++ b/views/partials/importeventform.handlebars @@ -1,6 +1,6 @@ -

    Import an existing event

    +

    {{{__ "importevent"}}}

    - Upload an .ics file here to instantly create an event. You can save a Facebook event as an .ics file by clicking on the context menu next to the 'Import' and 'Edit' buttons on the event page and choosing the 'Export Event' option. Then select the 'Save to calendar' option and save the file on your computer. + {{{__ "importdesc"}}}

    Image showing the location of the export option on Facebook @@ -10,16 +10,16 @@
    - +
    - - We will send your secret editing link to this email address. + + {{{__ "emaildesc"}}}
    - + diff --git a/views/partials/neweventform.handlebars b/views/partials/neweventform.handlebars index f2175ff..eee8939 100755 --- a/views/partials/neweventform.handlebars +++ b/views/partials/neweventform.handlebars @@ -1,64 +1,64 @@ -

    Create an event

    +

    {{{__ "createevent"}}}

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - - Markdown formatting supported. + + {{{__ "mdsupportA"}}}
    - +
    - +
    - +
    - Recommended dimensions (w x h): 920px by 300px. + {{{__ "recommendeddimensions"}}}
    {{#unless isPublic}}
    - +
    - +
    @@ -66,44 +66,44 @@
    {{/unless}}
    - +
    - +
    - +
    - - If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event. + + {{{__ "emaildescA"}}}
    -
    Options
    +
    {{{__ options}}}
    - Link this event to an event group + {{{__ "linktogroup"}}}
    - +
    - You can find this short string of characters in the event group's link, in your confirmation email, or on the event group's page. + {{{__ "shortstringdescA"}}}
    - +
    - You can find this long string of characters in the confirmation email you received when you created the event group. + {{{__ "longstringdescA"}}}
    @@ -111,32 +111,32 @@
    - +
    - +
    - +
    @@ -149,8 +149,8 @@ input_field: "#eventImageUpload", preview_box: "#eventImagePreview", label_field: "#eventImageLabel", - label_default: "Choose file", - label_selected: "Change file", + label_default: "{{{__ "choosefile"}}}", + label_selected: "{{{__ "changefile"}}}", no_label: false }); autosize($('textarea')); diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars index 616b8ca..3d677a7 100755 --- a/views/partials/neweventgroupform.handlebars +++ b/views/partials/neweventgroupform.handlebars @@ -1,52 +1,52 @@ -

    Create an event group

    -

    An event group is a holding area for a set of linked events, like a series of film nights, a festival, or a band tour. You can share a public link to your event group just like an individual event link, and people who know the secret editing code (sent in an email when you create the event group) will be able to add future events to the group.

    -

    Event groups do not get automatically removed like events do, but events which have been removed from {{siteName}} will of course not show up in an event group.

    +

    {{{__ "groupcreate"}}}

    +

    {{{__ "groupdesc"}}}

    +

    {{{__ "groupattention"}}}

    - +
    - +
    - +
    - - Markdown formatting supported. + + {{{__ "mdsupportA"}}}
    - +
    - +
    - +
    - +
    - Recommended dimensions (w x h): 920px by 300px. + {{{__ "recommendeddimensions"}}}
    - +
    - +
    - +
    - - If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event. + + {{{__ "emaildescA"}}}
    - +
    @@ -57,8 +57,8 @@ input_field: "#eventGroupImageUpload", preview_box: "#eventGroupImagePreview", label_field: "#eventGroupImageLabel", - label_default: "Choose file", - label_selected: "Change file", + label_default: "{{{__ "choosefile"}}}", + label_selected: "{{{__ "changefile"}}}", no_label: false }); autosize($('textarea')); diff --git a/views/partials/sidebar-dropdown.handlebars b/views/partials/sidebar-dropdown.handlebars index 9f9e564..e63da7d 100755 --- a/views/partials/sidebar-dropdown.handlebars +++ b/views/partials/sidebar-dropdown.handlebars @@ -1,11 +1,11 @@
    - Private - Public - Organisation + {{{__ "private"}}} + {{{__ "public"}}} + {{{__ "org"}}}
    \ No newline at end of file diff --git a/views/partials/sidebar.handlebars b/views/partials/sidebar.handlebars index 1aa0f74..6567b68 100755 --- a/views/partials/sidebar.handlebars +++ b/views/partials/sidebar.handlebars @@ -1,7 +1,7 @@
    -

    gathio

    +

    HashiAct

    -

    Nicer events

    +

    {{{__ "nicerevent"}}}

    - New event + {{{__ "neweventpage"}}}
    diff --git a/views/register.handlebars b/views/register.handlebars index 1e097c1..3c883d8 100755 --- a/views/register.handlebars +++ b/views/register.handlebars @@ -1,13 +1,13 @@
    - +
    - +
    - +
    - +
    From ea9cd6c65865f91b795b7acf7bf82128e0f40510 Mon Sep 17 00:00:00 2001 From: MomentQYC Date: Mon, 6 Mar 2023 13:47:53 +0800 Subject: [PATCH 2/8] 'fix:note translate' --- app.js | 22 +++++++++++----------- helpers.js | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app.js b/app.js index a21ca73..ef74fd0 100755 --- a/app.js +++ b/app.js @@ -16,9 +16,9 @@ app.use(session({ secret: 'Py0Bf3aWZC8kYkYTpRztmYMyS22pFFGi' })); i18n.configure({ - locales:['en-US'], //声明包含的语言 - directory: __dirname + '/locales', //翻译json文件的路径 - defaultLocale: 'en-US' //默认的语言，即为上述标准4 + locales:['en-US'], //include langs + directory: __dirname + '/locales', //the path to the json file + defaultLocale: 'en-US' //default lang }); app.use(i18n.init); // View engine // @@ -60,31 +60,31 @@ app.use('/', routes); app.use(setLocale); module.exports = app; -// 定义setLocale中间件 +// def setLocale function setLocale(req, res, next){ var locale; - // 当req进入i18n中间件的时候，已经通过sessionId信息获取了用户数据 - // 获取用户数据中的locale数据 + // Get the locale data in the user data if(req.user){ locale = req.user.locale; } - // 获取cookie中的locale数据 + // Get the locale data in the cookie else if(req.signedCookies['locale']){ locale = req.signedCookies['locale']; } - // 获取浏览器第一个偏好语言，这个函数是express提供的 + // Get the first preferred language of the browser, this function is provided by express + // User-selected languages will be added later else if(req.acceptsLanguages()){ locale = req.acceptsLanguages(); } - // 没有语言偏好的时候网站使用的语言为中文 + // When there is no language preference, the language used on the website is English else{ locale = 'en-US'; } - // 如果cookie中保存的语言偏好与此处使用的语言偏好不同，更新cookie中的语言偏好设置 + // If the language preference saved in the cookie is different from the language preference used here, update the language preference setting in the cookie if(req.signedCookies['locale'] !== locale){ res.cookie('locale', locale, { signed: true, httpOnly: true }); } - // 设置i18n对这个请求所使用的语言 + // Set the language that i18n will use for this request req.setLocale(locale); next(); }; \ No newline at end of file diff --git a/helpers.js b/helpers.js index 1cd638f..7667b9f 100644 --- a/helpers.js +++ b/helpers.js @@ -53,12 +53,12 @@ function exportIcal(events, calendarName) { function getI18nHelpers() { var _helpers = {}; - // 声明handlebar中的i18n helper函数 - // __函数不考虑单复数 + // Declare the i18n helper function in the handlebar + // __ Not considering singular and plural _helpers.__ = function () { return i18n.__.apply(this, arguments); }; - // __n函数考虑单复数 + // __n Considering singular and plural _helpers.__n = function () { return i18n.__n.apply(this, arguments); }; From a0b1680d1d32931b9016e6b4c6ddb3d0df30e05b Mon Sep 17 00:00:00 2001 From: MomentQYC <62551256+MomentQYC@users.noreply.github.com> Date: Wed, 8 Mar 2023 20:57:20 +0800 Subject: [PATCH 3/8] Update en-US.json --- locales/en-US.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en-US.json b/locales/en-US.json index 5df38e0..b84ad40 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -55,7 +55,7 @@ "groupwelcome": "Welcome to your event group! We've just sent you an email with your secret editing link, which you can also see in the address bar above. Haven't got the email? Check your spam or junk folder. To share your event group, use the link you can see just below this message - that way your attendees won't be able to edit or delete your event group!", "urlpaste": "Paste this URL into your calendar app\nto subscribe to a live feed of events from this group.", "subscribe": "Subscribe to updates", - "groupaddevent": "To add an event to this group, copy and paste the two codes below into the 'Event Group' box when creating a new event or editing an existing event.", + "groupaddevent": "To add an event to this group, copy and paste the two codes below into the \"Event Group\" box when creating a new event or editing an existing event.", "eventgroupid": "Event group ID", "eventgroupeditpwd": "Event group editing password", "eventupcome": "Upcoming events", @@ -155,4 +155,4 @@ "click": "Click me!", "editlater": "You can always edit it later.", "notspamA": "We won't spam you <3 (optional)" -} \ No newline at end of file +} From 53a4c99a57f7864b738ca64ca9fb6051cdf54e3a Mon Sep 17 00:00:00 2001 From: MomentQYC Date: Wed, 8 Mar 2023 21:09:11 +0800 Subject: [PATCH 4/8] fix:lost strings --- locales/en-US.json | 3 ++- views/login.handlebars | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/locales/en-US.json b/locales/en-US.json index 5df38e0..d9b882d 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -55,7 +55,7 @@ "groupwelcome": "Welcome to your event group! We've just sent you an email with your secret editing link, which you can also see in the address bar above. Haven't got the email? Check your spam or junk folder. To share your event group, use the link you can see just below this message - that way your attendees won't be able to edit or delete your event group!", "urlpaste": "Paste this URL into your calendar app\nto subscribe to a live feed of events from this group.", "subscribe": "Subscribe to updates", - "groupaddevent": "To add an event to this group, copy and paste the two codes below into the 'Event Group' box when creating a new event or editing an existing event.", + "groupaddevent": "To add an event to this group, copy and paste the two codes below into the \"Event Group\" box when creating a new event or editing an existing event.", "eventgroupid": "Event group ID", "eventgroupeditpwd": "Event group editing password", "eventupcome": "Upcoming events", @@ -78,6 +78,7 @@ "emailaddr": "Email address", "password": "Password", "register": "Register", + "login": "Log in", "forgotpwd": "Forgot password", "neweventpage": "New event", "newevent": "Events are visible to anyone who knows the link.", diff --git a/views/login.handlebars b/views/login.handlebars index 5e9f427..80b887c 100755 --- a/views/login.handlebars +++ b/views/login.handlebars @@ -1,4 +1,4 @@ -

    Log in

    +

    {{{__ "login"}}}

    {{#if isPublic}} From dcb9fa54cf4ad458708a59b98e70ebe8aa9377dc Mon Sep 17 00:00:00 2001 From: MomentQYC Date: Wed, 8 Mar 2023 21:25:51 +0800 Subject: [PATCH 5/8] fix:lost strings --- locales/en-US.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en-US.json b/locales/en-US.json index 8e2ffc0..5422c96 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -118,7 +118,7 @@ "attendeelimit": "Attendee limit", "delevent": "Delete this event", "importevent": "Import an existing event", - "importdesc": "Upload an .ics file here to instantly create an event. You can save a Facebook event as an .ics file by clicking on the context menu next to the 'Import' and 'Edit' buttons on the event page and choosing the 'Export Event' option. Then select the 'Save to calendar' option and save the file on your computer.", + "importdesc": "Upload an .ics file here to instantly create an event. You can save a Facebook event as an .ics file by clicking on the context menu next to the \"Import\" and \"Edit\" buttons on the event page and choosing the \"Export Event\" option. Then select the \"Save to calendar\" option and save the file on your computer.", "selectfile": "Select file", "youremail": "Your email", "emaildesc": "We will send your secret editing link to this email address.", @@ -156,4 +156,4 @@ "click": "Click me!", "editlater": "You can always edit it later.", "notspamA": "We won't spam you <3 (optional)" -} +} \ No newline at end of file From 0ab7931f2457bf25383c2ee8134de163d12b7724 Mon Sep 17 00:00:00 2001 From: MomentQYC <62551256+MomentQYC@users.noreply.github.com> Date: Thu, 9 Mar 2023 11:54:02 +0800 Subject: [PATCH 6/8] fix a bug --- views/partials/neweventgroupform.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars index 3d677a7..3c2e0b2 100755 --- a/views/partials/neweventgroupform.handlebars +++ b/views/partials/neweventgroupform.handlebars @@ -46,7 +46,7 @@
    - +
    From cca2ab1ce8b4f35005a50e614042c94f068977a1 Mon Sep 17 00:00:00 2001 From: Raphael Kabo Date: Fri, 17 Mar 2023 18:18:05 +0000 Subject: [PATCH 7/8] fix: update en-US, delete unused templates --- locales/en-US.json | 224 ++++++++---------- views/404.handlebars | 4 +- views/event.handlebars | 94 ++++---- views/eventgroup.handlebars | 44 ++-- views/home.handlebars | 12 +- views/login.handlebars | 32 --- views/newevent.handlebars | 10 +- views/optionsform.handlebars | 47 ---- views/partials/editeventgroupmodal.handlebars | 10 +- views/partials/editeventmodal.handlebars | 42 ++-- views/partials/importeventform.handlebars | 12 +- views/partials/neweventform.handlebars | 63 ++--- views/partials/neweventgroupform.handlebars | 32 +-- views/partials/sidebar-dropdown.handlebars | 11 - views/partials/sidebar.handlebars | 6 +- views/register.handlebars | 15 -- 16 files changed, 257 insertions(+), 401 deletions(-) delete mode 100755 views/login.handlebars delete mode 100755 views/optionsform.handlebars delete mode 100755 views/partials/sidebar-dropdown.handlebars delete mode 100755 views/register.handlebars diff --git a/locales/en-US.json b/locales/en-US.json index 5422c96..d7b90f8 100644 --- a/locales/en-US.json +++ b/locales/en-US.json @@ -1,159 +1,131 @@ { - "notfound": "Event not found!", - "404desc": "It may have never existed, or if it finished more than a week ago, it's been removed from the server. Don't despair - why not create a new one? I for one would love to come to your ocarina recital.", - "eventedit": "Edit event", + "notFound": "Event not found!", + "404Desc": "It may have never existed, or if it finished more than a week ago, it's been removed from the server. Don't despair - why not create a new one? I for one would love to come to your ocarina recital.", + "editEvent": "Edit event", "started": "Started", "ended": "Ended", - "hostedby": "Hosted by {{eventData.hostName}}", - "partof": "Part of {{eventData.eventGroup.name}}", + "hostedBy": "Hosted by {{eventData.hostName}}", + "partOf": "Part of {{eventData.eventGroup.name}}", "copy": "Copy", - "addtoGC": "Add to Google Calendar", - "ICSexport": "Export as ICS", - "showonGM": "Show on Google Maps", - "showonOM": "Show on OpenStreetMap", - "concludeddel": "This event has concluded. It can no longer be edited, and will be automatically deleted .", - "eventwelcome": "Welcome to your event!", - "eventattention": "Your secret editing password for this event is: {{eventData.editToken}}. It's been saved in your browser storage, and if you supplied your email, it's also been sent to you. If you didn't supply your email, you must save it somewhere safe, because it won't be shown again!", - "eventshare": "To share your event, use the link you can see just above this message - that way your attendees won't be able to edit or delete your event!", + "addToGC": "Add to Google Calendar", + "exportAsICS": "Export as ICS", + "showOnGM": "Show on Google Maps", + "showOnOSM": "Show on OpenStreetMap", + "concludedDel": "This event has concluded. It can no longer be edited, and will be automatically deleted .", + "eventWelcome": "Welcome to your event!", + "eventPasswordAlert": "Your secret editing password for this event is: {{eventData.editToken}}. It's been saved in your browser storage, and if you supplied your email, it's also been sent to you. If you didn't supply your email, you must save it somewhere safe, because it won't be shown again!", + "eventShare": "To share your event, use the link you can see just above this message - that way your attendees won't be able to edit or delete your event!", "about": "About", "attendees": "Attendees", - "addme": "Add me", - "removeme": "Remove me", - "eventcapacity": "This event is at capacity.", + "addMe": "Add me", + "removeMe": "Remove me", + "eventAtCapacity": "This event is at capacity.", "remaining": "remaining - add yourself now!", - "removeuser": "Remove user from event", - "noattendees": "No attendees yet!", - "addself": "Add yourself to '{{eventData.name}}'", - "joinname": "Your name", - "peoplenum": "How many people in your party?", - "joinemail": "Your Email (optional)", - "joinemaildesc": "If you provide your email, you will receive updates to the event.", - "notspam": "We won't spam you", - "delpasswd": "Deletion password", - "delpwddesc": "You will need this password if you want to remove yourself from the list of event attendees. If you provided your email, you'll receive it by email. Otherwise, write it down now because it will not be shown again.", + "removeUser": "Remove user from event", + "noAttendees": "No attendees yet!", + "addSelfTitle": "Add yourself to '{{eventData.name}}'", + "yourName": "Your name", + "peopleNum": "How many people in your party?", + "yourEmail": "Your email", + "joinEmailDesc": "If you provide your email, you will receive updates to the event.", + "optional": "Optional.", + "delPassword": "Deletion password", + "delPasswordDesc": "You will need this password if you want to remove yourself from the list of event attendees. If you provided your email, you'll receive it by email. Otherwise, write it down now because it will not be shown again.", "close": "Close", - "addmyself": "Add myself", - "selfremove": "Remove yourself from '{{eventData.name}}'", - "pwddel": "Your deletion password", - "lostpwd": "Lost your password? Get in touch with the event organiser.", - "rmmyself": "Remove myself", - "rmattendee": "Remove attendee from '{{eventData.name}}'", - "confirmrmA": "Are you sure you want to remove this attendee from the event? This action cannot be undone.", - "rmA": "Remove attendee", + "addSelf": "Add myself", + "removeSelfTitle": "Remove yourself from '{{eventData.name}}'", + "lostPassword": "Lost your password? Get in touch with the event organiser.", + "removeSelf": "Remove myself", + "removeAttendeeTitle": "Remove attendee from '{{eventData.name}}'", + "confirmRemoveAttendee": "Are you sure you want to remove this attendee from the event? This action cannot be undone.", + "removeAttendee": "Remove attendee", "discussion": "Discussion", "send": "Send", "reply": "Reply", "del": "Delete", - "editpwd": "Enter editing password", - "editpwddesc": "Enter the editing password you received by email or were shown when the event was created.", - "eventdelconfirm": "Are you sure you want to delete this event? This action cannot be undone.", - "eventdel": "Delete event", + "editPassword": "Enter editing password", + "editPasswordDesc": "Enter the editing password you received by email or were shown when the event was created.", + "confirmDelEvent": "Are you sure you want to delete this event? This action cannot be undone.", + "delEvent": "Delete event", "copied": "Copied!", - "incorrectpwd": "That editing password is incorrect. Try again.", - "numlimit": "Please enter a number between 1 and ${response.data.freeSpots}", - "editgroup": "Edit group", - "groupwelcome": "Welcome to your event group! We've just sent you an email with your secret editing link, which you can also see in the address bar above. Haven't got the email? Check your spam or junk folder. To share your event group, use the link you can see just below this message - that way your attendees won't be able to edit or delete your event group!", - "urlpaste": "Paste this URL into your calendar app\nto subscribe to a live feed of events from this group.", + "incorrectPassword": "That editing password is incorrect. Try again.", + "numValidation": "Please enter a number between 1 and ${response.data.freeSpots}", + "editGroup": "Edit group", + "groupWelcome": "Welcome to your event group! We've just sent you an email with your secret editing link, which you can also see in the address bar above. Haven't got the email? Check your spam or junk folder. To share your event group, use the link you can see just below this message - that way your attendees won't be able to edit or delete your event group!", + "urlPaste": "Paste this URL into your calendar app to subscribe to a live feed of events from this group.", "subscribe": "Subscribe to updates", - "groupaddevent": "To add an event to this group, copy and paste the two codes below into the \"Event Group\" box when creating a new event or editing an existing event.", - "eventgroupid": "Event group ID", - "eventgroupeditpwd": "Event group editing password", - "eventupcome": "Upcoming events", - "noevents": "No events!", - "groupdelconfirm": "Are you sure you want to delete this event group? This action cannot be undone.", - "groupdeldesc": "This will not delete the individual events contained in this group. They can be linked to another group later.", - "groupdel": "Delete event group", - "groupsub": "Subscribe to '{{eventGroupData.name}}'", - "receivegroup": "Enter your email address to receive updates\nwhenever a new event is created in this group.", + "groupAddEvent": "To add an event to this group, copy and paste the two codes below into the \"Event Group\" box when creating a new event or editing an existing event.", + "eventGroupId": "Event group ID", + "eventGroupEditPassword": "Event group editing password", + "upcomingEvents": "Upcoming events", + "noEvents": "No events!", + "groupDelConfirm": "Are you sure you want to delete this event group? This action cannot be undone.", + "groupDelDesc": "This will not delete the individual events contained in this group. They can be linked to another group later.", + "groupDel": "Delete event group", + "groupSub": "Subscribe to '{{eventGroupData.name}}'", + "receiveGroupUpdates": "Enter your email address to receive updates whenever a new event is created in this group.", "sub": "Subscribe", - "intro": "A quick and easy way to make and share events which respects your privacy.", - "desc": "You don't need to sign up for an account. When you create an event, we generate a password which allows you to edit the event. Send all your guests the public link, and all your co-hosts the secret editing link containing the password. A week after the event finishes, it's deleted from our servers for ever, and your email goes with it.", - "privacy": "Also, we don't show you ads, don't sell your data, and never send you unnecessary emails.", - "attention": "But remember: all our events are visible to anyone who knows the link, so probably don't use gathio to plot your surprise birthday party or revolution. Or whatever, you do you.", - "kofi": "If you find yourself using and enjoying gathio, consider buying me a coffee. It'll help keep the site running!", - "support": "Support Me on Ko-fi", - "accountdesc": "Register or log in to your account to be able to show this event on your profile, edit it, and delete it. Associating an event with an account is optional, but keep in mind that an unassociated event can not be modified in any way and will be automatically deleted 30 days after it concludes.", - "paccount": "You must register or log in to your account to create a private event.", - "oaccount": "You must register or log in to an organisation account to create an organisation event.", - "emailaddr": "Email address", - "password": "Password", - "register": "Register", - "login": "Log in", - "forgotpwd": "Forgot password", - "neweventpage": "New event", - "newevent": "Events are visible to anyone who knows the link.", - "createnew": "Create a new event", - "importnew": "Import an existing event", - "newgroup": "Create a new event group", + "homeIntro": "A quick and easy way to make and share events which respects your privacy.", + "homeDescription": "You don't need to sign up for an account. When you create an event, we generate a password which allows you to edit the event. Send all your guests the public link, and all your co-hosts the secret editing link containing the password. A week after the event finishes, it's deleted from our servers for ever, and your email goes with it.", + "homePrivacy": "Also, we don't show you ads, don't sell your data, and never send you unnecessary emails.", + "homeVisibility": "But remember: all our events are visible to anyone who knows the link, so probably don't use gathio to plot your surprise birthday party or revolution. Or whatever, you do you.", + "homeSupport": "If you find yourself using and enjoying gathio, consider buying me a coffee. It'll help keep the site running!", + "homeKofi": "Support Me on Ko-fi", + "newEvent": "New event", + "newEventDesc": "Events are visible to anyone who knows the link.", + "createEvent": "Create a new event", + "importEvent": "Import an existing event", + "createGroup": "Create a new event group", "options": "Options", - "selfmark": "Users can mark themselves as attending this event", - "displaymod": "{{#if isPrivate}}Privately display{{else}}Publicly display{{/if}} the list of attendees", - "commentmod": "Users can post comments on this event", + "usersCanAttend": "Users can mark themselves as attending this event", + "usersCanComment": "Users can post comments on this event", "listdisplay": "Display the list of attendees", "edit": "Edit", - "name": "Name", + "groupName": "Group name", "description": "Description", "link": "Link", "host": "Host or organisation name", - "coverimg": "Cover image", - "recommendeddimensions": "Recommended dimensions (w x h): 920px by 300px.", - "delgroup": "Delete this event group", - "delegroup": "Delete event group", + "coverImage": "Cover image", + "recommendedDimensions": "Recommended dimensions (w x h): 920px by 300px.", + "delGroup": "Delete event group", "save": "Save changes", - "eventname": "Event name", + "eventName": "Event name", "location": "Location", "starts": "Starts", "ends": "Ends", "timezone": "Timezone", - "mdsupport": "Markdown formatting\nsupported.", - "hostname": "Host name", - "choosefile": "Choose file", - "imgdel": "Delete image", - "grouppart": "This event is part of an event group", - "linktogroup": "Link this event to an event group", - "shortstringdesc": "You can find this short string of characters in the\nevent group's link, in your confirmation email, or on the event group's\npage.", - "groupsecretcode": "Event group secret\nediting code", - "longstringdesc": "You can find this long string of characters in the\nconfirmation email you received when you created the event group.", - "limitset": "Set a limit on the maximum number of attendees", - "attendeelimit": "Attendee limit", - "delevent": "Delete this event", - "importevent": "Import an existing event", - "importdesc": "Upload an .ics file here to instantly create an event. You can save a Facebook event as an .ics file by clicking on the context menu next to the \"Import\" and \"Edit\" buttons on the event page and choosing the \"Export Event\" option. Then select the \"Save to calendar\" option and save the file on your computer.", - "selectfile": "Select file", - "youremail": "Your email", - "emaildesc": "We will send your secret editing link to this email address.", + "markdownSupported": "Markdown formatting supported.", + "hostName": "Host name", + "chooseFile": "Choose file", + "delImage": "Delete image", + "partOfEventGroup": "This event is part of an event group", + "linkToEventGroup": "Link this event to an event group", + "shortStringDesc": "You can find this short string of characters in the event group's link, in your confirmation email, or on the event group's page.", + "groupSecretCode": "Event group secret editing code", + "longStringDesc": "You can find this long string of characters in the confirmation email you received when you created the event group.", + "setAttendeeLimit": "Set a limit on the maximum number of attendees", + "attendeeLimit": "Attendee limit", + "importDesc": "Upload an .ics file here to instantly create an event. You can save a Facebook event as an .ics file by clicking on the context menu next to the \"Import\" and \"Edit\" buttons on the event page and choosing the \"Export Event\" option. Then select the \"Save to calendar\" option and save the file on your computer.", + "selectFile": "Select file", "import": "Import", - "createevent": "Create an event", - "mdsupportA": "Markdown formatting supported.", - "eventpwd": "Event password", - "emaildescA": "If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event.", - "shortstringdescA": "You can find this short string of characters in the event group's link, in your confirmation email, or on the event group's page.", - "groupeditpwd": "Event group secret editing code", - "longstringdescA": "You can find this long string of characters in the confirmation email you received when you created the event group.", - "changefile": "Change file", - "groupcreate": "Create an event group", - "groupdesc": "An event group is a holding area for a set of linked events, like a series of film nights, a festival, or a band tour. You can share a public link to your event group just like an individual event link, and people who know the secret editing code (sent in an email when you create the event group) will be able to add future events to the group.", - "groupattention": "Event groups do not get automatically removed like events do, but events which have been removed from {{siteName}} will of course not show up in an event group.", - "groupname": "Event group name", - "private": "Private", - "public": "Public", - "org": "Organization", - "nicerevent": "Nicer events", + "emailDesc": "If you provide your email, we will send your secret editing password here, and use it to notify you of updates to the event.", + "emailDescGroup": "If you provide your email, we will send your secret editing password here.", + "changeFile": "Change file", + "groupDesc": "An event group is a holding area for a set of linked events, like a series of film nights, a festival, or a band tour. You can share a public link to your event group just like an individual event link, and people who know the secret editing code (sent in an email when you create the event group) will be able to add future events to the group.", + "groupRemovalNotice": "Event groups do not get automatically removed like events do, but events which have been removed from {{siteName}} will of course not show up in an event group.", + "nicerEvents": "Nicer events", "create": "Create", - "or": "Or an alias, perhaps...", - "eventask": "What would you like to ask?", - "eventreply": "What would you like to reply?", + "orAlias": "Or an alias, perhaps...", + "commentPlaceholder": "What would you like to ask?", + "replyPlaceholder": "What would you like to reply?", "right": "Get it right!", - "notspamlogin": "We will never spam you or share your email.", - "notforget": "Don't forget it!", "snappy": "Make it snappy.", - "moreinfo": "For tickets or a page with more information (optional).", - "isshowgroup": "Will be shown on the event group page (optional).", + "linkDescGroup": "For tickets or a page with more information (optional).", + "willBeShownGroup": "Will be shown on the event group page (optional).", "specific": "Be specific.", - "anotherpage": "For tickets or another event page (optional).", - "isshowpage": "Will be shown on the event page (optional).", - "enternum": "Enter a number.", + "linkDesc": "For tickets or another event page (optional).", + "willBeShownEvent": "Will be shown on the event page (optional).", + "enterNumber": "Enter a number.", "click": "Click me!", - "editlater": "You can always edit it later.", - "notspamA": "We won't spam you <3 (optional)" + "editLater": "You can always edit it later." } \ No newline at end of file diff --git a/views/404.handlebars b/views/404.handlebars index 128dcdd..3359b8c 100755 --- a/views/404.handlebars +++ b/views/404.handlebars @@ -1,5 +1,5 @@

    404

    -

    {{{__ "notfound"}}}

    +

    {{{__ "notFound"}}}

    -

    {{{__ "404desc"}}}

    +

    {{{__ "404Desc"}}}

    diff --git a/views/event.handlebars b/views/event.handlebars index c787c68..fc750ae 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -10,9 +10,9 @@
    {{#if editingEnabled}} - + {{else}} - + {{/if}}
    @@ -44,7 +44,7 @@ - {{{__ "hostedby"}}} + {{{__ "hostedBy"}}} {{/if}} {{#if eventData.eventGroup}} @@ -52,7 +52,7 @@ - {{{__ "partof"}}} + {{{__ "partOf"}}} {{/if}} {{#if eventData.url}} @@ -91,16 +91,16 @@ @@ -109,7 +109,7 @@ {{#if eventHasConcluded}} {{/if}} {{#if firstLoad}} @@ -117,9 +117,9 @@ -

    {{{__ "eventwelcome"}}}

    -

    {{{__ "eventattention"}}}

    -

    {{{__ "eventshare"}}}

    +

    {{{__ "eventWelcome"}}}

    +

    {{{__ "eventPasswordAlert"}}}

    +

    {{{__ "eventShare"}}}

    {{/if}}
    @@ -134,15 +134,15 @@
    {{{__ "attendees"}}} {{#if eventAttendees}}({{numberOfAttendees}}){{/if}}
    {{#unless noMoreSpots}} - + {{/unless}} - +
    {{#if eventData.maxAttendees}} {{#if noMoreSpots}} -
    {{{__ "eventcapacity"}}}
    +
    {{{__ "eventAtCapacity"}}}
    {{else}}
    {{spotsRemaining}} {{plural spotsRemaining "spot(s)"}} {{{__ "remaining"}}}
    {{/if}} @@ -150,11 +150,11 @@ {{#if eventAttendees}}
      {{#each eventAttendees}} - {{this.name}}{{#if ../editingEnabled}} {{/if}} + {{this.name}}{{#if ../editingEnabled}} {{/if}} {{/each}}
    {{else}} -

    {{{__ "noattendees"}}}

    +

    {{{__ "noAttendees"}}}

    {{/if}}
    @@ -163,7 +163,7 @@
    - + @@ -171,34 +171,34 @@
    - +
    - +
    - +
    - -

    {{{__ "joinemaildesc"}}}

    + +

    {{{__ "joinEmailDesc"}}}

    - +
    - -

    {{{__ "delpwddesc"}}}

    + +

    {{{__ "delPasswordDesc"}}}

    - +
    @@ -209,7 +209,7 @@
    - + @@ -217,15 +217,15 @@
    - -

    {{{__ "lostpwd"}}}

    + +

    {{{__ "lostPassword"}}}

    - +
    @@ -237,18 +237,18 @@
    - +
    -

    {{{__ "confirmrmA"}}}

    +

    {{{__ "confirmRemoveAttendee"}}}

    - +
    @@ -264,11 +264,11 @@
    - +
    - +
    @@ -315,11 +315,11 @@
    - +
    - +
    @@ -340,7 +340,7 @@
    - + @@ -348,7 +348,7 @@
    -

    {{{__ "editpwddesc"}}}

    +

    {{{__ "editPasswordDesc"}}}

    @@ -359,7 +359,7 @@
    - +
    @@ -382,11 +382,11 @@
    -

    {{{__ "eventdelconfirm"}}}

    +

    {{{__ "confirmDelEvent"}}}

    - +
    @@ -514,8 +514,8 @@ input_field: "#image-upload", preview_box: "#image-preview", label_field: "#image-label", - label_default: "{{{__ "choosefile"}}}", - label_selected: "{{{__ "changefile"}}}", + label_default: "{{{__ "chooseFile"}}}", + label_selected: "{{{__ "changeFile"}}}", no_label: false }); $("#image-preview").css("background-image", "url('/events/{{eventData.image}}')"); @@ -590,7 +590,7 @@ if (response.data.freeSpots !== undefined) { modal.find('#attendeeNumber') .attr('data-validation-allowing', `range[1;${response.data.freeSpots}]`) - .attr('data-validation-error-msg', `{{{__ "numlimit"}}}`); + .attr('data-validation-error-msg', `{{{__ "numValidation"}}}`); } modal.modal(); }) @@ -615,7 +615,7 @@ } }, error: function(response, status, xhr) { - form.find('.alert').text('{{{__ "incorrectpwd"}}}').show(); + form.find('.alert').text('{{{__ "incorrectPassword"}}}').show(); } }); }); diff --git a/views/eventgroup.handlebars b/views/eventgroup.handlebars index dcdba9d..c151b21 100755 --- a/views/eventgroup.handlebars +++ b/views/eventgroup.handlebars @@ -9,9 +9,9 @@
    {{#if editingEnabled}} - + {{else}} - + {{/if}}
    @@ -20,7 +20,7 @@ - {{{__ "groupwelcome"}}} + {{{__ "groupWelcome"}}}
    {{/if}}
    @@ -34,7 +34,7 @@ - {{{__ "hostedby"}}} + {{{__ "hostedBy"}}} {{/if}} {{#if eventGroupData.url}} @@ -67,7 +67,7 @@ data-clipboard-text="https://{{domain}}/group/{{eventGroupData.id}}/feed.ics"> {{{__ "copy"}}} -

    {{{__ "urlpaste"}}}

    +

    {{{__ "urlPaste"}}}

    @@ -82,7 +82,7 @@
    @@ -91,15 +91,15 @@ {{#if editingEnabled}}
    -

    {{{__ "groupaddevent"}}}

    +

    {{{__ "groupAddEvent"}}}

    - + - +
    {{{__ "eventgroupid"}}}{{{__ "eventGroupId"}}} {{eventGroupData.id}}
    {{{__ "eventgroupeditpwd"}}}{{{__ "eventGroupEditPassword"}}} {{eventGroupData.editToken}}
    @@ -115,7 +115,7 @@
    -
    {{{__ "eventupcome"}}}
    +
    {{{__ "upcomingEvents"}}}
    {{#if upcomingEventsExist}} {{#each events}} @@ -128,7 +128,7 @@ {{/unless}} {{/each}} {{else}} -
    {{{__ "noevents"}}}
    +
    {{{__ "noEvents"}}}
    {{/if}}
    @@ -147,12 +147,12 @@
    -

    {{{__ "groupdelconfirm"}}}

    -

    {{{__ "groupdeldesc"}}}

    +

    {{{__ "groupDelConfirm"}}}

    +

    {{{__ "groupDelDesc"}}}

    - +
    @@ -166,7 +166,7 @@
    - + @@ -174,7 +174,7 @@
    -

    {{{__ "receivegroup"}}}

    +

    {{{__ "receiveGroupUpdates"}}}

    - + @@ -202,7 +202,7 @@
    -

    {{{__ "editpwddesc"}}}

    +

    {{{__ "editPasswordDesc"}}}

    @@ -213,7 +213,7 @@
    - +
    @@ -275,8 +275,8 @@ input_field: "#eventGroupImageUpload", preview_box: "#eventGroupImagePreview", label_field: "#eventGroupImageLabel", - label_default: "{{{__ "choosefile"}}}", - label_selected: "{{{__ "changefile"}}}", + label_default: "{{{__ "chooseFile"}}}", + label_selected: "{{{__ "changeFile"}}}", no_label: false }); $("#eventGroupImagePreview").css("background-image", "url('/events/{{eventGroupData.image}}')"); @@ -315,7 +315,7 @@ } }, error: function(response, status, xhr) { - form.find('.alert').text('{{{__ "incorrectpwd"}}}').show(); + form.find('.alert').text('{{{__ "incorrectPassword"}}}').show(); } }); }); diff --git a/views/home.handlebars b/views/home.handlebars index 5a459b6..1179fec 100755 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -1,22 +1,22 @@ -

    {{{__ "intro"}}}

    +

    {{{__ "homeIntro"}}}

    -

    {{{__ "desc"}}}

    +

    {{{__ "homeDescription"}}}

    -

    {{{__ "privacy"}}}

    +

    {{{__ "homePrivacy"}}}

    -

    {{{__ "attention"}}}

    +

    {{{__ "homeVisibility"}}}

    {{#if showKofi}}
    -

    {{{__ "kofi"}}}

    - +

    {{{__ "homeSupport"}}}

    +
    {{/if}} diff --git a/views/login.handlebars b/views/login.handlebars deleted file mode 100755 index 80b887c..0000000 --- a/views/login.handlebars +++ /dev/null @@ -1,32 +0,0 @@ -

    {{{__ "login"}}}

    -
    -
    - {{#if isPublic}} -

    {{{__ "accountdesc"}}}

    - {{else if isPrivate}} -

    {{{__ "paccount"}}}

    - {{else if isOrganisation}} -

    {{{__ "oaccount"}}}

    - {{/if}} -
    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    - - -

    - {{{__ "register"}}} | {{{__ "forgotpwd"}}} -

    diff --git a/views/newevent.handlebars b/views/newevent.handlebars index 92660d4..7660d00 100755 --- a/views/newevent.handlebars +++ b/views/newevent.handlebars @@ -1,7 +1,7 @@ -

    {{{__ "neweventpage"}}}

    +

    {{{__ "newEvent"}}}

    @@ -12,13 +12,13 @@
    - +
    - +
    - +
    diff --git a/views/optionsform.handlebars b/views/optionsform.handlebars deleted file mode 100755 index dfadfb1..0000000 --- a/views/optionsform.handlebars +++ /dev/null @@ -1,47 +0,0 @@ -
    -
    {{{__ "options"}}}
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    - -
    -
    {{{__ "options"}}}
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    diff --git a/views/partials/editeventgroupmodal.handlebars b/views/partials/editeventgroupmodal.handlebars index 32da18c..586b23e 100644 --- a/views/partials/editeventgroupmodal.handlebars +++ b/views/partials/editeventgroupmodal.handlebars @@ -10,13 +10,13 @@
    - +
    - {{{__ "mdsupportA"}}} + {{{__ "markdownSupported"}}}
    @@ -27,16 +27,16 @@
    - +
    - {{{__ "recommendeddimensions"}}} + {{{__ "recommendedDimensions"}}}
    -
    {{{__ "delgroup"}}}
    +
    {{{__ "delGroup"}}}
    diff --git a/views/partials/editeventmodal.handlebars b/views/partials/editeventmodal.handlebars index 8fb4657..43b0ae5 100644 --- a/views/partials/editeventmodal.handlebars +++ b/views/partials/editeventmodal.handlebars @@ -11,7 +11,7 @@
    - + @@ -40,29 +40,29 @@ - {{{__ "mdsupport"}}} + {{{__ "markdownSupported"}}}
    - +
    - +
    - +
    - {{{__ "recommendeddimensions"}}} + {{{__ "recommendedDimensions"}}} {{#if eventData.image}} - + {{/if}}
    @@ -71,28 +71,28 @@
    - {{{__ "linktogroup"}}} + {{{__ "linkToEventGroup"}}}
    - +
    - {{{__ "shortstringdesc"}}} + {{{__ "shortStringDesc"}}}
    - +
    - {{{__ "longstringdesc"}}} + {{{__ "longStringDesc"}}}
    @@ -101,7 +101,7 @@
    @@ -109,7 +109,7 @@ type="checkbox" id="joinCheckbox" name="joinCheckbox" {{#if eventData.usersCanAttend}}checked{{/if}}>
    - +
    -
    {{{__ "delevent"}}}
    +
    {{{__ "delEvent"}}}
    diff --git a/views/partials/importeventform.handlebars b/views/partials/importeventform.handlebars index b730863..26b347d 100644 --- a/views/partials/importeventform.handlebars +++ b/views/partials/importeventform.handlebars @@ -1,6 +1,6 @@ -

    {{{__ "importevent"}}}

    +

    {{{__ "importEvent"}}}

    - {{{__ "importdesc"}}} + {{{__ "importDesc"}}}

    Image showing the location of the export option on Facebook @@ -10,15 +10,15 @@
    - +
    - - {{{__ "emaildesc"}}} + + {{{__ "emailDesc"}}}
    diff --git a/views/partials/neweventform.handlebars b/views/partials/neweventform.handlebars index eee8939..c1a2ddc 100755 --- a/views/partials/neweventform.handlebars +++ b/views/partials/neweventform.handlebars @@ -1,8 +1,8 @@ -

    {{{__ "createevent"}}}

    +

    {{{__ "createEvent"}}}

    - +
    @@ -34,76 +34,65 @@
    - - {{{__ "mdsupportA"}}} + + {{{__ "markdownSupported"}}}
    - +
    - +
    - {{{__ "recommendeddimensions"}}} + {{{__ "recommendedDimensions"}}}
    - {{#unless isPublic}}
    - +
    - -
    -
    -
    -
    -
    - {{/unless}} -
    - -
    - +
    - +
    - - {{{__ "emaildescA"}}} + + {{{__ "emailDesc"}}}
    -
    {{{__ options}}}
    +
    {{{__ "options"}}}
    - {{{__ "linktogroup"}}} + {{{__ "linkToEventGroup"}}}
    - +
    - {{{__ "shortstringdescA"}}} + {{{__ "shortStringDesc"}}}
    - +
    - {{{__ "longstringdescA"}}} + {{{__ "longStringDesc"}}}
    @@ -111,27 +100,27 @@
    - +
    - +
    @@ -149,8 +138,8 @@ input_field: "#eventImageUpload", preview_box: "#eventImagePreview", label_field: "#eventImageLabel", - label_default: "{{{__ "choosefile"}}}", - label_selected: "{{{__ "changefile"}}}", + label_default: "{{{__ "chooseFile"}}}", + label_selected: "{{{__ "changeFile"}}}", no_label: false }); autosize($('textarea')); diff --git a/views/partials/neweventgroupform.handlebars b/views/partials/neweventgroupform.handlebars index 3c2e0b2..c52c6b8 100755 --- a/views/partials/neweventgroupform.handlebars +++ b/views/partials/neweventgroupform.handlebars @@ -1,9 +1,9 @@ -

    {{{__ "groupcreate"}}}

    -

    {{{__ "groupdesc"}}}

    -

    {{{__ "groupattention"}}}

    +

    {{{__ "createGroup"}}}

    +

    {{{__ "groupDesc"}}}

    +

    {{{__ "groupRemovalNotice"}}}

    - +
    @@ -11,37 +11,37 @@
    - - {{{__ "mdsupportA"}}} + + {{{__ "markdownSupported"}}}
    - +
    - +
    - +
    - {{{__ "recommendeddimensions"}}} + {{{__ "recommendedDimensions"}}}
    - +
    - +
    - - {{{__ "emaildescA"}}} + + {{{__ "emailDescGroup"}}}
    @@ -57,8 +57,8 @@ input_field: "#eventGroupImageUpload", preview_box: "#eventGroupImagePreview", label_field: "#eventGroupImageLabel", - label_default: "{{{__ "choosefile"}}}", - label_selected: "{{{__ "changefile"}}}", + label_default: "{{{__ "chooseFile"}}}", + label_selected: "{{{__ "changeFile"}}}", no_label: false }); autosize($('textarea')); diff --git a/views/partials/sidebar-dropdown.handlebars b/views/partials/sidebar-dropdown.handlebars deleted file mode 100755 index e63da7d..0000000 --- a/views/partials/sidebar-dropdown.handlebars +++ /dev/null @@ -1,11 +0,0 @@ -
    - - -
    - {{{__ "private"}}} - {{{__ "public"}}} - {{{__ "org"}}} -
    -
    \ No newline at end of file diff --git a/views/partials/sidebar.handlebars b/views/partials/sidebar.handlebars index 6567b68..ead7961 100755 --- a/views/partials/sidebar.handlebars +++ b/views/partials/sidebar.handlebars @@ -1,7 +1,7 @@
    -

    HashiAct

    +

    gathio

    -

    {{{__ "nicerevent"}}}

    +

    {{{__ "nicerEvents"}}}

    - {{{__ "neweventpage"}}} + {{{__ "newEvent"}}}
    diff --git a/views/register.handlebars b/views/register.handlebars deleted file mode 100755 index 3c883d8..0000000 --- a/views/register.handlebars +++ /dev/null @@ -1,15 +0,0 @@ -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    \ No newline at end of file From eb588b45f03cf3ab7c015e256bf3f96bb069742a Mon Sep 17 00:00:00 2001 From: Raphael Kabo Date: Fri, 17 Mar 2023 18:18:29 +0000 Subject: [PATCH 8/8] feat: instantiate i18n as instance --- app.js | 16 ++-- package-lock.json | 233 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 242 insertions(+), 7 deletions(-) diff --git a/app.js b/app.js index ef74fd0..137f16a 100755 --- a/app.js +++ b/app.js @@ -5,7 +5,8 @@ const cors = require('cors'); const routes = require('./routes'); const hbs = require('express-handlebars'); const bodyParser = require('body-parser'); -const i18n = require('i18n'); +// const i18n = require('i18n'); +const { I18n } = require('i18n'); const app = express(); // Configuration // @@ -15,14 +16,17 @@ const app = express(); app.use(session({ secret: 'Py0Bf3aWZC8kYkYTpRztmYMyS22pFFGi' })); -i18n.configure({ + +// Internationalization // +const i18n = new I18n({ locales:['en-US'], //include langs - directory: __dirname + '/locales', //the path to the json file - defaultLocale: 'en-US' //default lang + directory: path.join(__dirname, 'locales'), + defaultLocale: 'en-US' }); app.use(i18n.init); + // View engine // -hbsInstance = hbs.create({ +const hbsInstance = hbs.create({ defaultLayout: 'main', partialsDir: ['views/partials/'], layoutsDir: 'views/layouts/', @@ -77,7 +81,7 @@ function setLocale(req, res, next){ locale = req.acceptsLanguages(); } // When there is no language preference, the language used on the website is English - else{ + else { locale = 'en-US'; } // If the language preference saved in the cookie is different from the language preference used here, update the language preference setting in the cookie diff --git a/package-lock.json b/package-lock.json index b0a30bb..7145052 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,9 +22,9 @@ "generate-rsa-keypair": "^0.2.1", "greenlock": "^2.8.8", "greenlock-express": "^2.7.18", + "i18n": "^0.15.1", "ical": "^0.6.0", "ical-generator": "^1.11.0", - "i18n": "^0.15.1", "jimp": "^0.16.1", "jsonwebtoken": "^9.0.0", "marked": "^4.0.10", @@ -581,6 +581,45 @@ "regenerator-runtime": "^0.13.3" } }, + "node_modules/@messageformat/core": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@messageformat/core/-/core-3.1.0.tgz", + "integrity": "sha512-UxAnjecnRG4u2iaggwIyylYPHmk5BTErJcKmWyAKTXqYgSW1bFLp4D7fIzuh6bk17Qfcmf3qtufdrstCB23nBA==", + "dependencies": { + "@messageformat/date-skeleton": "^1.0.0", + "@messageformat/number-skeleton": "^1.0.0", + "@messageformat/parser": "^5.0.0", + "@messageformat/runtime": "^3.0.1", + "make-plural": "^7.0.0", + "safe-identifier": "^0.4.1" + } + }, + "node_modules/@messageformat/date-skeleton": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@messageformat/date-skeleton/-/date-skeleton-1.0.1.tgz", + "integrity": "sha512-jPXy8fg+WMPIgmGjxSlnGJn68h/2InfT0TNSkVx0IGXgp4ynnvYkbZ51dGWmGySEK+pBiYUttbQdu5XEqX5CRg==" + }, + "node_modules/@messageformat/number-skeleton": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@messageformat/number-skeleton/-/number-skeleton-1.1.0.tgz", + "integrity": "sha512-F0Io+GOSvFFxvp9Ze3L5kAoZ2NnOAT0Mr/jpGNd3fqo8A0t4NxNIAcCdggtl2B/gN2ErkIKSBVPrF7xcW1IGvA==" + }, + "node_modules/@messageformat/parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.0.0.tgz", + "integrity": "sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==", + "dependencies": { + "moo": "^0.5.1" + } + }, + "node_modules/@messageformat/runtime": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@messageformat/runtime/-/runtime-3.0.1.tgz", + "integrity": "sha512-6RU5ol2lDtO8bD9Yxe6CZkl0DArdv0qkuoZC+ZwowU+cdRlVE1157wjCmlA5Rsf1Xc/brACnsZa5PZpEDfTFFg==", + "dependencies": { + "make-plural": "^7.0.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -975,6 +1014,11 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/boolean": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", + "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1921,6 +1965,17 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "node_modules/fast-printf": { + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.9.tgz", + "integrity": "sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==", + "dependencies": { + "boolean": "^3.1.4" + }, + "engines": { + "node": ">=10.0" + } + }, "node_modules/fastq": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", @@ -2365,6 +2420,46 @@ "npm": ">=1.3.7" } }, + "node_modules/i18n": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/i18n/-/i18n-0.15.1.tgz", + "integrity": "sha512-yue187t8MqUPMHdKjiZGrX+L+xcUsDClGO0Cz4loaKUOK9WrGw5pgan4bv130utOwX7fHE9w2iUeHFalVQWkXA==", + "dependencies": { + "@messageformat/core": "^3.0.0", + "debug": "^4.3.3", + "fast-printf": "^1.6.9", + "make-plural": "^7.0.0", + "math-interval-parser": "^2.0.1", + "mustache": "^4.2.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/mashpie" + } + }, + "node_modules/i18n/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/i18n/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/ical": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/ical/-/ical-0.6.0.tgz", @@ -2844,6 +2939,11 @@ "node": "*" } }, + "node_modules/make-plural": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-7.2.0.tgz", + "integrity": "sha512-WkdI+iaWaBCFM2wUXwos8Z7spg5Dt64Xe/VI6NpRaly21cDtD76N6S97K//UtzV0dHOiXX+E90TnszdXHG0aMg==" + }, "node_modules/marked": { "version": "4.2.12", "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz", @@ -2855,6 +2955,14 @@ "node": ">= 12" } }, + "node_modules/math-interval-parser": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-2.0.1.tgz", + "integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -3060,6 +3168,11 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "node_modules/moo": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==" + }, "node_modules/mpath": { "version": "0.8.4", "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.4.tgz", @@ -3118,6 +3231,14 @@ "node": ">= 6.0.0" } }, + "node_modules/mustache": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", + "bin": { + "mustache": "bin/mustache" + } + }, "node_modules/nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", @@ -3916,6 +4037,11 @@ } ] }, + "node_modules/safe-identifier": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz", + "integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==" + }, "node_modules/safe-replace": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-replace/-/safe-replace-1.1.0.tgz", @@ -4932,6 +5058,45 @@ "regenerator-runtime": "^0.13.3" } }, + "@messageformat/core": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@messageformat/core/-/core-3.1.0.tgz", + "integrity": "sha512-UxAnjecnRG4u2iaggwIyylYPHmk5BTErJcKmWyAKTXqYgSW1bFLp4D7fIzuh6bk17Qfcmf3qtufdrstCB23nBA==", + "requires": { + "@messageformat/date-skeleton": "^1.0.0", + "@messageformat/number-skeleton": "^1.0.0", + "@messageformat/parser": "^5.0.0", + "@messageformat/runtime": "^3.0.1", + "make-plural": "^7.0.0", + "safe-identifier": "^0.4.1" + } + }, + "@messageformat/date-skeleton": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@messageformat/date-skeleton/-/date-skeleton-1.0.1.tgz", + "integrity": "sha512-jPXy8fg+WMPIgmGjxSlnGJn68h/2InfT0TNSkVx0IGXgp4ynnvYkbZ51dGWmGySEK+pBiYUttbQdu5XEqX5CRg==" + }, + "@messageformat/number-skeleton": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@messageformat/number-skeleton/-/number-skeleton-1.1.0.tgz", + "integrity": "sha512-F0Io+GOSvFFxvp9Ze3L5kAoZ2NnOAT0Mr/jpGNd3fqo8A0t4NxNIAcCdggtl2B/gN2ErkIKSBVPrF7xcW1IGvA==" + }, + "@messageformat/parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.0.0.tgz", + "integrity": "sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==", + "requires": { + "moo": "^0.5.1" + } + }, + "@messageformat/runtime": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@messageformat/runtime/-/runtime-3.0.1.tgz", + "integrity": "sha512-6RU5ol2lDtO8bD9Yxe6CZkl0DArdv0qkuoZC+ZwowU+cdRlVE1157wjCmlA5Rsf1Xc/brACnsZa5PZpEDfTFFg==", + "requires": { + "make-plural": "^7.0.0" + } + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -5253,6 +5418,11 @@ "unpipe": "1.0.0" } }, + "boolean": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", + "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==" + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -5957,6 +6127,14 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "fast-printf": { + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.9.tgz", + "integrity": "sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==", + "requires": { + "boolean": "^3.1.4" + } + }, "fastq": { "version": "1.15.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", @@ -6291,6 +6469,34 @@ "sshpk": "^1.7.0" } }, + "i18n": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/i18n/-/i18n-0.15.1.tgz", + "integrity": "sha512-yue187t8MqUPMHdKjiZGrX+L+xcUsDClGO0Cz4loaKUOK9WrGw5pgan4bv130utOwX7fHE9w2iUeHFalVQWkXA==", + "requires": { + "@messageformat/core": "^3.0.0", + "debug": "^4.3.3", + "fast-printf": "^1.6.9", + "make-plural": "^7.0.0", + "math-interval-parser": "^2.0.1", + "mustache": "^4.2.0" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "ical": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/ical/-/ical-0.6.0.tgz", @@ -6674,11 +6880,21 @@ "integrity": "sha512-gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw==", "optional": true }, + "make-plural": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/make-plural/-/make-plural-7.2.0.tgz", + "integrity": "sha512-WkdI+iaWaBCFM2wUXwos8Z7spg5Dt64Xe/VI6NpRaly21cDtD76N6S97K//UtzV0dHOiXX+E90TnszdXHG0aMg==" + }, "marked": { "version": "4.2.12", "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz", "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==" }, + "math-interval-parser": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/math-interval-parser/-/math-interval-parser-2.0.1.tgz", + "integrity": "sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==" + }, "media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -6818,6 +7034,11 @@ "integrity": "sha512-Yo/7qQU4/EyIS8YDFSeenIvXxZN+ld7YdV9LqFVQJzTLye8unujAWPZ4NWKfFA+RNjh+wvTWKY9Z3E5XM6ZZiQ==", "requires": {} }, + "moo": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==" + }, "mpath": { "version": "0.8.4", "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.8.4.tgz", @@ -6869,6 +7090,11 @@ "xtend": "^4.0.0" } }, + "mustache": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==" + }, "nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", @@ -7445,6 +7671,11 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, + "safe-identifier": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/safe-identifier/-/safe-identifier-0.4.2.tgz", + "integrity": "sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==" + }, "safe-replace": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-replace/-/safe-replace-1.1.0.tgz",