diff --git a/app/views/404.server.view.html b/app/views/404.server.view.html deleted file mode 100755 index 40407617..00000000 --- a/app/views/404.server.view.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'layout.server.view.html' %} - -{% block content %} -

Page Not Found

-
-	{{url}} is not a valid path.
-
-{% endblock %} diff --git a/app/views/404.server.view.pug b/app/views/404.server.view.pug index 0804db65..a9370948 100644 --- a/app/views/404.server.view.pug +++ b/app/views/404.server.view.pug @@ -3,8 +3,6 @@ extends layout.server.view.pug block content section.public-form.auth.sigin-view.valign-wrapper div.row.valign - h3.col-md-12.text-center=__('404_Header') + h3.col-md-12.text-center=__('404_HEADER') div.col-md-4.col-md-offset-4 - div.col-md-12.text-center(style="padding-bottom: 50px;") - | #{url} is not a valid path. - + div.col-md-12.text-center(style="padding-bottom: 50px;")=__('404_BODY', url) \ No newline at end of file diff --git a/app/views/500.server.view.html b/app/views/500.server.view.html deleted file mode 100755 index cc3b1478..00000000 --- a/app/views/500.server.view.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends 'layout.server.view.html' %} - -{% block content %} -

Server Error

-
-	{{error}}
-
-{% endblock %} diff --git a/app/views/500.server.view.pug b/app/views/500.server.view.pug index 84d80035..73e42e9a 100644 --- a/app/views/500.server.view.pug +++ b/app/views/500.server.view.pug @@ -3,7 +3,6 @@ extends layout.server.view.pug block content section.public-form.auth.sigin-view.valign-wrapper div.row.valign - h3.col-md-12.text-center=__('500_Header') + h3.col-md-12.text-center=__('500_HEADER') div.col-md-4.col-md-offset-4 - div.col-md-12.text-center(style="padding-bottom: 50px;") - | #{error} + div.col-md-12.text-center(style="padding-bottom: 50px;")=__('500_BODY') \ No newline at end of file diff --git a/app/views/form.server.view.html b/app/views/form.server.view.html deleted file mode 100644 index be1bd664..00000000 --- a/app/views/form.server.view.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - - {{title}} Form - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
-
- - - - - - - - - - - - {% for bowerCssFile in bowerCssFiles %} - - {% endfor %} - - - - - - - {% for cssFile in cssFiles %} - - {% endfor %} - - - - - - - - - - - - {% for jsFile in formJSFiles %} - - {% endfor %} - - - {% if process.env.NODE_ENV === 'development' %} - - - {% endif %} - - - - {% if google_analytics_id %} - - {% endif %} - - - - - - diff --git a/app/views/form.server.view.pug b/app/views/form.server.view.pug index 6fc9ec9f..e9332158 100644 --- a/app/views/form.server.view.pug +++ b/app/views/form.server.view.pug @@ -1,7 +1,7 @@ doctype html html(lang='en', xmlns='http://www.w3.org/1999/xhtml') head - title #{title} Form + title=title // General META meta(charset='utf-8') meta(http-equiv='Content-type', content='text/html;charset=UTF-8') @@ -10,19 +10,19 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') meta(name='apple-mobile-web-app-capable', content='yes') meta(name='apple-mobile-web-app-status-bar-style', content='black') // Semantic META - meta(name='keywords', content='#{keywords}') - meta(name='description', content='#{description}') + meta(name='keywords', content='keywords') + meta(name='description', content='description') // Facebook META - meta(property='og:site_name', content='#{title}') - meta(property='og:title', content='#{title}') - meta(property='og:description', content='#{description}') - meta(property='og:url', content='#{url}') + meta(property='og:site_name', content=title) + meta(property='og:title', content=title) + meta(property='og:description', content='description') + meta(property='og:url', content='url') meta(property='og:image', content='/img/brand/logo.png') meta(property='og:type', content='website') // Twitter META - meta(name='twitter:title', content='#{title}') - meta(name='twitter:description', content='#{description}') - meta(name='twitter:url', content='#{url}') + meta(name='twitter:title', content=title) + meta(name='twitter:description', content='description') + meta(name='twitter:url', content='url') meta(name='twitter:image', content='/img/brand/logo.png') style. .loader { @@ -58,13 +58,14 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') if socketUrl script(type='text/javascript'). socketUrl = !{socketUrl} + script(src='/static/lib/jquery/dist/jquery.min.js', type='text/javascript') link(rel='stylesheet', href='/static/lib/font-awesome/css/font-awesome.min.css') link(rel='stylesheet', href='/static/lib/bootstrap/dist/css/bootstrap.min.css') //Bower CSS dependencies each bowerCssFile in bowerCssFiles - link(rel='stylesheet', href='#{bowerCssFile}') + link(rel='stylesheet', href=bowerCssFile) link(rel='stylesheet', href='/static/lib/angular-input-stars/angular-input-stars.css') link(rel='stylesheet', href='/static/lib/jquery-ui/themes/flick/jquery-ui.min.css') @@ -96,14 +97,9 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.tellform.com/2').install(); if google_analytics_id - script(type='text/javascript'). - (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); - - ga('create', '{{google_analytics_id}}', 'auto'); - ga('send', 'pageview'); + script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview') + + script(src='https://www.google-analytics.com/analytics.js', async='') script(type="text/javascript"). window.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c -{% endblock %} diff --git a/app/views/index.server.view.pug b/app/views/index.server.view.pug index 90ff24e3..8aea90e3 100644 --- a/app/views/index.server.view.pug +++ b/app/views/index.server.view.pug @@ -1,4 +1,46 @@ extends layout.server.view.pug block content - section.content(ui-view='') + section.content(ui-view='', ng-cloak='') + + script(src='/static/lib/file-saver.js/FileSaver.js', type='text/javascript') + + //Embedding The User Object + script(type='text/javascript') var user = null; + + //Embedding The signupDisabled Boolean + script(type='text/javascript'). + var signupDisabled = !{signupDisabled}; + var socketPort = false; + var socketUrl = false; + var subdomainsDisabled = !{subdomainsDisabled}; + + //Embedding socketPort + if socketPort + script(type='text/javascript'). + socketPort = !{socketPort} + + //Embedding socketUrl + if socketUrl + script(type='text/javascript'). + socketUrl = !{socketUrl} + + //Socket.io Client Dependency + script(src='https://cdn.socket.io/socket.io-1.4.5.js') + + //Bower JS dependencies + each bowerJSFile in bowerJSFiles + script(type='text/javascript', src=bowerJSFile) + // end Bower JS dependencies + + script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.min.js') + + //Application JavaScript Files + each jsFile in jsFiles + script(type='text/javascript', src=jsFile) + // end Application Javascript dependencies + + if process.env.NODE_ENV === 'development' + script(type='text/javascript', src='http://#{request.hostname}:35729/livereload.js') + script(src='https://cdn.ravenjs.com/2.3.0/angular/raven.min.js') + script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.tellform.com/2').install(); \ No newline at end of file diff --git a/app/views/layout.server.view.html b/app/views/layout.server.view.html deleted file mode 100755 index d83b5a5e..00000000 --- a/app/views/layout.server.view.html +++ /dev/null @@ -1,135 +0,0 @@ - - - - -{{title}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{% for bowerCssFile in bowerCssFiles %} - -{% endfor %} - - - - - - - -{% for cssFile in cssFiles %} - -{% endfor %} - - - - - - - - - {% block content %}{% endblock %} - - - - - - - - - - - - - - - {% for bowerJSFile in bowerJSFiles %} - - {% endfor %} - - - - - {% for jsFile in jsFiles %} - - {% endfor %} - - - {% if process.env.NODE_ENV === 'development' %} - - - {% endif %} - - - - - - - - - - - - - - - diff --git a/app/views/layout.server.view.pug b/app/views/layout.server.view.pug index 079f16fc..39ba97d5 100644 --- a/app/views/layout.server.view.pug +++ b/app/views/layout.server.view.pug @@ -48,55 +48,10 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') link(rel='stylesheet', href=cssFile) // end Application CSS Files - body(ng-cloak='') + body block content - script(src='/static/lib/file-saver.js/FileSaver.js', type='text/javascript') - - //Embedding The User Object - script(type='text/javascript') var user = null; - - //Embedding The signupDisabled Boolean - script(type='text/javascript'). - var signupDisabled = !{signupDisabled}; - var socketPort = false; - var socketUrl = false; - var subdomainsDisabled = !{subdomainsDisabled}; - - //Embedding socketPort - if socketPort - script(type='text/javascript'). - socketPort = !{socketPort} - - //Embedding socketUrl - if socketUrl - script(type='text/javascript'). - socketUrl = !{socketUrl} - - script(src='https://code.jquery.com/jquery-3.2.1.min.js') - script(src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js', integrity='sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa', crossorigin='anonymous') - - //Socket.io Client Dependency - script(src='https://cdn.socket.io/socket.io-1.4.5.js') - - //Bower JS dependencies - each bowerJSFile in bowerJSFiles - script(type='text/javascript', src=bowerJSFile) - // end Bower JS dependencies - - script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.min.js') - - //Application JavaScript Files - each jsFile in jsFiles - script(type='text/javascript', src=jsFile) - // end Application Javascript dependencies - - if process.env.NODE_ENV === 'development' - script(type='text/javascript', src='http://#{request.hostname}:35729/livereload.js') - script(src='https://cdn.ravenjs.com/2.3.0/angular/raven.min.js') - script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.tellform.com/2').install(); - script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview') script(src='https://www.google-analytics.com/analytics.js', async='', defer='') diff --git a/app/views/redoc.server.view.html b/app/views/redoc.server.view.html deleted file mode 100644 index 60749286..00000000 --- a/app/views/redoc.server.view.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - - {{title}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% for cssFile in cssFiles %} - - {% endfor %} - - - - - - - - - - - - - {% for bowerJSFile in bowerJSFiles %} - - {% endfor %} - - - - {% if process.env.NODE_ENV === 'development' %} - - - - - - - - - - - - diff --git a/app/views/redoc.server.view.pug b/app/views/redoc.server.view.pug index 729b7cae..c850dc96 100644 --- a/app/views/redoc.server.view.pug +++ b/app/views/redoc.server.view.pug @@ -53,10 +53,10 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') script Raven.config('https://825fefd6b4ed4a4da199c1b832ca845c@sentry.tellform.com/2').install(); - script (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ - (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), - m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) - })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); + script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview') + + script(src='https://www.google-analytics.com/analytics.js', async='', defer='') - ga('create', '{{google_analytics_id}}', 'auto'); - ga('send', 'pageview'); + script(type="text/javascript"). + window.heap=window.heap||[],heap.load=function(e,t){window.heap.appid=e,window.heap.config=t=t||{};var r=t.forceSSL||"https:"===document.location.protocol,a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=(r?"https:":"http:")+"//cdn.heapanalytics.com/js/heap-"+e+".js";var n=document.getElementsByTagName("script")[0];n.parentNode.insertBefore(a,n);for(var o=function(e){return function(){heap.push([e].concat(Array.prototype.slice.call(arguments,0)))}},p=["addEventProperties","addUserProperties","clearEventProperties","identify","removeEventProperty","setEventProperties","track","unsetEventProperty"],c=0;c

Hello there!

-

Welcome to TellForm! Here is a special link to activate your new account:

+

Welcome to TellForm! Here is a special link to activate your new account:

Activate my account

Thanks so much for using our services! If you have any questions, or suggestions, please feel free to email us here at team@tellform.com.

-

- The TellForm team

+

- The TellForm team

diff --git a/app/views/verification.email.view.pug b/app/views/verification.email.view.pug index bcac48b4..0d99a925 100644 --- a/app/views/verification.email.view.pug +++ b/app/views/verification.email.view.pug @@ -1,13 +1,14 @@ doctype html html head - body(style='padding: 0; width: 100% !important; -webkit-text-size-adjust: 100%; margin: 0; -ms-text-size-adjust: 100%', marginheight='0', marginwidth='0') - | @import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&subset=latin,latin-ext); - style a { - color: #007ee6; - text-decoration: none; - } + style. + @import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&subset=latin,latin-ext); + a { + color: #007ee6; + text-decoration: none; + } meta(content='text/html; charset=utf-8', http-equiv='Content-Type') + body(style='padding: 0; width: 100% !important; -webkit-text-size-adjust: 100%; margin: 0; -ms-text-size-adjust: 100%', marginheight='0', marginwidth='0') center table(cellpadding='8', cellspacing='0', style='*width: 540px; padding: 0; width: 100% !important; background: #ffffff; margin: 0; background-color: #ffffff', border='0') tbody @@ -26,15 +27,14 @@ html tr td(width='36') td(width='454', align='left', style='color: #444444; border-collapse: collapse; font-size: 11pt; font-family: 'Open Sans', 'Lucida Grande', 'Segoe UI', Arial, Verdana, 'Lucida Sans Unicode', Tahoma, 'Sans Serif'; max-width: 454px', valign='top') - p Hello there! - p Welcome to TellForm! Here is a special link to activate your new account: + p=__('EMAIL_GREETING') + p=__('VERIFICATION_EMAIL_PARAGRAPH_1') p - a(href='https://${URL}') Activate my account - p - | Thanks so much for using our services! If you have any questions, or suggestions, please feel free to email us here at  - a(href='mailto:team@tellform.com') team@tellform.com - | . - p - The TellForm team + a(href='https://${URL}')=('VERIFICATION_EMAIL_LINK_TEXT') + p=__('VERIFICATION_EMAIL_PARAGRAPH_2') + a(href='mailto:team@tellform.com') + | team@tellform.com + p=__('EMAIL_SIGNATURE') td(width='36') tr td(colspan='3', height='36') diff --git a/app/views/welcome.email.view.pug b/app/views/welcome.email.view.pug index a6ccb884..e3db6e02 100644 --- a/app/views/welcome.email.view.pug +++ b/app/views/welcome.email.view.pug @@ -1,13 +1,15 @@ doctype html html head - body(style='padding: 0; width: 100% !important; -webkit-text-size-adjust: 100%; margin: 0; -ms-text-size-adjust: 100%', marginheight='0', marginwidth='0') - | @import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&subset=latin,latin-ext); - style a { - color: #007ee6; - text-decoration: none; + style. + @import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&subset=latin,latin-ext); + a { + color: #007ee6; + text-decoration: none; } meta(content='text/html; charset=utf-8', http-equiv='Content-Type') + + body(style='padding: 0; width: 100% !important; -webkit-text-size-adjust: 100%; margin: 0; -ms-text-size-adjust: 100%', marginheight='0', marginwidth='0') center table(cellpadding='8', cellspacing='0', style='*width: 540px; padding: 0; width: 100% !important; background: #ffffff; margin: 0; background-color: #ffffff', border='0') tbody @@ -26,13 +28,12 @@ html tr td(width='36') td(width='454', align='left', style='color: #444444; border-collapse: collapse; font-size: 11pt; font-family: 'Open Sans', 'Lucida Grande', 'Segoe UI', Arial, Verdana, 'Lucida Sans Unicode', Tahoma, 'Sans Serif'; max-width: 454px', valign='top') - p Hello there! - p We would like to welcome you as our newest member! - p - | Thanks so much for using TellForm! If you have any questions, or suggestions, please feel free to email us here at  - a(href='mailto:team@tellform.com') team@tellform.com - | . - p - The TellForm team + p=__('EMAIL_GREETING') + p=__('WELCOME_EMAIL_PARAGRAPH_1') + p=__('WELCOME_EMAIL_PARAGRAPH_2') + a(href='mailto:team@tellform.com') + | team@tellform.com + p=__('EMAIL_SIGNATURE') td(width='36') tr td(colspan='3', height='36') diff --git a/config/express.js b/config/express.js index 8173f4e2..705ff479 100755 --- a/config/express.js +++ b/config/express.js @@ -155,14 +155,14 @@ module.exports = function(db) { //Setup i18n i18n.configure({ - locales: ['en', 'es', 'fr', 'de', 'it'], - cookie: 'i18n_cookie', - directory: __dirname + '/locales' + directory: __dirname + '/locales', + defaultLocale: 'en' }); + app.use(function(req, res, next) { // express helper for natively supported engines res.locals.__ = res.__ = function() { - console.log('res.locals.__'); + console.log('\n\n\n\n\n\nres.locals.__'); console.log(arguments); return i18n.__.apply(req, arguments); }; diff --git a/config/locales/de.json b/config/locales/de.json index 2378e9b8..d00088e6 100644 --- a/config/locales/de.json +++ b/config/locales/de.json @@ -1,4 +1,13 @@ { - "404_Header": "404 - Seite nicht gefunden", - "500_Header": "500 - Interner Serverfehler", + "404_HEADER": "404 - Seite nicht gefunden", + "500_HEADER": "500 - Interner Serverfehler", + "404_BODY": "%s ist kein gültiger Pfad.", + "500_BODY": "Ein unerwarteter Fehler scheint aufgetreten zu sein, warum nicht versuchen, Ihre Seite zu aktualisieren oder Sie können uns kontaktieren, wenn das Problem weiterhin besteht.", + "EMAIL_GREETING": "Hallo da!", + "VERIFICATION_EMAIL_PARAGRAPH_1": "Willkommen bei TellForm! Hier ist ein spezieller Link um deinen neuen Account zu aktivieren:", + "VERIFICATION_EMAIL_LINK_TEXT": "Mein Konto aktivieren", + "VERIFICATION_EMAIL_PARAGRAPH_2": "Vielen Dank für die Nutzung unserer Dienste! Wenn Sie Fragen oder Anregungen haben, senden Sie uns bitte eine E-Mail an", + "EMAIL_SIGNATURE": "- Das TellForm-Team", + "WELCOME_EMAIL_PARAGRAPH_1": "Wir möchten Sie als unser neustes Mitglied begrüßen!", + "WELCOME_EMAIL_PARAGRAPH_2": "Wir wünschen Ihnen viel Spaß mit TellForm! Wenn Sie Probleme haben, senden Sie uns bitte eine E-Mail an" } \ No newline at end of file diff --git a/config/locales/en.json b/config/locales/en.json index b15d0d9d..15b6ce5a 100644 --- a/config/locales/en.json +++ b/config/locales/en.json @@ -1,4 +1,13 @@ { - "404_Header": "404 - Page not found", - "500_Header": "500 - Internal Server Error" + "500_HEADER": "500 - Internal Server Error", + "404_HEADER": "404 - Page not found", + "404_BODY": "%s is not a valid path", + "500_BODY": "An unexpected error seems to have occured. Why not try refreshing your page? Or you can contact us if the problem persists.", + "EMAIL_GREETING": "Hello there!", + "VERIFICATION_EMAIL_PARAGRAPH_1": "Welcome to TellForm! Here is a special link to activate your new account:", + "VERIFICATION_EMAIL_LINK_TEXT": "Activate my account", + "VERIFICATION_EMAIL_PARAGRAPH_2": "Thanks so much for using our services! If you have any questions, or suggestions, please feel free to email us here at", + "EMAIL_SIGNATURE": "- The TellForm team", + "WELCOME_EMAIL_PARAGRAPH_1": "We would like to welcome you as our newest member!", + "WELCOME_EMAIL_PARAGRAPH_2": "We hope you enjoy using TellForm! If you have any trouble please feel free to email us here at" } \ No newline at end of file diff --git a/config/locales/es.json b/config/locales/es.json index 9352275b..902b23e3 100644 --- a/config/locales/es.json +++ b/config/locales/es.json @@ -1,4 +1,13 @@ { - "404_Header": "404 - Página no encontrada", - "500_Header": "500 - Error interno del servidor", + "404_HEADER": "404 - Página no encontrada", + "500_HEADER": "500 - Error interno del servidor", + "404_BODY": "%s no es una ruta válida", + "500_BODY": "Parece que se produjo un error inesperado. ¿Por qué no intenta actualizar su página? O puede contactarnos si el problema persiste", + "EMAIL_GREETING": "¡Hola!", + "VERIFICATION_EMAIL_PARAGRAPH_1": "Bienvenido a TellForm. Aquí hay un enlace especial para activar su nueva cuenta:", + "VERIFICATION_EMAIL_LINK_TEXT": "Activar mi cuenta", + "VERIFICATION_EMAIL_PARAGRAPH_2": "¡Muchas gracias por utilizar nuestros servicios! Si tiene alguna pregunta o sugerencia, no dude en enviarnos un correo electrónico aquí", + "EMAIL_SIGNATURE": "- El equipo de TellForm", + "WELCOME_EMAIL_PARAGRAPH_1": "¡Nos gustaría darle la bienvenida como nuestro miembro más nuevo!", + "WELCOME_EMAIL_PARAGRAPH_2": "Esperamos que disfrute utilizando TellForm. Si tiene algún problema, no dude en enviarnos un correo electrónico aquí" } \ No newline at end of file diff --git a/config/locales/fr.json b/config/locales/fr.json index 7b44d815..5a890ca1 100644 --- a/config/locales/fr.json +++ b/config/locales/fr.json @@ -1,4 +1,13 @@ { - "404_Header": "404 - Page non trouvée", - "500_Header": "500 - Erreur interne du serveur", + "404_HEADER": "404 - Page non trouvée", + "500_HEADER": "500 - Erreur interne du serveur", + "404_BODY": "%s n'est pas un chemin valide.", + "500_BODY": "Une erreur inattendue semble s'être produite, pourquoi ne pas essayer d'actualiser votre page? Ou vous pouvez nous contacter si le problème persiste.", + "EMAIL_GREETING": "Bonjour!", + "VERIFICATION_EMAIL_PARAGRAPH_1": "Bienvenue sur TellForm! Voici un lien spécial pour activer votre nouveau compte:", + "VERIFICATION_EMAIL_LINK_TEXT": "Activer mon compte", + "VERIFICATION_EMAIL_PARAGRAPH_2": "Merci beaucoup pour l'utilisation de nos services! Si vous avez des questions ou des suggestions, n'hésitez pas à nous envoyer un courriel ici", + "EMAIL_SIGNATURE": "- L'équipe TellForm", + "WELCOME_EMAIL_PARAGRAPH_1": "Nous aimerions vous accueillir en tant que nouveau membre!", + "WELCOME_EMAIL_PARAGRAPH_2": "Nous espérons que vous apprécierez l'utilisation de TellForm! Si vous avez des problèmes, n'hésitez pas à nous envoyer un e-mail ici" } \ No newline at end of file diff --git a/config/locales/it.json b/config/locales/it.json index ef5b5ad7..46fc9db1 100644 --- a/config/locales/it.json +++ b/config/locales/it.json @@ -1,4 +1,13 @@ { - "404_Header": "404 - Pagina non trovata", - "500_Header": "500 - Errore Server Interno", + "404_HEADER": "404 - Pagina non trovata", + "500_HEADER": "500 - Errore Server Interno", + "404_BODY": "%s non è un percorso valido", + "500_BODY": "Si è verificato un errore imprevisto: perché non provare a rinfrescare la tua pagina oppure puoi contattarci se il problema persiste", + "EMAIL_GREETING": "Ciao!", + "VERIFICATION_EMAIL_PARAGRAPH_1": "Benvenuti a TellForm! Ecco un collegamento speciale per attivare il tuo nuovo account:", + "VERIFICATION_EMAIL_LINK_TEXT": "Attiva il mio account", + "VERIFICATION_EMAIL_PARAGRAPH_2": "Grazie mille per l'utilizzo dei nostri servizi! Se hai domande o suggerimenti, non esitate a contattarci via", + "EMAIL_SIGNATURE": "- Il team TellForm", + "WELCOME_EMAIL_PARAGRAPH_1": "Vorremmo darVi il benvenuto come il nostro nuovo membro!", + "WELCOME_EMAIL_PARAGRAPH_2": "Speriamo che ti piace usare TellForm! Se hai problemi, non esitate a contattarci via" } \ No newline at end of file diff --git a/gruntfile.js b/gruntfile.js index 9817b75e..0286ecdb 100755 --- a/gruntfile.js +++ b/gruntfile.js @@ -23,7 +23,7 @@ module.exports = function(grunt) { // Unified Watch Object var watchFiles = { - serverViews: ['app/views/**/*.*'], + serverViews: ['app/views/**/*.pug'], serverJS: ['gruntfile.js', 'server.js', 'config/**/*.js', 'app/**/*.js', '!app/tests/'], clientViews: ['public/modules/**/*.html', 'public/form_modules/forms/base/**/*.html', '!public/modules/forms/base/**/*.html',], @@ -292,13 +292,6 @@ module.exports = function(grunt) { src: ['./scripts/setup.js'] } }, - i18nlint: { - options: { - templateDelimiters: ['{', '}'], - ignoreTags: ['head', 'script', 'style', '{%'] - }, - src: watchFiles.clientViews.concat(watchFiles.serverViews) - }, }); grunt.event.on('coverage', function(lcov, done){ @@ -342,7 +335,7 @@ module.exports = function(grunt) { grunt.registerTask('secure', ['env:secure', 'lint', 'html2js:main', 'html2js:forms', 'concurrent:default']); // Lint task(s). - grunt.registerTask('lint', ['jshint', 'csslint', 'i18nlint']); + grunt.registerTask('lint', ['jshint', 'csslint', 'i18nlint:client', 'i18nlint:server']); grunt.registerTask('lint:tests', ['jshint:allTests']); // Build task(s).