From 50dd227a2e7e4c3b16e726a82169b2b6c31432af Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jcurnow@vision6.com.au>
Date: Wed, 18 Jul 2018 16:59:45 +1000
Subject: [PATCH] i18n and improvements
---
src/frontend/js/app/nginx/proxy/delete.ejs | 6 +++---
src/frontend/js/app/nginx/proxy/delete.js | 12 +++++-------
src/frontend/js/i18n/messages.json | 5 +++--
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/frontend/js/app/nginx/proxy/delete.ejs b/src/frontend/js/app/nginx/proxy/delete.ejs
index 9f6d04e..93037ab 100644
--- a/src/frontend/js/app/nginx/proxy/delete.ejs
+++ b/src/frontend/js/app/nginx/proxy/delete.ejs
@@ -1,6 +1,6 @@
<div class="modal-content">
<div class="modal-header">
- <h5 class="modal-title">Delete Proxy Host</h5>
+ <h5 class="modal-title"><%- i18n('proxy-hosts', 'delete') %></h5>
<button type="button" class="close cancel" aria-label="Close" data-dismiss="modal"> </button>
</div>
<div class="modal-body">
@@ -17,7 +17,7 @@
</form>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary cancel" data-dismiss="modal">Cancel</button>
- <button type="button" class="btn btn-danger save">Yes I'm Sure</button>
+ <button type="button" class="btn btn-secondary cancel" data-dismiss="modal"><%- i18n('str', 'cancel') %></button>
+ <button type="button" class="btn btn-danger save"><%- i18n('str', 'sure') %></button>
</div>
</div>
diff --git a/src/frontend/js/app/nginx/proxy/delete.js b/src/frontend/js/app/nginx/proxy/delete.js
index bd97c35..ee2656d 100644
--- a/src/frontend/js/app/nginx/proxy/delete.js
+++ b/src/frontend/js/app/nginx/proxy/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 App = require('../../main');
+const template = require('./delete.ejs');
require('jquery-serializejson');
@@ -24,9 +22,9 @@ module.exports = Mn.View.extend({
'click @ui.save': function (e) {
e.preventDefault();
- Api.Nginx.ProxyHosts.delete(this.model.get('id'))
+ App.Api.Nginx.ProxyHosts.delete(this.model.get('id'))
.then(() => {
- Controller.showNginxProxy();
+ App.Controller.showNginxProxy();
App.UI.closeModal();
})
.catch(err => {
diff --git a/src/frontend/js/i18n/messages.json b/src/frontend/js/i18n/messages.json
index c3e49d9..7bf726c 100644
--- a/src/frontend/js/i18n/messages.json
+++ b/src/frontend/js/i18n/messages.json
@@ -56,7 +56,7 @@
"other-ssl": "Other",
"letsencrypt": "Let's Encrypt",
"letsencrypt-email": "Email Address for Let's Encrypt",
- "letsencrypt-agreee": "I Agree to the <a href=\"{url}\" target=\"_blank\">Let's Encrypt Terms of Service</a>",
+ "letsencrypt-agree": "I Agree to the <a href=\"{url}\" target=\"_blank\">Let's Encrypt Terms of Service</a>",
"other-certificate": "Certificate",
"other-certificate-key": "Certificate Key"
},
@@ -66,7 +66,8 @@
"add": "Add Proxy Host",
"form-title": "{id, select, undefined{New} other{Edit}} Proxy Host",
"forward-ip": "Forward IP",
- "forward-port": "Forward Port"
+ "forward-port": "Forward Port",
+ "delete": "Delete Proxy Host"
},
"redirection-hosts": {
"title": "Redirection Hosts"