diff --git a/src/frontend/js/app/audit-log/list/main.ejs b/src/frontend/js/app/audit-log/list/main.ejs index 83afd4be..ce893413 100644 --- a/src/frontend/js/app/audit-log/list/main.ejs +++ b/src/frontend/js/app/audit-log/list/main.ejs @@ -1,10 +1,10 @@ -  -Name -Email -Roles -  +   + Name + Email + Roles +   - + diff --git a/src/frontend/js/app/audit-log/main.ejs b/src/frontend/js/app/audit-log/main.ejs index bb8b534d..b5440e61 100644 --- a/src/frontend/js/app/audit-log/main.ejs +++ b/src/frontend/js/app/audit-log/main.ejs @@ -1,6 +1,6 @@
-

Audit Log

+

<%- i18n('audit-log', 'title') %>

diff --git a/src/frontend/js/app/audit-log/main.js b/src/frontend/js/app/audit-log/main.js index 3ad81410..69a30a25 100644 --- a/src/frontend/js/app/audit-log/main.js +++ b/src/frontend/js/app/audit-log/main.js @@ -1,9 +1,8 @@ 'use strict'; const Mn = require('backbone.marionette'); +const App = require('../main'); const AuditLogModel = require('../../models/audit-log'); -const Api = require('../api'); -const Controller = require('../controller'); const ListView = require('./list/main'); const template = require('./main.ejs'); const ErrorView = require('../error/main'); @@ -25,7 +24,7 @@ module.exports = Mn.View.extend({ onRender: function () { let view = this; - Api.AuditLog.getAll() + App.Api.AuditLog.getAll() .then(response => { if (!view.isDestroyed() && response && response.length) { view.showChildView('list_region', new ListView({ @@ -33,8 +32,8 @@ module.exports = Mn.View.extend({ })); } else { view.showChildView('list_region', new EmptyView({ - title: 'There are no logs.', - subtitle: 'As soon as you or another user changes something, history of those events will show up here.' + title: App.i18n('audit-log', 'empty'), + subtitle: App.i18n('audit-log', 'empty-subtitle') })); } }) @@ -43,7 +42,7 @@ module.exports = Mn.View.extend({ code: err.code, message: err.message, retry: function () { - Controller.showAuditLog(); + App.Controller.showAuditLog(); } })); diff --git a/src/frontend/js/app/dashboard/main.ejs b/src/frontend/js/app/dashboard/main.ejs index 61bf7f5b..c00aa6d0 100644 --- a/src/frontend/js/app/dashboard/main.ejs +++ b/src/frontend/js/app/dashboard/main.ejs @@ -1,5 +1,5 @@
-

Hi <%- getUserName() %>

+

<%- i18n('dashboard', 'title', {name: getUserName()}) %>

<% if (columns) { %> @@ -12,7 +12,7 @@
-

<%- getHostStat('proxy') %> Proxy Hosts

+

<%- getHostStat('proxy') %> <%- i18n('proxy-hosts', 'title') %>

@@ -27,7 +27,7 @@
-

<%- getHostStat('redirection') %> Redirection Hosts

+

<%- getHostStat('redirection') %> <%- i18n('redirection-hosts', 'title') %>

@@ -42,7 +42,7 @@
-

<%- getHostStat('stream') %> Streams

+

<%- getHostStat('stream') %> <%- i18n('streams', 'title') %>

@@ -57,7 +57,7 @@
-

<%- getHostStat('dead') %> 404 Hosts

+

<%- getHostStat('dead') %> <%- i18n('dead-hosts', 'title') %>

diff --git a/src/frontend/js/app/error/main.ejs b/src/frontend/js/app/error/main.ejs index 13e940fb..f7fd709b 100644 --- a/src/frontend/js/app/error/main.ejs +++ b/src/frontend/js/app/error/main.ejs @@ -3,5 +3,5 @@ <%- message %> <% if (retry) { %> -

Try again +

<%- i18n('str', 'try-again') %> <% } %> diff --git a/src/frontend/js/app/i18n.js b/src/frontend/js/app/i18n.js index f6ad7120..451f1968 100644 --- a/src/frontend/js/app/i18n.js +++ b/src/frontend/js/app/i18n.js @@ -21,5 +21,5 @@ module.exports = function (namespace, key, data) { return messages['en'][namespace][key](data); } - return 'INVALID I18N: ' + namespace + '/' + key; + return '(MISSING: ' + namespace + '/' + key + ')'; }; diff --git a/src/frontend/js/app/main.js b/src/frontend/js/app/main.js index 21cdbe34..85d69634 100644 --- a/src/frontend/js/app/main.js +++ b/src/frontend/js/app/main.js @@ -16,6 +16,7 @@ const App = Mn.Application.extend({ Cache: Cache, Api: Api, UI: null, + i18n: i18n, Controller: Controller, region: { diff --git a/src/frontend/js/app/nginx/proxy/form.ejs b/src/frontend/js/app/nginx/proxy/form.ejs index 59198adb..05a7fc25 100644 --- a/src/frontend/js/app/nginx/proxy/form.ejs +++ b/src/frontend/js/app/nginx/proxy/form.ejs @@ -1,13 +1,13 @@
-
<% if (typeof id !== 'undefined') { %>Edit<% } else { %>New<% } %> Proxy Host
+
<%- i18n('proxy-hosts', 'form-title', {id: id}) %>
@@ -16,19 +16,19 @@
- +
- +
- +
@@ -43,7 +43,7 @@
@@ -52,21 +52,21 @@
- +
@@ -75,7 +75,7 @@
- +
@@ -84,7 +84,7 @@
@@ -92,19 +92,19 @@
-
Certificate
+
<%- i18n('all-hosts', 'other-certificate') %>
- +
-
Certificate Key
+
<%- i18n('all-hosts', 'other-certificate-key') %>
- +
@@ -116,7 +116,7 @@
- - + +
diff --git a/src/frontend/js/app/nginx/proxy/form.js b/src/frontend/js/app/nginx/proxy/form.js index 92f56ea8..494caf9e 100644 --- a/src/frontend/js/app/nginx/proxy/form.js +++ b/src/frontend/js/app/nginx/proxy/form.js @@ -2,12 +2,9 @@ const _ = require('underscore'); const Mn = require('backbone.marionette'); -const template = require('./form.ejs'); -const Controller = require('../../controller'); -const Cache = require('../../cache'); -const Api = require('../../api'); const App = require('../../main'); const ProxyHostModel = require('../../../models/proxy-host'); +const template = require('./form.ejs'); require('jquery-serializejson'); require('jquery-mask-plugin'); @@ -80,11 +77,11 @@ module.exports = Mn.View.extend({ // Process this.ui.buttons.prop('disabled', true).addClass('btn-disabled'); - let method = Api.Nginx.ProxyHosts.create; + let method = App.Api.Nginx.ProxyHosts.create; if (this.model.get('id')) { // edit - method = Api.Nginx.ProxyHosts.update; + method = App.Api.Nginx.ProxyHosts.update; data.id = this.model.get('id'); } @@ -92,8 +89,8 @@ module.exports = Mn.View.extend({ .then(result => { view.model.set(result); App.UI.closeModal(function () { - if (method === Api.Nginx.ProxyHosts.create) { - Controller.showNginxProxy(); + if (method === App.Api.Nginx.ProxyHosts.create) { + App.Controller.showNginxProxy(); } }); }) @@ -106,7 +103,7 @@ module.exports = Mn.View.extend({ templateContext: { getLetsencryptEmail: function () { - return typeof this.meta.letsencrypt_email !== 'undefined' ? this.meta.letsencrypt_email : Cache.User.get('email'); + return typeof this.meta.letsencrypt_email !== 'undefined' ? this.meta.letsencrypt_email : App.Cache.User.get('email'); }, getLetsencryptAgree: function () { diff --git a/src/frontend/js/app/nginx/proxy/main.ejs b/src/frontend/js/app/nginx/proxy/main.ejs index 8b2ed9e7..999dc2d3 100644 --- a/src/frontend/js/app/nginx/proxy/main.ejs +++ b/src/frontend/js/app/nginx/proxy/main.ejs @@ -1,10 +1,10 @@
-

Proxy Hosts

+

<%- i18n('proxy-hosts', 'title') %>

<% if (showAddButton) { %> - Add Proxy Host + <%- i18n('proxy-hosts', 'add') %> <% } %>
diff --git a/src/frontend/js/app/nginx/proxy/main.js b/src/frontend/js/app/nginx/proxy/main.js index 1ba3c309..940b0ab4 100644 --- a/src/frontend/js/app/nginx/proxy/main.js +++ b/src/frontend/js/app/nginx/proxy/main.js @@ -1,14 +1,12 @@ 'use strict'; const Mn = require('backbone.marionette'); +const App = require('../../main'); const ProxyHostModel = require('../../../models/proxy-host'); -const Api = require('../../api'); -const Cache = require('../../cache'); -const Controller = require('../../controller'); const ListView = require('./list/main'); const ErrorView = require('../../error/main'); -const template = require('./main.ejs'); const EmptyView = require('../../empty/main'); +const template = require('./main.ejs'); module.exports = Mn.View.extend({ id: 'nginx-proxy', @@ -27,18 +25,18 @@ module.exports = Mn.View.extend({ events: { 'click @ui.add': function (e) { e.preventDefault(); - Controller.showNginxProxyForm(); + App.Controller.showNginxProxyForm(); } }, templateContext: { - showAddButton: Cache.User.canManage('proxy_hosts') + showAddButton: App.Cache.User.canManage('proxy_hosts') }, onRender: function () { let view = this; - Api.Nginx.ProxyHosts.getAll(['owner', 'access_list']) + App.Api.Nginx.ProxyHosts.getAll(['owner', 'access_list']) .then(response => { if (!view.isDestroyed()) { if (response && response.length) { @@ -46,16 +44,16 @@ module.exports = Mn.View.extend({ collection: new ProxyHostModel.Collection(response) })); } else { - let manage = Cache.User.canManage('proxy_hosts'); + let manage = App.Cache.User.canManage('proxy_hosts'); view.showChildView('list_region', new EmptyView({ - title: 'There are no Proxy Hosts', - subtitle: manage ? 'Why don\'t you create one?' : 'And you don\'t have permission to create one.', - link: manage ? 'Add Proxy Host' : null, + title: App.i18n('proxy-hosts', 'empty'), + subtitle: App.i18n('all-hosts', 'empty-subtitle', {manage: manage}), + link: manage ? App.i18n('proxy-hosts', 'add') : null, btn_color: 'success', permission: 'proxy_hosts', action: function () { - Controller.showNginxProxyForm(); + App.Controller.showNginxProxyForm(); } })); } @@ -66,7 +64,7 @@ module.exports = Mn.View.extend({ code: err.code, message: err.message, retry: function () { - Controller.showNginxProxy(); + App.Controller.showNginxProxy(); } })); diff --git a/src/frontend/js/app/ui/footer/main.ejs b/src/frontend/js/app/ui/footer/main.ejs index e7d0a28c..562e71c2 100644 --- a/src/frontend/js/app/ui/footer/main.ejs +++ b/src/frontend/js/app/ui/footer/main.ejs @@ -9,7 +9,7 @@
- <%- i18n('footer', 'version', {version: getVersion()}) %> + <%- i18n('main', 'version', {version: getVersion()}) %> <%= i18n('footer', 'copy', {url: 'https://jc21.com?utm_source=nginx-proxy-manager'}) %> <%= i18n('footer', 'theme', {url: 'https://tabler.github.io/?utm_source=nginx-proxy-manager'}) %>
diff --git a/src/frontend/js/app/ui/header/main.ejs b/src/frontend/js/app/ui/header/main.ejs index 28fa8dba..92eae4cd 100644 --- a/src/frontend/js/app/ui/header/main.ejs +++ b/src/frontend/js/app/ui/header/main.ejs @@ -15,10 +15,10 @@
- <%- i18n('user', 'edit-details') %> + <%- i18n('users', 'edit-details') %> - <%- i18n('user', 'change-password') %> + <%- i18n('users', 'change-password') %>
diff --git a/src/frontend/js/app/ui/header/main.js b/src/frontend/js/app/ui/header/main.js index f4a5c836..a914ae66 100644 --- a/src/frontend/js/app/ui/header/main.js +++ b/src/frontend/js/app/ui/header/main.js @@ -59,7 +59,7 @@ module.exports = Mn.View.extend({ return i18n('main', 'sign-in-as', {name: Tokens.getNextTokenName()}); } - return i18n('main', 'sign-out'); + return i18n('str', 'sign-out'); } }, diff --git a/src/frontend/js/app/ui/menu/main.ejs b/src/frontend/js/app/ui/menu/main.ejs index 0b852917..07e36429 100644 --- a/src/frontend/js/app/ui/menu/main.ejs +++ b/src/frontend/js/app/ui/menu/main.ejs @@ -3,39 +3,39 @@
diff --git a/src/frontend/js/app/user/delete.ejs b/src/frontend/js/app/user/delete.ejs index b743fa96..484e2786 100644 --- a/src/frontend/js/app/user/delete.ejs +++ b/src/frontend/js/app/user/delete.ejs @@ -1,19 +1,19 @@
-
Delete <%- name %>
+
<%- i18n('users', 'delete', {name: name}) %>
- Are you sure you want to delete <%- name %>? + <%= i18n('users', 'delete-confirm', {name: name}) %>
- - + +
diff --git a/src/frontend/js/app/user/delete.js b/src/frontend/js/app/user/delete.js index a6806111..87aa7d5e 100644 --- a/src/frontend/js/app/user/delete.js +++ b/src/frontend/js/app/user/delete.js @@ -1,10 +1,8 @@ 'use strict'; -const Mn = require('backbone.marionette'); -const template = require('./delete.ejs'); -const Controller = require('../controller'); -const Api = require('../api'); -const App = require('../main'); +const Mn = require('backbone.marionette'); +const template = require('./delete.ejs'); +const App = require('../main'); require('jquery-serializejson'); @@ -24,9 +22,9 @@ module.exports = Mn.View.extend({ 'click @ui.save': function (e) { e.preventDefault(); - Api.Users.delete(this.model.get('id')) + App.Api.Users.delete(this.model.get('id')) .then(() => { - Controller.showUsers(); + App.Controller.showUsers(); App.UI.closeModal(); }) .catch(err => { diff --git a/src/frontend/js/app/user/form.ejs b/src/frontend/js/app/user/form.ejs index 8cc4baf9..1e88b447 100644 --- a/src/frontend/js/app/user/form.ejs +++ b/src/frontend/js/app/user/form.ejs @@ -1,6 +1,6 @@
-
<% if (typeof id !== 'undefined') { %>Edit<% } else { %>New<% } %> User
+
<%- i18n('users', 'form-title', {id: id}) %>
@@ -8,33 +8,33 @@
- +
- +
- +
<% if (isAdmin()) { %>
-
Roles
+
<%- i18n('roles', 'title') %>
@@ -43,7 +43,7 @@
@@ -52,7 +52,7 @@
- - + +
diff --git a/src/frontend/js/app/user/form.js b/src/frontend/js/app/user/form.js index 8c2da877..de0339c2 100644 --- a/src/frontend/js/app/user/form.js +++ b/src/frontend/js/app/user/form.js @@ -1,12 +1,9 @@ 'use strict'; -const Mn = require('backbone.marionette'); -const template = require('./form.ejs'); -const Controller = require('../controller'); -const Cache = require('../cache'); -const Api = require('../api'); -const App = require('../main'); -const UserModel = require('../../models/user'); +const Mn = require('backbone.marionette'); +const App = require('../main'); +const UserModel = require('../../models/user'); +const template = require('./form.ejs'); require('jquery-serializejson'); @@ -34,45 +31,45 @@ module.exports = Mn.View.extend({ // admin@example.com is not allowed if (data.email === 'admin@example.com') { - this.ui.error.text('Default email address must be changed').show(); + this.ui.error.text(App.i18n('users', 'default_error')).show(); this.ui.buttons.prop('disabled', false).removeClass('btn-disabled'); return; } // Manipulate data.roles = []; - if ((this.model.get('id') === Cache.User.get('id') && this.model.isAdmin()) || (typeof data.is_admin !== 'undefined' && data.is_admin)) { + if ((this.model.get('id') === App.Cache.User.get('id') && this.model.isAdmin()) || (typeof data.is_admin !== 'undefined' && data.is_admin)) { data.roles.push('admin'); delete data.is_admin; } data.is_disabled = typeof data.is_disabled !== 'undefined' ? !!data.is_disabled : false; this.ui.buttons.prop('disabled', true).addClass('btn-disabled'); - let method = Api.Users.create; + let method = App.Api.Users.create; if (this.model.get('id')) { // edit - method = Api.Users.update; + method = App.Api.Users.update; data.id = this.model.get('id'); } method(data) .then(result => { - if (result.id === Cache.User.get('id')) { - Cache.User.set(result); + if (result.id === App.Cache.User.get('id')) { + App.Cache.User.set(result); } - if (view.model.get('id') !== Cache.User.get('id')) { - Controller.showUsers(); + if (view.model.get('id') !== App.Cache.User.get('id')) { + App.Controller.showUsers(); } view.model.set(result); - App.UI.closeModal(function () { - if (method === Api.Users.create) { + App.App.UI.closeModal(function () { + if (method === App.Api.Users.create) { // Show permissions dialog immediately - Controller.showUserPermissions(view.model); + App.Controller.showUserPermissions(view.model); } else if (show_password) { - Controller.showUserPasswordForm(view.model); + App.Controller.showUserPasswordForm(view.model); } }); }) @@ -88,7 +85,7 @@ module.exports = Mn.View.extend({ return { isSelf: function () { - return view.model.get('id') === Cache.User.get('id'); + return view.model.get('id') === App.Cache.User.get('id'); }, isAdmin: function () { diff --git a/src/frontend/js/app/user/password.ejs b/src/frontend/js/app/user/password.ejs index 3a9c69c2..5b74a53a 100644 --- a/src/frontend/js/app/user/password.ejs +++ b/src/frontend/js/app/user/password.ejs @@ -1,30 +1,30 @@
-
Change Password <%- isSelf() ? '' : 'for' + name %>
+
<%- i18n('users', 'form-title', {self: isSelf(), name: name}) %>
<% if (isSelf()) { %>
- +
<% } %>
- +
- +
- - + +
diff --git a/src/frontend/js/app/user/password.js b/src/frontend/js/app/user/password.js index b98e0219..7530ddbf 100644 --- a/src/frontend/js/app/user/password.js +++ b/src/frontend/js/app/user/password.js @@ -1,11 +1,8 @@ 'use strict'; -const Mn = require('backbone.marionette'); -const template = require('./password.ejs'); -const Controller = require('../controller'); -const Api = require('../api'); -const App = require('../main'); -const Cache = require('../cache'); +const Mn = require('backbone.marionette'); +const App = require('../main'); +const template = require('./password.ejs'); require('jquery-serializejson'); @@ -39,10 +36,10 @@ module.exports = Mn.View.extend({ }; this.ui.buttons.prop('disabled', true).addClass('btn-disabled'); - Api.Users.setPassword(this.model.get('id'), data) + App.Api.Users.setPassword(this.model.get('id'), data) .then(() => { App.UI.closeModal(); - Controller.showUsers(); + App.Controller.showUsers(); }) .catch(err => { this.ui.error.text(err.message).show(); @@ -52,7 +49,7 @@ module.exports = Mn.View.extend({ }, isSelf: function () { - return Cache.User.get('id') === this.model.get('id'); + return App.Cache.User.get('id') === this.model.get('id'); }, templateContext: function () { diff --git a/src/frontend/js/app/user/permissions.ejs b/src/frontend/js/app/user/permissions.ejs index 043e71d5..9e25aa09 100644 --- a/src/frontend/js/app/user/permissions.ejs +++ b/src/frontend/js/app/user/permissions.ejs @@ -1,6 +1,6 @@
-
Permissions for <%- name %>
+
<%- i18n('users', 'permissions-title', {name: name}) %>
@@ -11,130 +11,58 @@ <% if (isAdmin()) { %> <% } %>
- +
-
-
- -
- - - + <% + var list = ['proxy-hosts', 'redirection-hosts', 'dead-hosts', 'streams', 'access-lists']; + list.map(function(item) { + var perm = item.replace('-', '_'); + %> +
+
+ +
+ + + +
-
- -
-
- -
- - - -
-
-
- -
-
- -
- - - -
-
-
- -
-
- -
- - - -
-
-
- -
-
- -
- - - -
-
-
+ <% + }); + %>
- - + +
diff --git a/src/frontend/js/app/user/permissions.js b/src/frontend/js/app/user/permissions.js index 267059df..6083e979 100644 --- a/src/frontend/js/app/user/permissions.js +++ b/src/frontend/js/app/user/permissions.js @@ -1,12 +1,9 @@ 'use strict'; -const Mn = require('backbone.marionette'); -const template = require('./permissions.ejs'); -const Controller = require('../controller'); -const Cache = require('../cache'); -const Api = require('../api'); -const App = require('../main'); -const UserModel = require('../../models/user'); +const Mn = require('backbone.marionette'); +const App = require('../main'); +const UserModel = require('../../models/user'); +const template = require('./permissions.ejs'); require('jquery-serializejson'); @@ -44,10 +41,10 @@ module.exports = Mn.View.extend({ this.ui.buttons.prop('disabled', true).addClass('btn-disabled'); - Api.Users.setPermissions(view.model.get('id'), data) + App.Api.Users.setPermissions(view.model.get('id'), data) .then(() => { - if (view.model.get('id') === Cache.User.get('id')) { - Cache.User.set({permissions: data}); + if (view.model.get('id') === App.Cache.User.get('id')) { + App.Cache.User.set({permissions: data}); } view.model.set({permissions: data}); diff --git a/src/frontend/js/app/users/list/item.ejs b/src/frontend/js/app/users/list/item.ejs index bd4d19e0..3749fc9b 100644 --- a/src/frontend/js/app/users/list/item.ejs +++ b/src/frontend/js/app/users/list/item.ejs @@ -6,26 +6,36 @@
<%- name %>
- Created: <%- formatDbDate(created_on, 'Do MMMM YYYY') %> + <%- i18n('str', 'created-on', {date: formatDbDate(created_on, 'Do MMMM YYYY')}) %>
<%- email %>
-
<%- roles.join(', ') %>
+
+ <% + var r = []; + roles.map(function(role) { + if (role) { + r.push(i18n('roles', role)); + } + }); + %> + <%- r.join(', ') %> +
- Edit Details - Edit Permissions - Set Password + <%- i18n('users', 'edit-details') %> + <%- i18n('users', 'edit-permissions') %> + <%- i18n('users', 'change-password') %> <% if (!isSelf()) { %> - +
- Delete User + <%- i18n('users', 'delete') %> <% } %>
diff --git a/src/frontend/js/app/users/list/item.js b/src/frontend/js/app/users/list/item.js index 6766f088..4b5b2c82 100644 --- a/src/frontend/js/app/users/list/item.js +++ b/src/frontend/js/app/users/list/item.js @@ -1,11 +1,9 @@ 'use strict'; -const Mn = require('backbone.marionette'); -const Controller = require('../../controller'); -const Api = require('../../api'); -const Cache = require('../../cache'); -const Tokens = require('../../tokens'); -const template = require('./item.ejs'); +const Mn = require('backbone.marionette'); +const App = require('../../main'); +const Tokens = require('../../tokens'); +const template = require('./item.ejs'); module.exports = Mn.View.extend({ template: template, @@ -22,31 +20,31 @@ module.exports = Mn.View.extend({ events: { 'click @ui.edit': function (e) { e.preventDefault(); - Controller.showUserForm(this.model); + App.Controller.showUserForm(this.model); }, 'click @ui.permissions': function (e) { e.preventDefault(); - Controller.showUserPermissions(this.model); + App.Controller.showUserPermissions(this.model); }, 'click @ui.password': function (e) { e.preventDefault(); - Controller.showUserPasswordForm(this.model); + App.Controller.showUserPasswordForm(this.model); }, 'click @ui.delete': function (e) { e.preventDefault(); - Controller.showUserDeleteConfirm(this.model); + App.Controller.showUserDeleteConfirm(this.model); }, 'click @ui.login': function (e) { e.preventDefault(); - if (Cache.User.get('id') !== this.model.get('id')) { + if (App.Cache.User.get('id') !== this.model.get('id')) { this.ui.login.prop('disabled', true).addClass('btn-disabled'); - Api.Users.loginAs(this.model.get('id')) + App.Api.Users.loginAs(this.model.get('id')) .then(res => { Tokens.addToken(res.token, res.user.nickname || res.user.name); window.location = '/'; @@ -62,7 +60,7 @@ module.exports = Mn.View.extend({ templateContext: { isSelf: function () { - return Cache.User.get('id') === this.id; + return App.Cache.User.get('id') === this.id; } }, diff --git a/src/frontend/js/app/users/list/main.ejs b/src/frontend/js/app/users/list/main.ejs index ce893413..c85c9cb1 100644 --- a/src/frontend/js/app/users/list/main.ejs +++ b/src/frontend/js/app/users/list/main.ejs @@ -1,8 +1,8 @@   - Name - Email - Roles + <%- i18n('str', 'name') %> + <%- i18n('str', 'email') %> + <%- i18n('str', 'roles') %>   diff --git a/src/frontend/js/app/users/list/main.js b/src/frontend/js/app/users/list/main.js index 80b7bd54..bbe75beb 100644 --- a/src/frontend/js/app/users/list/main.js +++ b/src/frontend/js/app/users/list/main.js @@ -1,8 +1,8 @@ 'use strict'; -const Mn = require('backbone.marionette'); -const ItemView = require('./item'); -const template = require('./main.ejs'); +const Mn = require('backbone.marionette'); +const ItemView = require('./item'); +const template = require('./main.ejs'); const TableBody = Mn.CollectionView.extend({ tagName: 'tbody', diff --git a/src/frontend/js/app/users/main.ejs b/src/frontend/js/app/users/main.ejs index 336682bf..8a567789 100644 --- a/src/frontend/js/app/users/main.ejs +++ b/src/frontend/js/app/users/main.ejs @@ -1,8 +1,8 @@
-

Users

+

<%- i18n('users', 'title') %>

- Add User + <%- i18n('users', 'add') %>
diff --git a/src/frontend/js/app/users/main.js b/src/frontend/js/app/users/main.js index f67244a3..db4a389f 100644 --- a/src/frontend/js/app/users/main.js +++ b/src/frontend/js/app/users/main.js @@ -1,12 +1,11 @@ 'use strict'; -const Mn = require('backbone.marionette'); -const UserModel = require('../../models/user'); -const Api = require('../api'); -const Controller = require('../controller'); -const ListView = require('./list/main'); -const template = require('./main.ejs'); -const ErrorView = require('../error/main'); +const Mn = require('backbone.marionette'); +const App = require('../main'); +const UserModel = require('../../models/user'); +const ListView = require('./list/main'); +const ErrorView = require('../error/main'); +const template = require('./main.ejs'); module.exports = Mn.View.extend({ id: 'users', @@ -25,14 +24,14 @@ module.exports = Mn.View.extend({ events: { 'click @ui.add': function (e) { e.preventDefault(); - Controller.showUserForm(new UserModel.Model()); + App.Controller.showUserForm(new UserModel.Model()); } }, onRender: function () { let view = this; - Api.Users.getAll(['permissions']) + App.Api.Users.getAll(['permissions']) .then(response => { if (!view.isDestroyed() && response && response.length) { view.showChildView('list_region', new ListView({ @@ -42,9 +41,11 @@ module.exports = Mn.View.extend({ }) .catch(err => { view.showChildView('list_region', new ErrorView({ - code: err.code, - message: err.message, - retry: function () { Controller.showUsers(); } + code: err.code, + message: err.message, + retry: function () { + App.Controller.showUsers(); + } })); console.error(err); diff --git a/src/frontend/js/i18n/messages.json b/src/frontend/js/i18n/messages.json index 2f86bc68..c3e49d90 100644 --- a/src/frontend/js/i18n/messages.json +++ b/src/frontend/js/i18n/messages.json @@ -1,27 +1,115 @@ { "en": { + "str": { + "email-address": "Email address", + "password": "Password", + "sign-in": "Sign in", + "sign-out": "Sign out", + "try-again": "Try again", + "name": "Name", + "email": "Email", + "roles": "Roles", + "created-on": "Created: {date}", + "save": "Save", + "cancel": "Cancel", + "sure": "Yes I'm Sure", + "disabled": "Disabled", + "choose-file": "Choose file" + }, + "login": { + "title": "Login to your account" + }, "main": { "app": "Nginx Proxy Manager", + "version": "v{version}", "welcome": "Welcome to Nginx Proxy Manager", "logged-in": "You are logged in as {name}", "unknown-error": "Error loading stuff. Please reload the app.", "unknown-user": "Unknown User", - "sign-out": "Sign out", "sign-in-as": "Sign back in as {name}" }, - "user": { - "edit-details": "Edit Details", - "change-password": "Change Password" - }, "roles": { + "title": "Roles", "admin": "Administrator", "user": "Apache Helicopter" }, + "menu": { + "dashboard": "Dashboard", + "hosts": "Hosts" + }, "footer": { "fork-me": "Fork me on Github", "copy": "© 2018 jc21.com.", - "version": "v{version}", "theme": "Theme by Tabler" + }, + "dashboard": { + "title": "Hi {name}" + }, + "all-hosts": { + "empty-subtitle": "{manage, select, true{Why don't you create one?} other{And you don't have permission to create one.}}", + "details": "Details", + "ssl": "SSL", + "enable-ssl": "Enable SSL", + "force-ssl": "Force SSL", + "domain-names": "Domain Names", + "cert-provider": "Certificate Provider", + "other-ssl": "Other", + "letsencrypt": "Let's Encrypt", + "letsencrypt-email": "Email Address for Let's Encrypt", + "letsencrypt-agreee": "I Agree to the Let's Encrypt Terms of Service", + "other-certificate": "Certificate", + "other-certificate-key": "Certificate Key" + }, + "proxy-hosts": { + "title": "Proxy Hosts", + "empty": "There are no Proxy Hosts", + "add": "Add Proxy Host", + "form-title": "{id, select, undefined{New} other{Edit}} Proxy Host", + "forward-ip": "Forward IP", + "forward-port": "Forward Port" + }, + "redirection-hosts": { + "title": "Redirection Hosts" + }, + "dead-hosts": { + "title": "404 Hosts" + }, + "streams": { + "title": "Streams" + }, + "access-lists": { + "title": "Access Lists" + }, + "users": { + "title": "Users", + "default_error": "Default email address must be changed", + "add": "Add User", + "nickname": "Nickname", + "full-name": "Full Name", + "edit-details": "Edit Details", + "change-password": "Change Password", + "edit-permissions": "Edit Permissions", + "sign-in-as": "Sign in as User", + "form-title": "{id, select, undefined{New} other{Edit}} User", + "delete": "Delete {name, select, undefined{User} other{{name}}}", + "delete-confirm": "Are you sure you want to delete {name}?", + "password-title": "Change Password{self, select, false{ for {name}} other{}}", + "current-password": "Current Password", + "new-password": "New Password", + "confirm-password": "Confirm Password", + "permissions-title": "Permissions for {name}", + "admin-perms": "This user is an Administrator and some items cannot be altered", + "perms-visibility": "Item Visibility", + "perms-visibility-user": "Created Items Only", + "perms-visibility-all": "All Items", + "perm-manage": "Manage", + "perm-view": "View Only", + "perm-hidden": "Hidden" + }, + "audit-log": { + "title": "Audit Log", + "empty": "There are no logs.", + "empty-subtitle": "As soon as you or another user changes something, history of those events will show up here." } } } diff --git a/src/frontend/js/lib/helpers.js b/src/frontend/js/lib/helpers.js index 984b513f..672aac60 100644 --- a/src/frontend/js/lib/helpers.js +++ b/src/frontend/js/lib/helpers.js @@ -1,36 +1,14 @@ 'use strict'; const numeral = require('numeral'); -const moment = require('moment'); module.exports = { /** - * @param {Integer} number + * @param {Integer} number * @returns {String} */ niceNumber: function (number) { return numeral(number).format('0,0'); - }, - - /** - * @param {String|Integer} date - * @returns {String} - */ - shortTime: function (date) { - let shorttime = ''; - - if (typeof date === 'number') { - shorttime = moment.unix(date).format('H:mm A'); - } else { - shorttime = moment(date).format('H:mm A'); - } - - return shorttime; - }, - - replaceSlackLinks: function (content) { - return content.replace(/<(http[^|>]+)\|([^>]+)>/gi, '$2'); } - }; diff --git a/src/frontend/js/lib/marionette.js b/src/frontend/js/lib/marionette.js index 10c78431..b4375381 100644 --- a/src/frontend/js/lib/marionette.js +++ b/src/frontend/js/lib/marionette.js @@ -1,10 +1,9 @@ 'use strict'; -const _ = require('underscore'); -const Mn = require('backbone.marionette'); -const moment = require('moment'); -const numeral = require('numeral'); -const i18n = require('../app/i18n'); +const _ = require('underscore'); +const Mn = require('backbone.marionette'); +const moment = require('moment'); +const i18n = require('../app/i18n'); let render = Mn.Renderer.render; @@ -14,30 +13,6 @@ Mn.Renderer.render = function (template, data, view) { data.i18n = i18n; - /** - * @param {Integer} number - * @returns {String} - */ - data.niceNumber = function (number) { - return numeral(number).format('0,0'); - }; - - /** - * @param {Integer} seconds - * @returns {String} - */ - data.secondsToTime = function (seconds) { - let sec_num = parseInt(seconds, 10); - let minutes = Math.floor(sec_num / 60); - let sec = sec_num - (minutes * 60); - - if (sec < 10) { - sec = '0' + sec; - } - - return minutes + ':' + sec; - }; - /** * @param {String} date * @returns {String} @@ -50,68 +25,6 @@ Mn.Renderer.render = function (template, data, view) { return moment(date).format(format); }; - /** - * @param {String} date - * @returns {String} - */ - data.shortDate = function (date) { - let shortdate = data.formatDbDate(date, 'YYYY-MM-DD'); - - return moment().format('YYYY-MM-DD') === shortdate ? 'Today' : shortdate; - }; - - /** - * @param {String} date - * @returns {String} - */ - data.shortTime = function (date) { - return data.formatDbDate(date, 'H:mm A'); - }; - - /** - * @param {String} string - * @returns {String} - */ - data.escape = function (string) { - let entityMap = { - '&': '&', - '<': '<', - '>': '>', - '"': '"', - '\'': ''', - '/': '/' - }; - - return String(string).replace(/[&<>"'\/]/g, function (s) { - return entityMap[s]; - }); - }; - - /** - * @param {String} string - * @param {Integer} length - * @returns {String} - */ - data.trim = function (string, length) { - if (string.length > length) { - let trimmedString = string.substr(0, length); - return trimmedString.substr(0, Math.min(trimmedString.length, trimmedString.lastIndexOf(' '))) + '...'; - } - - return string; - }; - - /** - * @param {String} name - * @returns {String} - */ - data.niceVarName = function (name) { - return name.replace('_', ' ') - .replace(/^(.)|\s+(.)/g, function ($1) { - return $1.toUpperCase(); - }); - }; - return render.call(this, template, data, view); }; diff --git a/src/frontend/js/login/ui/login.ejs b/src/frontend/js/login/ui/login.ejs index da584687..ae8b1675 100644 --- a/src/frontend/js/login/ui/login.ejs +++ b/src/frontend/js/login/ui/login.ejs @@ -3,23 +3,23 @@
diff --git a/src/frontend/js/login/ui/login.js b/src/frontend/js/login/ui/login.js index 07ee8ebf..da1bc858 100644 --- a/src/frontend/js/login/ui/login.js +++ b/src/frontend/js/login/ui/login.js @@ -4,6 +4,7 @@ const $ = require('jquery'); const Mn = require('backbone.marionette'); const template = require('./login.ejs'); const Api = require('../../app/api'); +const i18n = require('../../app/i18n'); module.exports = Mn.View.extend({ template: template, @@ -35,6 +36,7 @@ module.exports = Mn.View.extend({ }, templateContext: { + i18n: i18n, getVersion: function () { return $('#login').data('version'); }