'+value+'
')[0];
+
+ // remove the new node
+ if (roles_node.children.length > 0 && roles_node.children[0].nodeName === "SPAN") {
+ roles_node.children[0].remove()
+ }
+ let roles = roles_node.textContent;
+ roles = roles.replace(/[\t\n\r]/g, ''); // clean up tabs and newlines
+ roles = roles.split(', ');
+ roles = roles.map(role => role.trim());
+ console.log(roles);
+ console.log("Role we want: " + this.roleName);
+ let should_include = roles.includes(this.roleName);
+ console.log("Should include " + should_include);
+ return should_include;
+ }
+}
diff --git a/static/js/accounts/role_filter.js b/static/js/accounts/role_filter.js
new file mode 100644
index 00000000..c1d2af80
--- /dev/null
+++ b/static/js/accounts/role_filter.js
@@ -0,0 +1,14 @@
+function registerRoleFilterSelect(editableGrid, selectId){
+ let oldFilter = null;
+ $('#'+selectId).on('change', function(event){
+ let select = event.currentTarget;
+ let val = select.value;
+ if (oldFilter != null) editableGrid.removeFilter(oldFilter);
+ if (val != '') {
+ oldFilter = new RoleFilter(val);
+ editableGrid.addFilter(oldFilter);
+ } else {
+ oldFilter = null;
+ }
+ });
+}
\ No newline at end of file
diff --git a/static/js/accounts/settings-accounts.js b/static/js/accounts/settings-accounts.js
index f2ac03a9..aec6eab9 100644
--- a/static/js/accounts/settings-accounts.js
+++ b/static/js/accounts/settings-accounts.js
@@ -4,18 +4,21 @@ if (!waitlist) {
var waitlist = {};
}
+
waitlist.accounts = (function() {
var getMetaData = waitlist.base.getMetaData;
var displayMessage = waitlist.base.displayMessage;
var sendMail = waitlist.IGBW.sendMail;
+
+ let grid = null;
function disableAccount(accountId, onsuccess){
var settings = {
async: true,
dataType: "text",
error: function() {
- displayMessage("Disabling Account failed!", "danger");
+ displayMessage($.i18n('wl-accounts-error-disable-account-failed'), "danger");
},
method: "POST",
data: {
@@ -35,7 +38,7 @@ waitlist.accounts = (function() {
async: true,
dataType: "text",
error: function() {
- displayMessage("Enabling Account failed!", "danger");
+ displayMessage($.i18n('wl-accounts-error-enabling-account-failed'), "danger");
},
method: "POST",
data: {
@@ -54,11 +57,10 @@ waitlist.accounts = (function() {
var source = $(event.currentTarget);
var id = Number(source.data('id'));
enableAccount(id, function() {
- const td_status_field_id = "#account-"+id+"-status";
- const td = $(td_status_field_id);
- td.text('Active')
+ let accountRow = new AccountRow(id, grid);
+ accountRow.status = 'Active';
source.attr("data-type", "acc-disable");
- source.text("Disable");
+ source.text($.i18n("wl-disable"));
});
}
@@ -66,11 +68,10 @@ waitlist.accounts = (function() {
var source = $(event.currentTarget);
var id = Number(source.data('id'));
disableAccount(id, function() {
- const td_status_field_id = "#account-"+id+"-status";
- const td = $(td_status_field_id);
- td.text('Deactivated')
+ let accountRow = new AccountRow(id, grid);
+ accountRow.status = 'Deactivated';
source.attr("data-type", "acc-enable");
- source.text("Enable");
+ source.text($.i18n("wl-enable"));
});
}
@@ -103,26 +104,30 @@ waitlist.accounts = (function() {
}
function editAccount(accountId) {
- let name = $('#acc-'+accountId+"-name > a").text();
- let roles_node = document.getElementById('acc-'+accountId+'-roles');
- let has_new_tag = (roles_node.childNodes.length > 0 && roles_node.childNodes[0].nodeName === "SPAN");
- let roles = roles_node.textContent;
+ let account_node = document.getElementById(`account-${accountId}`);
+ let account_row = new AccountRow(accountId, grid);
+ let name = account_row.name;
+ let roles_node = account_node.children[account_row.rolesIdx];
+ let has_new_tag = (roles_node.children.length > 0 && roles_node.children[0].nodeName === "SPAN");
+ let roles = roles_node.textContent;
+ roles = roles.replace(/[\t\n\r]/g, ''); // clean up tabs and newlines
// if it has a new tag remove the "New" from the beginning
if (has_new_tag){
roles = roles.slice(3)
}
- let default_char_name = $('#acc-'+accountId+'-cchar').text();
+ let default_char_name = account_row.defaultCharName;
$('#acc-edit-name').val(name);
// this is more complicated
// $('#acc-edit-roles')
roles = roles.split(", ");
+ roles = roles.map(x => x.trim())
// map the roles he has to a dict so we can fast and easy check for them
// later
let has_roles = {};
- for (let role in roles) {
- has_roles[roles[role]] = true;
+ for (let idx in roles) {
+ has_roles[roles[idx]] = true;
}
let edit_roles_select = document.getElementById('acc-edit-roles');
@@ -169,7 +174,7 @@ waitlist.accounts = (function() {
}
function setUpTable() {
- var editableGrid = new EditableGrid(
+ grid = new EditableGrid(
"Accounts",
{
enableSort: true,
@@ -179,31 +184,31 @@ waitlist.accounts = (function() {
$.parseHTML('')[0],
$.parseHTML('')[0]);
- editableGrid.load({
+ grid.load({
metadata: [
{
- name: "Actions",
+ name: 'actions',
datatype: "html",
editable: false
}, {
- name: "Status",
+ name: 'status',
datatype: "string",
editable: false
}, {
- name: "Account Name",
+ name: 'account-name',
datatype: "string",
editable: false,
values: [{"value": "canViewProfile", "label": true}]
}, {
- name: "Roles",
+ name: 'roles',
datatype: "html",
editable: false
}, {
- name: "Current Char",
+ name: 'current-character',
datatype: "string",
editable: false
}, {
- name: "Alts",
+ name: 'alts',
datatype: "string",
editable: false,
values: [{"value": "canChangeLinks", "label": getMetaData('can-change-links') == 'True'}]
@@ -215,19 +220,26 @@ waitlist.accounts = (function() {
]
});
- editableGrid.attachToHTMLTable('acctable');
- editableGrid.initializePaginator();
- editableGrid.initializeGrid();
- editableGrid.renderGrid();
+ grid.attachToHTMLTable('acctable');
+ grid.initializePaginator();
+ grid.initializeGrid();
+ grid.renderGrid();
+ let oldFilter = null;
$('#filter').on('keyup', function() {
- editableGrid.filter($('#filter').val());
+ if (oldFilter != null) grid.removeFilter(oldFilter);
+ oldFilter = new StringFilter($('#filter').val());
+ grid.addFilter(oldFilter);
});
+ registerRoleFilterSelect(grid, 'filterRole');
}
function init() {
noclick();
setUpEventhandlers();
- setUpTable();
+ // make sure language data is loaded
+ i18nloaded.then(() => {
+ setUpTable();
+ });
}
$(document).ready(init);
@@ -235,6 +247,6 @@ waitlist.accounts = (function() {
})();
EditableGrid.prototype.initializeGrid = function() {
- this.setCellRenderer("Account Name", new AccountCellRenderer());
- this.setCellRenderer("Alts", new AltCellRenderer());
+ this.setCellRenderer('account-name', new AccountCellRenderer());
+ this.setCellRenderer('alts', new AltCellRenderer());
};
\ No newline at end of file
diff --git a/static/js/api/ui.js b/static/js/api/ui.js
index 5993c749..aabaed7e 100644
--- a/static/js/api/ui.js
+++ b/static/js/api/ui.js
@@ -4,7 +4,7 @@ if (!waitlist) {
var waitlist = {};
waitlist.esi = {};
} else if (!waitlist.esi) {
- waitlist.esi = {};
+ waitlist.esi = {};
}
/**
@@ -12,9 +12,9 @@ if (!waitlist) {
*/
waitlist.esi.ui = (function() {
- var urls = {
+ var urls = {
esi_ui_newmail: waitlist.base.getMetaData('api-esi-ui-newmail'),
- esi_ui_auth: waitlist.base.getMetaData('api-esi-ui-auth')
+ esi_ui_auth: waitlist.base.getMetaData('api-esi-ui-auth')
};
/**
@@ -24,7 +24,7 @@ waitlist.esi.ui = (function() {
* @param subject Mails Subject
* @param body Mails Body
*/
- function open_newmail(receipients, subject, body) {
+ function open_newmail(receipients, subject, body) {
/*
* mailRecipients => JSON String recipients=[{"recipient_id": ID, "recipient_type": "alliance|character|corporation|mailing_list"}]
* mailBody => String
@@ -49,9 +49,9 @@ waitlist.esi.ui = (function() {
waitlist.base.displayMessage(message, "danger");
}
});
- }
+ }
- return {
+ return {
newmail: open_newmail,
};
})();
diff --git a/static/js/base.js b/static/js/base.js
index 2c567cc4..bf8d91ca 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -8,6 +8,16 @@ waitlist.base = (function(){
function getMetaData (name) {
return $('meta[name="'+name+'"]').attr('content');
}
+
+ var wlClient = SwaggerClient(
+ {
+ url: "/spec/v1/swagger.json",
+ requestInterceptor : function(req) {
+ req.headers['X-CSRFToken'] = getMetaData('csrf-token');
+ return req;
+ }
+ }
+ );
function displayMessage(message, type, html, id) {
var alertHTML = $($.parseHTML(`
@@ -28,6 +38,31 @@ waitlist.base = (function(){
var alertArea = $('#alert-area-base');
alertArea.append(alertHTML);
}
+
+ function handleLanguageSelection(event) {
+ let langCode = event.target.value;
+ wlClient.then((client) => {
+ client.apis.I18n.put_i18n_locale({
+ 'lang': langCode
+ }).then(() => {
+ location.reload();
+ }).catch(function(event) {
+ if (typeof(event.response) !== "undefined" &&
+ typeof(event.response.obj) !== "undefined" &&
+ typeof(event.response.obj.error) !== "undefined"){
+ waitlist.base.displayMessage($.i18n('wl-lang-change-failed', event.response.obj.error), "danger");
+ } else {
+ waitlist.base.displayMessage($.i18n('wl-add-alt-failed'), "danger");
+ }
+ });
+ });
+ }
+
+ function init() {
+ $('#lang-select').on('change', handleLanguageSelection);
+ }
+
+ $(document).ready(init);
return {
getMetaData: getMetaData,
diff --git a/static/js/calendar/settings.js b/static/js/calendar/settings.js
index 4331afd2..56292cee 100644
--- a/static/js/calendar/settings.js
+++ b/static/js/calendar/settings.js
@@ -22,11 +22,11 @@ waitlist.calendar.settings = (function() {
async: true,
dataType: "text",
error: function() {
- displayMessage("Deleting event failed", "danger");
+ displayMessage($.i18n('wl-calendar-settings-error-event-delete'), "danger");
},
method: "DELETE",
success: function() {
- displayMessage("Event deleted", "success");
+ displayMessage($.i18n('wl-calendar-settings-event-deleted'), "success");
target.closest("tr").remove();
},
headers: {
diff --git a/static/js/editablegrid/editablegrid.js b/static/js/editablegrid/editablegrid.js
index 96357ca6..f075f5fa 100644
--- a/static/js/editablegrid/editablegrid.js
+++ b/static/js/editablegrid/editablegrid.js
@@ -184,7 +184,7 @@ EditableGrid.prototype.init = function (name, config)
this.nbHeaderRows = 1;
this.lastSelectedRowIndex = -1;
this.currentPageIndex = 0;
- this.currentFilter = null;
+ this.currentFilters = [];
this.currentContainerid = null;
this.currentClassName = null;
this.currentTableid = null;
@@ -211,7 +211,7 @@ EditableGrid.prototype.init = function (name, config)
this.currentPageIndex = this.localisset('pageIndex') ? parseInt(this.localget('pageIndex')) : 0;
this.sortedColumnName = this.localisset('sortColumnIndexOrName') ? this.localget('sortColumnIndexOrName') : -1;
this.sortDescending = this.localisset('sortColumnIndexOrName') && this.localisset('sortDescending') ? this.localget('sortDescending') == 'true' : false;
- this.currentFilter = this.localisset('filter') ? this.localget('filter') : null;
+ this.currentFilters = this.localisset('filters') ? this.localget('filters') : [];
};
/**
@@ -475,7 +475,6 @@ EditableGrid.prototype._addUrlParameters = function(baseUrl, dataOnly)
// add pagination, filtering and sorting parameters to the base url
return baseUrl
+ "&page=" + (this.currentPageIndex + 1)
- + "&filter=" + (this.currentFilter ? encodeURIComponent(this.currentFilter) : "")
+ "&sort=" + (this.sortedColumnName && this.sortedColumnName != -1 ? encodeURIComponent(this.sortedColumnName) : "")
+ "&asc=" + (this.sortDescending ? 0 : 1)
+ (dataOnly ? '&data_only=1' : '');
@@ -1650,6 +1649,9 @@ EditableGrid.prototype._rendergrid = function(containerid, className, tableid)
rows[i].style.display = 'none';
rows[i].hidden_by_editablegrid = true;
}
+ // update these too, so we don't have dumplicated ids in DOM when done
+ rows[i].rowId = _data[i].id;
+ rows[i].id = this._getRowDOMId(rows[i].rowId);
}
else {
if (skipped < this.pageSize * _currentPageIndex) {
@@ -1975,125 +1977,79 @@ EditableGrid.prototype.sort = function(columnIndexOrName, descending, backOnFirs
};
+EditableGrid.prototype.addFilter = function(filter)
+{
+ if (!(filter instanceof Filter)) {
+ return;
+ }
+ this.currentFilters.push(filter);
+ this.filter();
+};
+
+EditableGrid.prototype.removeFilter = function(filter) {
+ if (!(filter instanceof Filter)) {
+ return;
+ }
+ let idx = this.currentFilters.indexOf(filter);
+ this.currentFilters.splice(idx, 1);
+ this.filter();
+};
+
+
/**
* Filter the content of the table
* @param {String} filterString String string used to filter: all words must be found in the row
* @param {Array} cols Columns to sort. If cols is not specified, the filter will be done on all columns
*/
-EditableGrid.prototype.filter = function(filterString, cols)
+EditableGrid.prototype.filter = function()
{
- if (typeof filterString != 'undefined') {
- this.currentFilter = filterString;
- this.localset('filter', filterString);
- }
-
- // if filtering is done on server-side, we are done here
- if (this.serverSide) return this.setPageIndex(0);
-
- // un-filter if no or empty filter set
- if (this.currentFilter == null || this.currentFilter == "") {
- if (this.dataUnfiltered != null) {
- this.data = this.dataUnfiltered;
- this.dataUnfiltered = null;
- for (var r = 0; r < this.getRowCount(); r++) this.data[r].visible = true;
- this.setPageIndex(0);
- this.tableFiltered();
- }
- return;
- }
-
- var words = this.currentFilter.toLowerCase().split(" ");
-
- // work on unfiltered data
- if (this.dataUnfiltered != null) this.data = this.dataUnfiltered;
-
- var rowCount = this.getRowCount();
- var columnCount = typeof cols != 'undefined' ? cols.length : this.getColumnCount();
-
- for (var r = 0; r < rowCount; r++) {
- var row = this.data[r];
- row.visible = true;
- var rowContent = "";
-
- // add column values
- for (var c = 0; c < columnCount; c++) {
- if (this.getColumnType(c) == 'boolean') continue;
- var displayValue = this.getDisplayValueAt(r, typeof cols != 'undefined' ? cols[c] : c);
- var value = this.getValueAt(r, typeof cols != 'undefined' ? cols[c] : c);
- rowContent += displayValue + " " + (displayValue == value ? "" : value + " ");
- }
-
- // add attribute values
- for (var attributeName in row) {
- if (attributeName != "visible" && attributeName != "originalIndex" && attributeName != "columns") rowContent += row[attributeName];
- }
+ let self = this;
+ // if filtering is done on server-side, we are done here
+ if (this.serverSide) return this.setPageIndex(0);
+
+ if (this.currentFilters.length === 0) {
+ if (this.dataUnfiltered != null) {
+ this.data = this.dataUnfiltered;
+ this.dataUnfiltered = null;
+ for (var r = 0; r < this.getRowCount(); r++)
+ this.data[r].visible = true;
+ this.setPageIndex(0);
+ this.tableFiltered();
+ }
+ return;
+ }
- // if row contents do not match one word in the filter, hide the row
- for (var i = 0; i < words.length; i++) {
- var word = words[i];
- var match = false;
-
- // a word starting with "!" means that we want a NON match
- var invertMatch = word.startsWith("!");
- if (invertMatch) word = word.substr(1);
-
- // if word is of the form "colname/attributename=value" or "colname/attributename!=value", only this column/attribute is used
- var colindex = -1;
- var attributeName = null;
- if (word.contains("!=")) {
- var parts = word.split("!=");
- colindex = this.getColumnIndex(parts[0]);
- if (colindex >= 0) {
- word = parts[1];
- invertMatch = !invertMatch;
- }
- else if (typeof row[parts[0]] != 'undefined') {
- attributeName = parts[0];
- word = parts[1];
- invertMatch = !invertMatch;
- }
- }
- else if (word.contains("=")) {
- var parts = word.split("=");
- colindex = this.getColumnIndex(parts[0]);
- if (colindex >= 0) word = parts[1];
- else if (typeof row[parts[0]] != 'undefined') {
- attributeName = parts[0];
- word = parts[1];
- }
- }
-
- // a word ending with "!" means that a column must match this word exactly
- if (!word.endsWith("!")) {
- if (colindex >= 0) match = (this.getValueAt(r, colindex) + ' ' + this.getDisplayValueAt(r, colindex)).trim().toLowerCase().indexOf(word) >= 0;
- else if (attributeName !== null) match = (''+this.getRowAttribute(r, attributeName)).trim().toLowerCase().indexOf(word) >= 0;
- else match = rowContent.toLowerCase().indexOf(word) >= 0;
- }
- else {
- word = word.substr(0, word.length - 1);
- if (colindex >= 0) match = (''+this.getDisplayValueAt(r, colindex)).trim().toLowerCase() == word || (''+this.getValueAt(r, colindex)).trim().toLowerCase() == word;
- else if (attributeName !== null) match = (''+this.getRowAttribute(r, attributeName)).trim().toLowerCase() == word;
- else for (var c = 0; c < columnCount; c++) {
- if (this.getColumnType(typeof cols != 'undefined' ? cols[c] : c) == 'boolean') continue;
- if ((''+this.getDisplayValueAt(r, typeof cols != 'undefined' ? cols[c] : c)).trim().toLowerCase() == word || (''+this.getValueAt(r, typeof cols != 'undefined' ? cols[c] : c)).trim().toLowerCase() == word) match = true;
- }
- }
-
- if (invertMatch ? match : !match) {
- this.data[r].visible = false;
- break;
- }
- }
- }
+
+
+ // work on unfiltered data
+ if (this.dataUnfiltered != null) this.data = this.dataUnfiltered;
+
+ var rowCount = this.getRowCount();
+ var columnCount = typeof cols != 'undefined' ? cols.length : this.getColumnCount();
+
+ if (filter instanceof Filter) {
+
+ }
+
+
+ this.data.forEach(e => e.visible = true);
- // keep only visible rows in data
- this.dataUnfiltered = this.data;
- this.data = [];
- for (var r = 0; r < rowCount; r++) if (this.dataUnfiltered[r].visible) this.data.push(this.dataUnfiltered[r]);
+ // remove rows that don't pass every filter
+ this.data.forEach(function(row, index) {
+ if (!self.currentFilters.every(filter => filter.shouldInclude(row, index, self))) {
+ row.visible = false;
+ } else {
+ row.visible = true;
+ }
+ });
+ this.dataUnfiltered = this.data;
+ this.data = [];
+ // we want to keep the order
+ for (var r = 0; r < rowCount; r++) if (this.dataUnfiltered[r].visible) this.data.push(this.dataUnfiltered[r]);
- // refresh grid (back on first page) and callback
- this.setPageIndex(0);
- this.tableFiltered();
+ // refresh grid (back on first page) and callback
+ this.setPageIndex(0);
+ this.tableFiltered();
};
diff --git a/static/js/editablegrid/editablegrid_paginator.js b/static/js/editablegrid/editablegrid_paginator.js
index c80de3ca..979f3c80 100644
--- a/static/js/editablegrid/editablegrid_paginator.js
+++ b/static/js/editablegrid/editablegrid_paginator.js
@@ -4,7 +4,7 @@ EditableGrid.prototype.updatePaginator = function() {
// get interval
var interval = this.getSlidingPageInterval(this.maxBars);
if (interval === null){
- return;
+ interval = {startPageIndex: 0, endPageIndex: 0};
}
// get pages in interval (with links except for the current page)
diff --git a/static/js/editablegrid/editablegrid_utils.js b/static/js/editablegrid/editablegrid_utils.js
index 16d4f2a6..6ccb341a 100644
--- a/static/js/editablegrid/editablegrid_utils.js
+++ b/static/js/editablegrid/editablegrid_utils.js
@@ -784,3 +784,93 @@ function number_format (number, decimals, dec_point, thousands_sep) {
return s.join(dec);
}
+class Filter {
+ constructor() {
+ }
+
+ shouldInclude(row, index, grid) {
+ return true;
+ }
+}
+
+class StringFilter extends Filter {
+ constructor(filterString, cols) {
+ super();
+ this.words = filterString.toLowerCase().split(" ");
+ this.cols = cols;
+ }
+
+ shouldInclude(row, index, grid) {
+ var rowContent = "";
+ var columnCount = typeof this.cols != 'undefined' ? this.cols.length : grid.getColumnCount();
+
+ // add column values
+ for (var c = 0; c < columnCount; c++) {
+ if (grid.getColumnType(c) == 'boolean') continue;
+ var displayValue = grid.getDisplayValueAt(index, typeof cols != 'undefined' ? cols[c] : c);
+ var value = grid.getValueAt(index, typeof cols != 'undefined' ? cols[c] : c);
+ rowContent += displayValue + " " + (displayValue == value ? "" : value + " ");
+ }
+ // add attribute values
+ for (var attributeName in row) {
+ if (attributeName != "visible" && attributeName != "originalIndex" && attributeName != "columns") rowContent += row[attributeName];
+ }
+
+ // if row contents do not match one word in the filter, hide the row
+ for (var i = 0; i < this.words.length; i++) {
+ var word = this.words[i];
+ var match = false;
+
+ // a word starting with "!" means that we want a NON match
+ var invertMatch = word.startsWith("!");
+ if (invertMatch) word = word.substr(1);
+
+ // if word is of the form "colname/attributename=value" or "colname/attributename!=value", only this column/attribute is used
+ var colindex = -1;
+ var attributeName = null;
+ if (word.contains("!=")) {
+ var parts = word.split("!=");
+ colindex = grid.getColumnIndex(parts[0]);
+ if (colindex >= 0) {
+ word = parts[1];
+ invertMatch = !invertMatch;
+ }
+ else if (typeof row[parts[0]] != 'undefined') {
+ attributeName = parts[0];
+ word = parts[1];
+ invertMatch = !invertMatch;
+ }
+ }
+ else if (word.contains("=")) {
+ var parts = word.split("=");
+ colindex = grid.getColumnIndex(parts[0]);
+ if (colindex >= 0) word = parts[1];
+ else if (typeof row[parts[0]] != 'undefined') {
+ attributeName = parts[0];
+ word = parts[1];
+ }
+ }
+
+ // a word ending with "!" means that a column must match this word exactly
+ if (!word.endsWith("!")) {
+ if (colindex >= 0) match = (grid.getValueAt(r, colindex) + ' ' + grid.getDisplayValueAt(index, colindex)).trim().toLowerCase().indexOf(word) >= 0;
+ else if (attributeName !== null) match = (''+grid.getRowAttribute(index, attributeName)).trim().toLowerCase().indexOf(word) >= 0;
+ else match = rowContent.toLowerCase().indexOf(word) >= 0;
+ }
+ else {
+ word = word.substr(0, word.length - 1);
+ if (colindex >= 0) match = (''+grid.getDisplayValueAt(index, colindex)).trim().toLowerCase() == word || (''+grid.getValueAt(index, colindex)).trim().toLowerCase() == word;
+ else if (attributeName !== null) match = (''+grid.getRowAttribute(index, attributeName)).trim().toLowerCase() == word;
+ else for (var c = 0; c < columnCount; c++) {
+ if (this.getColumnType(typeof cols != 'undefined' ? cols[c] : c) == 'boolean') continue;
+ if ((''+grid.getDisplayValueAt(index, typeof cols != 'undefined' ? cols[c] : c)).trim().toLowerCase() == word || (''+grid.getValueAt(index, typeof cols != 'undefined' ? cols[c] : c)).trim().toLowerCase() == word) match = true;
+ }
+ }
+
+ if (invertMatch ? match : !match) {
+ return false;
+ }
+ }
+ return true;
+ }
+}
diff --git a/static/js/eve-ui-config.js b/static/js/eve-ui-config.js
index aa3756ef..b21786f9 100644
--- a/static/js/eve-ui-config.js
+++ b/static/js/eve-ui-config.js
@@ -6,10 +6,7 @@ var eveui_imageserver = function(image_ref) {
return eve_image(encodeURI(image_ref), 'png');
};
// fix for getting names for modules from ccp api that are in the users browser language
-$.ajaxSetup({
- beforeSend: function(xhr, settings) {
- if (settings.url.includes('/universe/types/')) {
- xhr.setRequestHeader('Accept-Language', 'en-us, en;q=0.9');
- }
- }
-});
+eveui_accept_language = document.getElementById('lang-code').getAttribute('content');
+if (eveui_accept_language.startsWith('en_') || eveui_accept_language == 'en') {
+ eveui_accept_language = 'en_us';
+}
diff --git a/static/js/fleet-settings.js b/static/js/fleet-settings.js
index 12bcbecd..3b5ff780 100644
--- a/static/js/fleet-settings.js
+++ b/static/js/fleet-settings.js
@@ -42,8 +42,8 @@ waitlist.fsettings = (function() {
clearWaitlist(gid);
});
- $("#remove-diag-body").text("Do your really want to clear the Waitlist and all Xups?");
- $("#remove-diag-label").text("Clear Waitlist???");
+ $("#remove-diag-body").text($.i18n('wl-clear-list-warning-body'));
+ $("#remove-diag-label").text($.i18n('wl-clear-list-warning-label'));
}
});
}
@@ -151,8 +151,8 @@ waitlist.fsettings = (function() {
url: urls.settings_fleet_query_systems+'?term=%QUERY',
wildcard: '%QUERY',
filter: function(response) {
- return response.result;
- }
+ return response.result;
+ }
}
});
$('.hq-typeahead').typeahead({
diff --git a/static/js/fleetcomp.js b/static/js/fleetcomp.js
index c65b9bc4..4c1edbd3 100644
--- a/static/js/fleetcomp.js
+++ b/static/js/fleetcomp.js
@@ -55,7 +55,7 @@ waitlist.fleetcomp = (function() {
},
'error': function(data) {
var message = data.statusText;
- if (typeof data.responseJSON !== 'undefined'
+ if (typeof data.responseJSON !== 'undefined'
&& typeof data.responseJSON.message !== 'undefined') {
message += ": " + data.responseJSON.message;
}
@@ -118,12 +118,21 @@ waitlist.fleetcomp = (function() {
fit_id_str += ",";
}
});
- $.post(getMetaData('api-move-entry-to-wls'), {
- 'entryId': entryId,
- 'fitIds': fit_id_str,
- '_csrf_token': getMetaData('csrf-token')
- }, function() {
- }, "text");
+ $.post({
+ 'url': getMetaData('api-move-entry-to-wls'),
+ 'data': {
+ 'entryId': entryId,
+ 'fitIds': fit_id_str,
+ '_csrf_token': getMetaData('csrf-token')
+ },
+ 'dataType': 'text',
+ })
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ if(jqXHR.status = 404) {
+ // something is wrong we should reload the waitlist!
+ waitlist.listdom.loadWaitlist();
+ }
+ });
}
/**
@@ -151,8 +160,17 @@ waitlist.fleetcomp = (function() {
{'_csrf_token': getMetaData('csrf-token')},
function() {},
"text"
- );
- displayMessage("You should view "+ name + "'s fit before accepting it.", "danger");
+ )
+ .fail(function(jqXHR, textStatus, errorThrown) {
+ if(jqXHR.status = 404 || jqXHR.status == 404) {
+ // 409 => fit already on target list
+ // 404 => fit doesn't exist
+ // this fit was already approved so something is wrong
+ // reload the lists
+ waitlist.listdom.loadWaitlist();
+ }
+ });
+ displayMessage($.i18n('wl-warn-checkfit', name), "danger");
}
}
@@ -164,7 +182,7 @@ waitlist.fleetcomp = (function() {
moveEntryToWaitlists(wlId, entryId);
} else {
var name = document.getElementById(`entry-${wlId}-${entryId}`).dataset.username;
- displayMessage("You should view all of "+ name + "'s fits before accepting them.", "danger");
+ displayMessage($.i18n('wl-warn-checkfits', name), "danger");
$.post(getMetaData('api-fail-approve'),
{'_csrf_token': getMetaData('csrf-token')},
function() {},
@@ -262,9 +280,9 @@ waitlist.fleetcomp = (function() {
function onViewfit(event) {
const fit = event.currentTarget.offsetParent;
- if (fit.dataset.viewed !== "y") {
- document.getElementById(fit.id).setAttribute("data-viewed", "y");
- }
+ if (fit.dataset.viewed !== "y") {
+ document.getElementById(fit.id).setAttribute("data-viewed", "y");
+ }
}
function init() {
diff --git a/static/js/fleetview/fleetview.js b/static/js/fleetview/fleetview.js
index 0c78d1f4..22f919c0 100644
--- a/static/js/fleetview/fleetview.js
+++ b/static/js/fleetview/fleetview.js
@@ -13,7 +13,7 @@ waitlist.fleetview = (function(){
const request = indexedDB.open("eve-api-cache", 2);
// setup handler to ask user why it failed :>
request.onerror = function (event) {
- alert("IndexDB is needed to cache character/ship information. Why didn't you allow my web app to use IndexedDB?!");
+ alert($.i18n("wl-fleetview-error-indexdb"));
};
// if we succeed opening it lets register a general error handler
request.onsuccess = function (event) {
@@ -21,7 +21,7 @@ waitlist.fleetview = (function(){
db.onerror = function (event) {
// Generic error handler for all errors targeted at this database's
// requests!
- alert("Database error: " + event.target.errorCode);
+ alert($.i18n('wl-fleetview-error-db', event.target.errorCode));
};
// aright we are done, lets call the next code
initializeSite();
@@ -293,26 +293,26 @@ waitlist.fleetview = (function(){
}
function getCharacterInfo(characterID) {
- return window.clientv4.apis.Character.get_characters_character_id({character_id: characterID}, {responseContentType: 'application/json'});
+ return window.clientv4.apis.Character.get_characters_character_id({character_id: characterID}, {responseContentType: 'application/json'});
}
$(document).ready(function() {
window.clientv4 = new SwaggerClient("https://esi.tech.ccp.is/v4/swagger.json")
- .catch(
- function (event) {
- console.log("SwaggerError");
- console.log(event);
+ .catch((event) => {
+ console.log("SwaggerError");
+ console.log(event);
}
- );
+ );
window.clientv2 = new SwaggerClient("https://esi.tech.ccp.is/v2/swagger.json")
- .catch(
- function (event) {
+ .catch((event) => {
console.log("SwaggerError");
console.log(event);
}
- );
-
- setupDB();
+ );
+ // make sure translations are loaded
+ i18nloaded.then(() => {
+ setupDB();
+ });
});
})();
\ No newline at end of file
diff --git a/static/js/gong.js b/static/js/gong.js
index 14e9cb59..0b6d9659 100644
--- a/static/js/gong.js
+++ b/static/js/gong.js
@@ -59,7 +59,9 @@ waitlist.gong = (function() {
gongbutton.checked = true;
gongClicked();
} else {
- displayMessage("To get informed when you are invited please enable browser notifications in the top right.", "info", false, "gong-alert");
+ i18nloaded.then(() => {
+ displayMessage($.i18n('wl-gong-info'), "info", false, "gong-alert");
+ });
gongAlert = "y";
}
}
diff --git a/static/js/history-base.js b/static/js/history-base.js
index 4a40d1fa..ef90ad70 100644
--- a/static/js/history-base.js
+++ b/static/js/history-base.js
@@ -28,37 +28,37 @@ waitlist.history.base = (function() {
function resolveAction(action) {
switch (action) {
case "xup":
- return "X-UP";
+ return $.i18n('wl-xup-uppercase');
case "comp_rm_pl":
- return "Removed a Character from Waitlists";
+ return $.i18n('wl-remove-char');
case "comp_inv_pl":
- return "Send Invitation to Character";
+ return $.i18n('wl-send-invite');
case "comp_rm_etr":
- return "Removed Entry from X-UPs";
+ return $.i18n('wl-remove-entry-from-xup');
case "self_rm_fit":
- return "Removed own fit";
+ return $.i18n('wl-remove-own-fit');
case "self_rm_entry":
- return "Removed own entry";
+ return $.i18n('wl-remove-own-entry');
case "self_rm_wls_all":
- return "Removed himself from all lists";
+ return $.i18n('wl-remove-self-all-lists');
case "comp_mv_xup_etr":
- return "Approved X-UP entry";
+ return $.i18n('wl-approved-xup-entry');
case "comp_mv_xup_fit":
- return "Approved Single Fit";
+ return $.i18n('wl-approved-single-fit');
case "comp_send_noti":
- return "Send Notification to Character";
+ return $.i18n('wl-sent-notification-to-char');
case "set_fc":
- return "Was set as FC";
+ return $.i18n('wl-was-set-as-fc');
case "set_fcomp":
- return "Was set as Fleet Comp";
+ return $.i18n('wl-was-set-as-fleetcomp');
case "auto_rm_pl":
- return "Player was removed after found in fleet";
+ return $.i18n('wl-auto-removed-after-found-in-fleet');
case "auto_inv_missed":
- return "Player missed his invite";
+ return $.i18n('wl-missed-his-invite');
case "self_rm_etr":
- return "Player removed himself from X-UPs";
+ return $.i18n('wl-player-removed-himself-from-xups');
case "comp_inv_by_name":
- return "Player was invited by Name(Reform Tool?)";
+ return $.i18n('wl-player-invited-by-name');
default:
return action;
}
@@ -85,7 +85,7 @@ waitlist.history.base = (function() {
targetA.text(entry.target.name);
if (entry.target.newbro) {
- targetTD.prepend('New ');
+ targetTD.prepend(`${$.i18n('wl-new')} `);
}
for (var i=0; i < entry.fittings.length; i++) {
fittingsTD.append(createFittingDOM(entry.fittings[i]));
@@ -93,6 +93,21 @@ waitlist.history.base = (function() {
return historyEntrySkeleton;
}
+ /**
+ * Take a string and return the same string
+ * unless the string is "#System"
+ * then return "Booby"(the bird)
+ * @param old_name inventory type name
+ * @returns old_name unless it is "#System" then it is replaced by "Booby"
+ */
+ function filterShipName(old_name) {
+ if (old_name === "#System") {
+ return "Booby";
+ }
+ return old_name;
+ }
+
+
function createFittingDOM(fit) {
var comment = "";
let skillsData = "";
@@ -106,10 +121,10 @@ waitlist.history.base = (function() {
skillsData = `3338:${bsResult[1]}`;
}
}
- if (fit.ship_type === 1) {
- return $.parseHTML(`${fit.shipName}${comment}`);
+ if (fit.ship_type === 0) {
+ return $.parseHTML(`${filterShipName(fit.shipName)}${comment}`);
} else {
- return $.parseHTML(`${fit.shipName}${comment}`);
+ return $.parseHTML(`${filterShipName(fit.shipName)}${comment}`);
}
}
diff --git a/static/js/history-search.js b/static/js/history-search.js
index 68fa4d97..38eea67f 100644
--- a/static/js/history-search.js
+++ b/static/js/history-search.js
@@ -28,7 +28,7 @@ waitlist.history.historysearch = (function() {
var hbody = $('#historybody');
hbody.empty();
if (data.history.length <= 0) {
- hbody.append('No Results Found ');
+ hbody.append(''+$.i18n('wl-no-result-found')+' ');
return;
}
for (var i = 0; i < data.history.length; i++) {
diff --git a/static/js/history.js b/static/js/history.js
index 9aab956c..4f63a8ad 100644
--- a/static/js/history.js
+++ b/static/js/history.js
@@ -29,8 +29,11 @@ waitlist.history.comphistory = (function() {
});
}
function init() {
+ // this is to make sure that the language data is there before we try to use it
+ i18nloaded.then(() => {
refresh();
setInterval(refresh, 10000);
+ });
}
$(document).ready(init);
diff --git a/static/js/notification/alarm.js b/static/js/notification/alarm.js
index 32e9da92..55ecd5bc 100644
--- a/static/js/notification/alarm.js
+++ b/static/js/notification/alarm.js
@@ -242,8 +242,8 @@ waitlist.alarm = (function () {
// we can just call this every 5min to update stats
// or we use sse to update
- // 5min == 300 000 ms
- setInterval(updateCache, 300000);
+ // 30s == 30 000 ms
+ setInterval(updateCache, 30000);
}
$(document).ready(init);
diff --git a/static/js/overview/overview.js b/static/js/overview/overview.js
index 3817cbf3..142e028c 100644
--- a/static/js/overview/overview.js
+++ b/static/js/overview/overview.js
@@ -2,7 +2,7 @@
function GetChartElement() {
let content_frame = document.getElementById('chart-row');
let column = document.createElement('div');
- column.setAttribute('class', 'col-6')
+ column.setAttribute('class', 'col-xl-6 col-lg-12')
content_frame.appendChild(column);
return column;
}
@@ -23,7 +23,6 @@ function AddDistinctHullCharacterCombinations(seconds, title, swa_client) {
chartFrame,
undefined, {
'height': 400,
- // 'width': 400,
}
);
let option = {
@@ -32,6 +31,9 @@ function AddDistinctHullCharacterCombinations(seconds, title, swa_client) {
top: 0,
left: 'center',
padding: 5,
+ textStyle: {
+ fontSize: 12,
+ },
},
tooltip: {},
series: [{
@@ -63,22 +65,20 @@ function AddDistinctHullCharacterCombinations(seconds, title, swa_client) {
} else if ('message' in event) {
msg = event.message;
}
- waitlist.base.displayMessage(`Failed to get distinct hull character statistics: ${msg}`, "danger");
+ waitlist.base.displayMessage($.i18n('wl-overview-stat-error-hull-char', msg), "danger");
}
);
}
);
}
-
-
function GetApprovalTable(names) {
let table = document.createElement('table');
table.setAttribute('class', 'table table-sm');
let thead = document.createElement('thead');
let th = document.createElement('th');
- th.textContent = 'Account';
+ th.textContent = $.i18n('wl-account');
thead.appendChild(th);
let tbody = document.createElement('tbody');
@@ -125,6 +125,9 @@ function AddApprovedFitsByAccount(seconds, title, swa_client) {
top: 0,
left: 'center',
padding: 5,
+ textStyle: {
+ fontSize: 12,
+ },
},
tooltip: {
formatter: '{b}: {c}',
@@ -167,7 +170,7 @@ function AddApprovedFitsByAccount(seconds, title, swa_client) {
} else if ('message' in event) {
msg = event.message;
}
- waitlist.base.displayMessage(`Failed to get approved fits by account statistics: ${msg}`, "danger");
+ waitlist.base.displayMessage($.i18n('wl-overview-stat-error-fit-by-acc', msg), "danger");
}
);
}
@@ -199,6 +202,9 @@ function AddJoinedMemebers(seconds, title, swa_client) {
top: 0,
left: 'center',
padding: 5,
+ textStyle: {
+ fontSize: 12,
+ },
},
tooltip: {
formatter: '{b}: {c}',
@@ -226,7 +232,15 @@ function AddJoinedMemebers(seconds, title, swa_client) {
type: 'line',
data: event.obj.yvalues,
itemStyle: {
- color: '#61a0a8',
+ normal: {
+ color: '#61a0a8',
+ },
+ emphasis: {
+ areaStyle: {
+ color: '#71b0b8',
+ type: 'default',
+ },
+ },
}
}],
};
@@ -240,7 +254,7 @@ function AddJoinedMemebers(seconds, title, swa_client) {
} else if ('message' in event) {
msg = event.message;
}
- waitlist.base.displayMessage(`Failed to get approved fits by account statistics: ${msg}`, "danger");
+ waitlist.base.displayMessage($.i18n('wl-overview-stat-error-fit-by-acc', msg), "danger");
}
);
}
@@ -257,9 +271,12 @@ function init_overview() {
return req;
}
});
- AddApprovedFitsByAccount(2592000, 'Top 15 commanders with approves last 30d', swa_client);
- AddDistinctHullCharacterCombinations(2592000, 'Top 15 distinct Char/Hull combinations last 30d', swa_client);
- AddDistinctHullCharacterCombinations(86400, 'Top 15 distinct Char/Hull combinations last 24h', swa_client);
- AddJoinedMemebers(123072000, 'Fleetjoins per month', swa_client);
+ // this is to make sure that the language data is there before we try to use it
+ i18nloaded.then(() => {
+ AddApprovedFitsByAccount(2592000, $.i18n('wl-overview-top-commader-time', 15, 30), swa_client);
+ AddDistinctHullCharacterCombinations(2592000, $.i18n("wl-overview-top-distinct-time", 15, 30), swa_client);
+ AddDistinctHullCharacterCombinations(86400, $.i18n("wl-overview-top-distinct-time", 15, 1), swa_client);
+ AddJoinedMemebers(123072000, $.i18n('wl-fleetjoins-per-month'), swa_client);
+ });
}
$(document).ready(init_overview);
\ No newline at end of file
diff --git a/static/js/permissions/config.js b/static/js/permissions/config.js
index 236a2780..d922f59d 100644
--- a/static/js/permissions/config.js
+++ b/static/js/permissions/config.js
@@ -32,7 +32,7 @@ waitlist.permission.config = (function () {
async: true,
dataType: "text",
error: function() {
- displayMessage("Setting Permission failed", "danger");
+ displayMessage($.i18n('wl-permissions-setting-failed'), "danger");
},
method: "POST",
headers: {
diff --git a/static/js/reform.js b/static/js/reform.js
index 4957dd00..06ca33f0 100644
--- a/static/js/reform.js
+++ b/static/js/reform.js
@@ -33,7 +33,7 @@ waitlist.reform = (function(){
if (typeof data.responseJSON !== 'undefined' && typeof data.responseJSON.message !== 'undefined') {
message += ": " + data.responseJSON.message;
}
- else if (typeof data.responseText !== 'undefined') {
+ else if (typeof data.responseText !== 'undefined') {
message += ": " + data.responseText;
}
displayMessage(message, "danger");
diff --git a/static/js/sse-dom.js b/static/js/sse-dom.js
index 81a8eafa..43ab49bd 100644
--- a/static/js/sse-dom.js
+++ b/static/js/sse-dom.js
@@ -66,9 +66,9 @@ waitlist.sse_dom = (function () {
if (!("Notification" in window)) {
return;
}
- let title = "New X-UP";
+ let title = $.i18n('wl-notifiaction-xup-title');
let options = {
- 'body': `New X-UP from ${data.entry.character.name}`
+ 'body': $.i18n('wl-notifiaction-xup-body', data.entry.character.name)
};
// if we have permission
if (Notification.permission === "granted") {
@@ -83,6 +83,10 @@ waitlist.sse_dom = (function () {
});
}
}
+
+ function reloadListener(event) {
+ window.location.reload(true);
+ }
sse.addEventListener("fit-added", fitAddedListener);
sse.addEventListener("fit-removed", fitRemovedListener);
@@ -93,11 +97,16 @@ waitlist.sse_dom = (function () {
sse.addEventListener("invite-missed", missedInviteListener);
sse.addEventListener("status-changed", statusChangedListener);
+
+ sse.addEventListener("reload", reloadListener);
function init() {
- settings.can_manage = getMetaData('can-fleetcomp') === "True";
- loadWaitlist();
+ settings.can_manage = getMetaData('can-fleetcomp') === "True";
$('body').tooltip({selector: '[data-toggle=tooltip]'});
+ // make sure translations are loaded
+ i18nloaded.then(() => {
+ loadWaitlist();
+ });
}
$(document).ready(init);
diff --git a/static/js/ticket-settings.js b/static/js/ticket-settings.js
index 2be0cc40..c9a3e9b3 100644
--- a/static/js/ticket-settings.js
+++ b/static/js/ticket-settings.js
@@ -1,29 +1,28 @@
'use strict';
-
if (!waitlist) {
var waitlist = {};
}
-waitlist.ticketsettings = (function (){
-
+waitlist.ticketsettings = (function() {
+
var sendMail = waitlist.esi.ui.newmail;
var getMetaData = waitlist.base.getMetaData;
var displayMessage = waitlist.base.displayMessage;
-
+
function getTicketElement(ticketId) {
var el = {
- id: ticketId,
- jqE: $('#fb-'+ticketId)
+ id: ticketId,
+ jqE: $('#fb-' + ticketId)
};
- el.getTitle = function(){
+ el.getTitle = function() {
return $(":nth-child(4)", this.jqE).text();
};
-
+
el.getMessage = function() {
return $(":nth-child(5)", this.jqE).text();
};
-
+
el.getCharacterId = function() {
return this.jqE.attr('data-characterid');
};
@@ -35,19 +34,28 @@ waitlist.ticketsettings = (function (){
function sendTicketMail(ticketId) {
var ticketElement = getTicketElement(ticketId);
- var title = ticketElement.getTitle();
+ let title = ticketElement.getTitle();
var message = ticketElement.getMessage();
var charID = ticketElement.getCharacterId();
var charName = ticketElement.getCharacterName();
- openMailToCharacter(charID,
- "Answer to your Waitlist Feedback",
- `Hello ${charName},\nWe read your ticket:\n${$("
").text(title).html()}\n\n${$("
").text(message).html()}\n\nregards,\n`
- );
+ title = $("
").text(title).html();
+ message = $("
").text(message).html();
+ openMailToCharacter(
+ charID,
+ $.i18n('wl-fbmail-topic'),
+ $.i18n('wl-fbmail-message', charName, title, message)
+ );
}
function openMailToCharacter(charId, subject, body) {
- // [{"recipient_id": ID, "recipient_type": "alliance|character|corporation|mailing_list"}]
- sendMail([{"recipient_id": charId, "recipient_type": "character"}], subject, body);
+ // [{"recipient_id": ID, "recipient_type":
+ // "alliance|character|corporation|mailing_list"}]
+ sendMail([
+ {
+ "recipient_id": charId,
+ "recipient_type": "character"
+ }
+ ], subject, body);
}
function changeTicketStatus(ticketID, ticketStatus, successFunc) {
@@ -61,20 +69,20 @@ waitlist.ticketsettings = (function (){
'error': function(data) {
var message = data.statusText;
if (typeof data.responseText !== 'undefined') {
- message += ": " + data.responseText;
+ message += ": " + data.responseText;
}
displayMessage(message, "danger");
},
'success': successFunc
});
}
-
+
function sendMailClickedHandler(event) {
var target = $(event.currentTarget);
var ticketId = target.attr('data-ticketId');
sendTicketMail(ticketId);
}
-
+
function changeTicketStatusClickedHandler(event) {
var target = $(event.currentTarget);
var ticketId = target.attr('data-ticketId');
@@ -83,14 +91,15 @@ waitlist.ticketsettings = (function (){
target.parent().parent().remove();
});
}
-
+
function init() {
- $('#ticket-table-body').on('click', '[data-action="sendTicketMail"]', sendMailClickedHandler);
- $('#ticket-table-body').on('click', '[data-action="changeTicketStatus"]', changeTicketStatusClickedHandler);
+ $('#ticket-table-body').on('click', '[data-action="sendTicketMail"]',
+ sendMailClickedHandler);
+ $('#ticket-table-body').on('click',
+ '[data-action="changeTicketStatus"]',
+ changeTicketStatusClickedHandler);
}
-
-
- $(document).ready(init);
+
+ $(document).ready(init);
return {};
})();
-
diff --git a/static/js/waitlist-dom.js b/static/js/waitlist-dom.js
index dc3aa81f..361e4475 100644
--- a/static/js/waitlist-dom.js
+++ b/static/js/waitlist-dom.js
@@ -20,19 +20,30 @@ waitlist.listdom = (function(){
var type = "default";
switch (name) {
case "B":
+ type = "success";
+ name = $.i18n('wl-tag-basilisk');
+ break;
case "S":
+ type = "success";
+ name = $.i18n('wl-tag-scimitar');
+ break;
case "LOGI":
type = "success";
+ name = $.i18n('wl-tag-logi');
break;
case "DPS":
type = "danger";
+ name = $.i18n('wl-tag-dps')
break;
case "SNI":
type = "warning";
+ name = $.i18n('wl-tag-sniper')
break;
default:
type = "secondary";
}
+
+
return $.parseHTML(`${name}`);
}
@@ -107,7 +118,7 @@ waitlist.listdom = (function(){
// if the current user can view fits and or it is this character and
// this entry is a rookie
if ((settings.can_view_fits || entry.character.id === settings.user_id) && entry.character.newbro) {
- newBroTag = ' New';
+ newBroTag = ' '+$.i18n('wl-new')+'';
}
var cTime = new Date(Date.now());
var xupTime = new Date(Date.parse(entry.time));
@@ -122,7 +133,7 @@ waitlist.listdom = (function(){
oldInvites =
`
`;
} else {
oldInvites = ``;
@@ -137,7 +148,8 @@ waitlist.listdom = (function(){
var imgHTML;
if (entry.character.id === null) {
imgHTML = `
`;
- charHref = '#'; // change the href to not call quies script because we have no id
+ charHref = '#'; // change the href to not call quies script because
+ // we have no id
} else {
imgHTML = `
`;
}
@@ -145,7 +157,7 @@ waitlist.listdom = (function(){
let wardecHTML = '';
if (settings.can_view_fits || entry.character.id === settings.user_id) {
wardecHTML = `
`;
+ data-toggle="tooltip" data-placement="top" title="${$.i18n('wl-wardec-desc')}">`;
}
var charRow = $(`
@@ -166,7 +178,7 @@ waitlist.listdom = (function(){
}
}
var buttonHTML = "";
- const dropdownButton = ``;
+ const dropdownButton = ``;
if (settings.can_manage) { // fleet comp
var button1, button4, convoButton = "";
const notificationButton = ``;
@@ -292,6 +304,20 @@ waitlist.listdom = (function(){
}
}
+
+ /**
+ * Take a string and return the same string
+ * unless the string is "#System"
+ * then return "Booby"(the bird)
+ * @param old_name inventory type name
+ * @returns old_name unless it is "#System" then it is replaced by "Booby"
+ */
+ function filterShipName(old_name) {
+ if (old_name === "#System") {
+ return "Booby";
+ }
+ return old_name;
+ }
/**
* Creat html entity of a fit
@@ -299,14 +325,15 @@ waitlist.listdom = (function(){
* @param fit fit object as received from the api
* @param wlId id of the waitlist this fit is in
* @param entryId id of the entry this fit belongs to
- * @param queue if the entry is in the initial queue or one of the other lists
+ * @param queue if the entry is in the initial queue or one of the other
+ * lists
* @param username character name the entry belongs to
* @param userId character id the entry belongs to
* @returns {HTMLElement} the fit's DOM
*/
function createFitDOM(fit, wlId, entryId, queue, username, userId) {
queue = typeof queue !== 'undefined' ? queue : false;
- var isDummy = fit.shipType === 1;
+ var isDummy = fit.shipType === 0;
var approveButton = "", fitButtons = "",commentHTML = "";
// if user can manage fleet and if on x'ups
if (settings.can_manage && queue) {
@@ -316,10 +343,10 @@ waitlist.listdom = (function(){
// if user is looking at their own entry
if (settings.user_id === userId) {
// remove own fit
- fitButtons = '';
+ fitButtons = '';
if (queue) {
// update fit (only displayed if in x'up)
- fitButtons += '';
+ fitButtons += '';
}
}
// button group
@@ -334,7 +361,7 @@ waitlist.listdom = (function(){
commentHTML = `
#
- Date Time
- Noted By
- Note
- Role Changes
+ {{ _('Date Time') }}
+ {{ _('Noted By') }}
+ {{ _('Note') }}
+ {{ _('Role Changes') }}
@@ -40,23 +40,23 @@
@@ -27,7 +27,7 @@
diff --git a/templates/base.html b/templates/base.html
index f42f71c0..165456da 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,20 +1,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
{% block head %}
-{% assets filters="cssmin", output="gen/setup.%(version)s.css", "css/base.css", "css/waitlist.css", "css/font.css" %}
+{% assets filters="babili", output="gen/base.%(version)s.js", "js/swagger-client.min.js", "js/base.js" %}
+
+{% endassets %}
+{% assets filters="csscomp", output="gen/setup.%(version)s.css", "css/base.css", "css/waitlist.css", "css/font.css" %}
{% endassets %}
-
@@ -26,91 +55,16 @@
-
{% block alert_base %}
${entry.missedInvites}
-
+
`;
+ data-toggle="tooltip" data-placement="top" title="${$.i18n('wl-wardec-desc')}">`;
}
var charRow = $(`
@@ -166,7 +178,7 @@ waitlist.listdom = (function(){
}
}
var buttonHTML = "";
- const dropdownButton = ``;
+ const dropdownButton = ``;
if (settings.can_manage) { // fleet comp
var button1, button4, convoButton = "";
const notificationButton = ``;
@@ -292,6 +304,20 @@ waitlist.listdom = (function(){
}
}
+
+ /**
+ * Take a string and return the same string
+ * unless the string is "#System"
+ * then return "Booby"(the bird)
+ * @param old_name inventory type name
+ * @returns old_name unless it is "#System" then it is replaced by "Booby"
+ */
+ function filterShipName(old_name) {
+ if (old_name === "#System") {
+ return "Booby";
+ }
+ return old_name;
+ }
/**
* Creat html entity of a fit
@@ -299,14 +325,15 @@ waitlist.listdom = (function(){
* @param fit fit object as received from the api
* @param wlId id of the waitlist this fit is in
* @param entryId id of the entry this fit belongs to
- * @param queue if the entry is in the initial queue or one of the other lists
+ * @param queue if the entry is in the initial queue or one of the other
+ * lists
* @param username character name the entry belongs to
* @param userId character id the entry belongs to
* @returns {HTMLElement} the fit's DOM
*/
function createFitDOM(fit, wlId, entryId, queue, username, userId) {
queue = typeof queue !== 'undefined' ? queue : false;
- var isDummy = fit.shipType === 1;
+ var isDummy = fit.shipType === 0;
var approveButton = "", fitButtons = "",commentHTML = "";
// if user can manage fleet and if on x'ups
if (settings.can_manage && queue) {
@@ -316,10 +343,10 @@ waitlist.listdom = (function(){
// if user is looking at their own entry
if (settings.user_id === userId) {
// remove own fit
- fitButtons = '';
+ fitButtons = '';
if (queue) {
// update fit (only displayed if in x'up)
- fitButtons += '';
+ fitButtons += '';
}
}
// button group
@@ -334,7 +361,7 @@ waitlist.listdom = (function(){
commentHTML = `${fit.comment}
`;
}
// text html with ship name and comment
- var textHTML = ''+fit.shipName+commentHTML+'
';
+ var textHTML = ''+filterShipName(fit.shipName)+commentHTML+'
';
var fitDOM = $('');
@@ -356,7 +383,7 @@ waitlist.listdom = (function(){
fitDOM.append($(baseHTML)
.append(fitContainer)
);
- return fitDOM;
+ return fitDOM;
}
/**
@@ -461,7 +488,7 @@ waitlist.listdom = (function(){
}
} else {
let invElement = $('.missed-invites', jEntries[0]);
- let counterElement = $.parseHTML(""+entry.missedInvites+'
');
+ let counterElement = $.parseHTML(""+entry.missedInvites+'
');
invElement.append(counterElement);
}
} else {
@@ -642,7 +669,7 @@ waitlist.listdom = (function(){
var cTime = new Date(Date.now());
var xupTime = new Date(Date.parse(waitElement.attr('data-time')));
var waitTimeMinutes = Math.max(0, Math.floor((cTime - xupTime)/60000));
- waitElement.text(waitTimeMinutes+" min ago");
+ waitElement.text($.i18n('wl-min-ago', waitTimeMinutes));
});
}
@@ -661,7 +688,8 @@ waitlist.listdom = (function(){
countEl.text(count+1);
} else {
// he didn't miss invites yet, no DOM
- el.append($(`${count+1}
`));
+ el.append($(`${count+1}
`));
+
}
});
}
@@ -670,16 +698,13 @@ waitlist.listdom = (function(){
// status update start
/**
- * @param groupStatus
- * {
- * groupID=INT, status=STR, influence=BOOL,
- * constellation={constellationID=INT,constellationName=STR},
- * solarSystem={systemID=INT,systemName=STR},
- * station={stationID=INT, stationName=STR},
- * fcs=[{id=INT,name=STR,newbro=BOOL}...],
- * managers=[{id=INT,name=STR,newbro=BOOL}...],
- * fleets=[{grouID=INT, comp={id=INT,name=STR,newbro=BOOL}}...]
- * }
+ * @param groupStatus { groupID=INT, status=STR, influence=BOOL,
+ * constellation={constellationID=INT,constellationName=STR},
+ * solarSystem={systemID=INT,systemName=STR},
+ * station={stationID=INT, stationName=STR},
+ * fcs=[{id=INT,name=STR,newbro=BOOL}...],
+ * managers=[{id=INT,name=STR,newbro=BOOL}...],
+ * fleets=[{grouID=INT, comp={id=INT,name=STR,newbro=BOOL}}...] }
*/
function setStatusDom(groupStatus) {
@@ -689,7 +714,7 @@ waitlist.listdom = (function(){
fcTD.empty();
for(let fc of groupStatus.fcs) {
// create the fc link
- let fcA = $(`${fc.name}`);
+ let fcA = $(`${fc.name}`);
fcTD.append(fcA);
}
@@ -729,9 +754,9 @@ waitlist.listdom = (function(){
// update managers
var managerTD = $(`#grp-${groupStatus.groupID}-manager`);
managerTD.empty();
- // we have connected crest fleets, use the managers from those
+ // we have connected crest fleets, use the managers from those
for(let manager of groupStatus.managers) {
- var managerA = $(`${manager.name}`);
+ var managerA = $(`${manager.name}`);
managerTD.append(managerA);
}
@@ -740,17 +765,25 @@ waitlist.listdom = (function(){
statusDiv.empty();
if (groupStatus.enabled) {
if (groupStatus.status) {
- statusDiv.text(groupStatus.status+' ');
+ // lets see if an translation exists
+ let translation_key = `wl-liststatus-${groupStatus.status}`;
+ let translated_status = $.i18n(translation_key);
+ // no translation exists
+ if (translated_status === translation_key) {
+ translated_status = groupStatus.status;
+ }
+
+ statusDiv.text(translated_status+' ');
if (groupStatus.influence) {
let influenceLink = getMetaData('influence-link');
- statusDiv.append($(`Fit for Influence`));
+ statusDiv.append($(`${$.i18n('wl-fit-influence')}`));
$('#influence-link').on('click', function (e) {
e.stopPropagation();
});
}
}
} else {
- statusDiv.html('This waitlist is currently closed however there might be another open!');
+ statusDiv.html($.i18n('wl-list-closed'));
$('#status-link').on('click', function (e) {
e.stopPropagation();
});
@@ -763,8 +796,8 @@ waitlist.listdom = (function(){
var fitLists = $('ol[id|="wl-fits"]');
fitLists.empty();
fitLists.each(function(idx, el){
- var wlId = Number($(el).attr('id').replace('wl-fits-', ''));
- updateWlEntryTagCount(wlid);
+ let wlId = Number($(el).attr('id').replace('wl-fits-', ''));
+ updateWlEntryTagCount(wlId);
});
}
@@ -780,7 +813,7 @@ waitlist.listdom = (function(){
}
- $(document).ready(init);
+ $(document).ready(init);
return {
loadWaitlist: refreshWl,
addFitToDom: addFitToDom,
diff --git a/static/js/wlsseupdate.js b/static/js/wlsseupdate.js
index 1b69f540..af0a7d3a 100644
--- a/static/js/wlsseupdate.js
+++ b/static/js/wlsseupdate.js
@@ -6,6 +6,7 @@ if (!waitlist) {
waitlist.sse = (function() {
let getMetaData = waitlist.base.getMetaData;
+ let displayMessage = waitlist.base.displayMessage;
let eventListeners = [];
@@ -17,37 +18,38 @@ waitlist.sse = (function() {
event.target.close();
errorCount++;
if (errorCount < 2) { // our first error reconnect this instant
- connectSSE();
- } else if (errorCount >= 2 && errorCount <= 5) { // 2-5 errors, try
- // reconnect after
- // 1s
- setTimeout(connectSSE, 1000);
- } else { // > 5 errors try reconnect after 10s
- setTimeout(connectSSE, 10000);
+ connectSSE(errorCount);
+ // error 2-5, try reconnect after 2s
+ } else if (errorCount >= 2 && errorCount <= 5) {
+ setTimeout(connectSSE.bind(null, errorCount), 2000);
+ } else if (errorCount >= 6 && errorCount <= 10) { // > 5 errors try reconnect after 10s
+ setTimeout(connectSSE.bind(null, errorCount), 10000);
+ // more then 10 reconnects don't try anymore
+ } else {
+ displayMessage($.i18n('wl-error-to-many-sse-errors'), 'danger');
}
- event.target.close();
}
function handleSSEOpen() {
if (errorCount > 1) {
// refresh the page using json, to pull ALL the date, we might have
// missed sth
- loadWaitlist();
+ waitlist.listdom.loadWaitlist();
}
errorCount = 0; // reset error counter
}
- function connectSSE() {
+ function connectSSE(count = 0) {
let wlgroup = getMetaData('wl-group-id');
if(typeof wlgroup !== "undefined") {
- eventSource = getSSE("waitlistUpdates,gong,statusChanged", wlgroup);
+ eventSource = getSSE("waitlistUpdates,gong,statusChanged", wlgroup, count);
} else {
- eventSource = getSSE("statusChanged");
+ eventSource = getSSE("statusChanged", undefined, count);
}
}
- function getSSE(events, groupId) {
- let url = getMetaData('api-sse')+"?events="+encodeURIComponent(events);
+ function getSSE(events, groupId, count = 0) {
+ let url = getMetaData('api-sse')+"?events="+encodeURIComponent(events)+"&connect_try="+count;
if (typeof groupId !== "undefined") {
url += "&groupId="+encodeURIComponent(groupId);
}
@@ -99,7 +101,7 @@ waitlist.sse = (function() {
}
- $(document).ready(init);
+ $(document).ready(init);
return {
addEventListener: addEventListener
};
diff --git a/static/local/de.json b/static/local/de.json
new file mode 100644
index 00000000..5a8f67a1
--- /dev/null
+++ b/static/local/de.json
@@ -0,0 +1,81 @@
+{
+ "@metadata": {
+ "authors": [
+ "Constantin Wenger"
+ ],
+ "last-updated": "2018-06-19",
+ "locale": "en",
+ "message-documentation": "notes"
+ },
+ "wl-tag-logi": "LOGI",
+ "wl-tag-basilisk": "B",
+ "wl-tag-scimitar": "S",
+ "wl-tag-dps": "DMG",
+ "wl-tag-sniper": "SCHS",
+ "wl-new": "Neu",
+ "wl-missed-invites": "Verpasste Einladungen",
+ "wl-wardec-desc": "rot = aktiver Krieg, orange = Krieg erklärt, error = Es liegt ein Fehler vor",
+ "wl-update": "Aktualisieren",
+ "wl-min-ago": "vor $1 min",
+ "wl-fit-influence": "Rüste dich für hohen Einfluss aus",
+ "wl-list-closed": "Diese Warteliste ist momentan geschlossen, allerdings ist vielleicht eine andere offen!",
+ "wl-fbmail-topic": "Antwor auf deine Wartelisten Rückmeldung",
+ "wl-fbmail-body": "Hallo $1,\nWir haben deine Ticket gelesen:\n$2\n\n$3\n\nvielen Dank,\n",
+ "wl-notifiaction-xup-title": "Neuer Eintrag",
+ "wl-notifiaction-xup-body": "Neuer Eintrag von $1",
+ "wl-no-result-found": "Kein Ergebnis gefunden",
+ "wl-xup-uppercase": "Eintrag",
+ "wl-remove-char": "Entferene Charakter von Wartelisten",
+ "wl-send-invite": "Einladung Gesendet",
+ "wl-remove-entry-from-xup": "Eintrag aus Einschreibung entfernen",
+ "wl-remove-own-fit": "Eigene Ausrüstung entfernt",
+ "wl-remove-own-entry": "Eigenen Eintrag entfernt",
+ "wl-remove-self-all-lists": "Hat sich selbst von allen Listen entfernt",
+ "wl-approved-xup-entry": "Einschreibung bestätigt",
+ "wl-approved-single-fit": "Einzelne Ausrüstung bestätigt",
+ "wl-sent-notification-to-char": "Benachrichtigung an Charakter gesendet",
+ "wl-was-set-as-fc": "Wurde as FC eingetragen",
+ "wl-was-set-as-fleetcomp": "Wurde as Flotten-Verwalter eingetragen",
+ "wl-auto-removed-after-found-in-fleet": "Spieler wurde nach Auffindung in der Flotte entfernt",
+ "wl-missed-his-invite": "Spiele hat seine Einladung verpasst",
+ "wl-player-removed-himself-from-xups": "Spieler hat sich selbst von der Einschreibung entfernt",
+ "wl-player-invited-by-name": "Spieler wurde per Namen eingeladen(Reform Werkzeug?)",
+ "wl-gong-info": "Um informiert zu werden wenn du eingeladen wirst, aktiviere die Browserbenachrichtigungen.",
+ "wl-clear-list-warning-body": "Willst du worklich die Warteschlangen und Eintragungen löschen?",
+ "wl-clear-list-warning-label": "Löschen der Wartelisten???",
+ "wl-warn-checkfit": "Du solltest die Ausrüstunge von $1 betrachten befor du dieser zustimmst.",
+ "wl-warn-checkfits": "Du solltest alle Ausrüstungen von $1 betrachten befor du diesen zustimmst.",
+ "wl-permissions-setting-failed": "Das eintragen des Rechtes ist fehlgeschlagen",
+ "wl-overview-top-commader-time": "$1 Kommandeure mit meister Aktivität in letzen $2 Tagen",
+ "wl-overview-top-distinct-time": "$1 meisten Hülle/Charakter Kombinationen in letzten $2 Tagen",
+ "wl-fleetjoins-per-month": "Flotten Beitritte pro Monat",
+ "wl-fleetview-error-indexdb": "IndexDB is nötig um Charakter und Schiff Information zwischen zu speichern. Warum haben sie nicht erlaubt IndexedDB zu benutzen?!",
+ "wl-fleetview-error-db": "Datenbank Fehler: $1",
+ "wl-calendar-settings-error-event-delete": "Das löschen der Veranstaltung ist fehlgeschlagen",
+ "wl-calendar-settings-event-deleted": "Veranstaltung wurde gelöscht",
+ "wl-accounts-error-disable-account-failed": "Deaktivieren das Kontos is fehlgeschlagen!",
+ "wl-accounts-error-enabling-account-failed": "Aktivieren das Kontos is fehlgeschlagen!",
+ "wl-accounts-column-account-name": "Konto Name",
+ "wl-accounts-column-alts": "Alternierende Charaktere",
+ "wl-settings-accounts-table-actions": "Aktionen",
+ "wl-settings-accounts-table-status": "Zustand",
+ "wl-settings-accounts-table-roles": "Rollen",
+ "wl-settings-accounts-table-current-character": "Aktiver Charakter",
+ "wl-fits": "Ausrüstungen",
+ "wl-fit": "Ausrüstung",
+ "wl-overview-stat-error-fit-by-acc": "Das laden der bestätigent Ausrüstungen per Account Statistik is fehlgeschlagen: $1",
+ "wl-overview-stat-error-joins-per-month": "Das laden der Fottenbeitritte pro Monat Statistik is fehlgeschlagen: $1",
+ "wl-overview-stat-error-hull-char": "Das laden der unterschiedliche Hüllen/Charakter Statistik is fehlgeschlagen: $1",
+ "wl-liststatus-Running": "Betrieb",
+ "wl-liststatus-Down": "außer Betrieb",
+ "wl-liststatus-Forming": "Aufstellen",
+ "wl-lang-change-failed": "Das Ändern der Sprach ist fehlgeschlagen: $1",
+ "wl-add-alt-failed": "Das Hinzufügen des Alts ist fehlgeschlagen$1",
+ "wl-alt-added": "Alt wurde hinzugefügt",
+ "wl-please-wait": "Bitte warte...",
+ "wl-add-alt-placehonder": "Eingabe -> Hinzufügen, Esc -> Abbrechen",
+ "wl-account": "Konto",
+ "wl-enable": "Aktivieren",
+ "wl-disable": "Deaktivieren",
+ "wl-error-to-many-sse-errors": "Die SSE verbindung wurde zu oft unterbrochen, neuaufbau der verbindung wird eingestellt. WL wird nicht mehr geupdatet."
+}
diff --git a/static/local/en.json b/static/local/en.json
new file mode 100644
index 00000000..f5a96f53
--- /dev/null
+++ b/static/local/en.json
@@ -0,0 +1,81 @@
+{
+ "@metadata": {
+ "authors": [
+ "Constantin Wenger"
+ ],
+ "last-updated": "2018-06-19",
+ "locale": "en",
+ "message-documentation": "notes"
+ },
+ "wl-tag-logi": "LOGI",
+ "wl-tag-basilisk": "B",
+ "wl-tag-scimitar": "S",
+ "wl-tag-dps": "DPS",
+ "wl-tag-sniper": "SNI",
+ "wl-new": "New",
+ "wl-missed-invites": "Missed Invites",
+ "wl-wardec-desc": "red = valid target, orange = soon to be valid target, error = error happened",
+ "wl-update": "Update",
+ "wl-min-ago": "$1 min ago",
+ "wl-fit-influence": "Fit for Influence",
+ "wl-list-closed": "This waitlist is currently closed however there might be another open!",
+ "wl-fbmail-topic": "Answer to your Waitlist Feedback",
+ "wl-fbmail-body": "Hello $1,\nWe read your ticket:\n$2\n\n$3\n\nregards,\n",
+ "wl-notifiaction-xup-title": "New X-UP",
+ "wl-notifiaction-xup-body": "New X-UP from $1",
+ "wl-no-result-found": "No Results Found",
+ "wl-xup-uppercase": "X-UP",
+ "wl-remove-char": "Removed a Character from Waitlists",
+ "wl-send-invite": "Send Invitation to Character",
+ "wl-remove-entry-from-xup": "Removed Entry from X-UPs",
+ "wl-remove-own-fit": "Removed own fit",
+ "wl-remove-own-entry": "Removed own entry",
+ "wl-remove-self-all-lists": "Removed himself from all lists",
+ "wl-approved-xup-entry": "Approved X-UP entry",
+ "wl-approved-single-fit": "Approved Single Fit",
+ "wl-sent-notification-to-char": "Sent Notification to Character",
+ "wl-was-set-as-fc": "Was set as FC",
+ "wl-was-set-as-fleetcomp": "Was set as Fleet Comp",
+ "wl-auto-removed-after-found-in-fleet": "Player was removed after found in fleet",
+ "wl-missed-his-invite": "Player missed his invite",
+ "wl-player-removed-himself-from-xups": "Player removed himself from X-UPs",
+ "wl-player-invited-by-name": "Player was invited by Name(Reform Tool?)",
+ "wl-gong-info": "To get informed when you are invited please enable browser notifications.",
+ "wl-clear-list-warning-body": "Do your really want to clear the Waitlist and all Xups?",
+ "wl-clear-list-warning-label": "Clear Waitlist???",
+ "wl-warn-checkfit": "You should view $1's fit before accepting it.",
+ "wl-warn-checkfits": "You should view all of $1's fits before accepting them.",
+ "wl-permissions-setting-failed": "Setting Permission failed",
+ "wl-overview-top-commader-time": "Top $1 commanders with approves last $2d",
+ "wl-overview-top-distinct-time": "Top $1 distinct Char/Hull combinations last $2d",
+ "wl-fleetjoins-per-month": "Fleetjoins per month",
+ "wl-fleetview-error-indexdb": "IndexDB is needed to cache character/ship information. Why didn't you allow my web app to use IndexedDB?!",
+ "wl-fleetview-error-db": "Database error: $1",
+ "wl-calendar-settings-error-event-delete": "Deleting event failed",
+ "wl-calendar-settings-event-deleted": "Event deleted",
+ "wl-accounts-error-disable-account-failed": "Disabling Account failed!",
+ "wl-accounts-error-enabling-account-failed": "Enabling Account failed!",
+ "wl-accounts-column-account-name": "Account Name",
+ "wl-accounts-column-alts": "Alts",
+ "wl-settings-accounts-table-actions": "Actions",
+ "wl-settings-accounts-table-status": "Status",
+ "wl-settings-accounts-table-roles": "Roles",
+ "wl-settings-accounts-table-current-character": "Current Char",
+ "wl-fits": "Fits",
+ "wl-fit": "Fit",
+ "wl-overview-stat-error-fit-by-acc": "Failed to get approved fits by account statistics: $1",
+ "wl-overview-stat-error-joins-per-month": "Failed to get joins per month statistics: $1",
+ "wl-overview-stat-error-hull-char": "Failed to get distinct hull character statistics: $1",
+ "wl-liststatus-Running": "Running",
+ "wl-liststatus-Down": "Down",
+ "wl-liststatus-Forming": "Forming",
+ "wl-lang-change-failed": "Failed to change language: $1",
+ "wl-add-alt-failed": "Failed to add alt$1",
+ "wl-alt-added": "Alt added",
+ "wl-please-wait": "Please wait...",
+ "wl-add-alt-placehonder": "Enter -> Add, Esc -> Cancel",
+ "wl-account": "Account",
+ "wl-enable": "Enable",
+ "wl-disable": "Disable",
+ "wl-error-to-many-sse-errors": "Your SSE connection go terminated to often, stopping reconnect. WL will not update anymore."
+}
diff --git a/templates/about.html b/templates/about.html
index 439b9179..da0bee40 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -4,15 +4,17 @@
{% block head %}
{{ super() }}
-{% assets filters="babili", output="gen/eveproxy.%(version)s.js", "js/base.js", "js/eveproxy.js" %}
+{% assets filters="babili", output="gen/eveproxy.%(version)s.js", "js/eveproxy.js" %}
{% endassets %}
{% include "libs/eve-ui.html"%}
{% endblock %}
{% block data %}
-
- Eve-Inc-Waitlist Created by Bruce Warhead and Beryl Slanjava
-
- Fitting Display (Eve-UI) and Fitting Stats by Quie'scens
-
+
{% endblock %}
\ No newline at end of file
diff --git a/templates/account/profile.html b/templates/account/profile.html
index 77fc2ecc..4a663eec 100644
--- a/templates/account/profile.html
+++ b/templates/account/profile.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
-{% block title %}Account - Profile - {{account.username}}{% endblock %}
+{% block title %}{{ _('Account') }} - {{ _('Profile') }} - {{account.username}}{% endblock %}
{% block head %}
{{super()}}
@@ -14,10 +14,10 @@
+ {{ _('Eve-Inc-Waitlist Created by Bruce Warhead and Beryl Slanjava') }}
+
+ {{ _('Fitting Display (Eve-UI) and Fitting Stats by Quie\'scens') }}
+
Profile of {{account.username}}
Profile of {{account.username}}
{% endif %} diff --git a/templates/account/unauthed_characters_form.html b/templates/account/unauthed_characters_form.html index 842b18cf..d2a66feb 100644 --- a/templates/account/unauthed_characters_form.html +++ b/templates/account/unauthed_characters_form.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block title %}Account - Unauthorized Characters - {{account.username}}{% endblock %} +{% block title %}{{ _('Account') }} - {{ _('Unauthorized Characters') }} - {{account.username}}{% endblock %} {% block head %} {{super()}} @@ -10,7 +10,7 @@
- To continue using your account, you need to authenticate all connected characters, they are listed below.
+ {{ _('To continue using your account, you need to authenticate all connected characters, they are listed below.') }}