s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1846 from OpenRefine/new_i18n

Browse Source 
Migrate to Wikimedia's i18n jQuery library
This commit is contained in:
Antonin Delpeuch 2018-11-22 09:38:11 +00:00 committed by GitHub
commit 22322bd027
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
76 changed files with 1157 additions and 1116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
extensions/database/module/scripts/index/database-import-controller.js
View File

@ -39,10 +39,11 @@ $.ajax({
module : "database", module : "database",
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
lang = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
// End internationalization // End internationalization
Refine.DatabaseImportController = function(createProjectUI) { Refine.DatabaseImportController = function(createProjectUI) {
@ -60,7 +61,7 @@ Refine.DatabaseImportController = function(createProjectUI) {
Refine.CreateProjectUI.controllers.push(Refine.DatabaseImportController); Refine.CreateProjectUI.controllers.push(Refine.DatabaseImportController);
Refine.DatabaseImportController.prototype.startImportingDocument = function(queryInfo) { Refine.DatabaseImportController.prototype.startImportingDocument = function(queryInfo) {
var dismiss = DialogSystem.showBusy($.i18n._('database-import/preparing')); var dismiss = DialogSystem.showBusy($.i18n('database-import/preparing'));
//alert(queryInfo.query); //alert(queryInfo.query);
var self = this; var self = this;
@ -138,19 +139,19 @@ Refine.DatabaseImportController.prototype._showParsingPanel = function() {
this._parsingPanelElmts = DOM.bind(this._parsingPanel); this._parsingPanelElmts = DOM.bind(this._parsingPanel);
this._parsingPanelElmts.startOverButton.html($.i18n._('database-parsing/start-over')); this._parsingPanelElmts.startOverButton.html($.i18n('database-parsing/start-over'));
this._parsingPanelElmts.database_conf_pars.html($.i18n._('database-parsing/conf-pars')); this._parsingPanelElmts.database_conf_pars.html($.i18n('database-parsing/conf-pars'));
this._parsingPanelElmts.database_proj_name.html($.i18n._('database-parsing/proj-name')); this._parsingPanelElmts.database_proj_name.html($.i18n('database-parsing/proj-name'));
this._parsingPanelElmts.createProjectButton.html($.i18n._('database-parsing/create-proj')); this._parsingPanelElmts.createProjectButton.html($.i18n('database-parsing/create-proj'));
this._parsingPanelElmts.database_options.html($.i18n._('database-parsing/option')); this._parsingPanelElmts.database_options.html($.i18n('database-parsing/option'));
this._parsingPanelElmts.previewButton.html($.i18n._('database-parsing/preview-button')); this._parsingPanelElmts.previewButton.html($.i18n('database-parsing/preview-button'));
this._parsingPanelElmts.database_updating.html($.i18n._('database-parsing/updating-preview')); this._parsingPanelElmts.database_updating.html($.i18n('database-parsing/updating-preview'));
this._parsingPanelElmts.database_discard_next.html($.i18n._('database-parsing/discard-next')); this._parsingPanelElmts.database_discard_next.html($.i18n('database-parsing/discard-next'));
this._parsingPanelElmts.database_discard.html($.i18n._('database-parsing/discard')); this._parsingPanelElmts.database_discard.html($.i18n('database-parsing/discard'));
this._parsingPanelElmts.database_limit_next.html($.i18n._('database-parsing/limit-next')); this._parsingPanelElmts.database_limit_next.html($.i18n('database-parsing/limit-next'));
this._parsingPanelElmts.database_limit.html($.i18n._('database-parsing/limit')); this._parsingPanelElmts.database_limit.html($.i18n('database-parsing/limit'));
this._parsingPanelElmts.database_store_row.html($.i18n._('database-parsing/store-row')); this._parsingPanelElmts.database_store_row.html($.i18n('database-parsing/store-row'));
this._parsingPanelElmts.database_store_cell.html($.i18n._('database-parsing/store-cell')); this._parsingPanelElmts.database_store_cell.html($.i18n('database-parsing/store-cell'));
if (this._parsingPanelResizer) { if (this._parsingPanelResizer) {
$(window).unbind('resize', this._parsingPanelResizer); $(window).unbind('resize', this._parsingPanelResizer);
@ -362,7 +363,7 @@ Refine.DatabaseImportController.prototype._createProject = function() {
}, },
1000 1000
); );
self._createProjectUI.showImportProgressPanel($.i18n._('database-import/creating'), function() { self._createProjectUI.showImportProgressPanel($.i18n('database-import/creating'), function() {
// stop the timed polling // stop the timed polling
window.clearInterval(timerID); window.clearInterval(timerID);

70
extensions/database/module/scripts/index/database-source-ui.js
View File

@ -64,20 +64,20 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
this._elmts = DOM.bind(this._body); this._elmts = DOM.bind(this._body);
var self = this; var self = this;
$('#database-title').text($.i18n._('database-import/title')); $('#database-title').text($.i18n('database-import/title'));
$('#connectionNameLabel').html($.i18n._('database-source/connectionNameLabel')); $('#connectionNameLabel').html($.i18n('database-source/connectionNameLabel'));
$('#databaseTypeLabel').html($.i18n._('database-source/databaseTypeLabel')); $('#databaseTypeLabel').html($.i18n('database-source/databaseTypeLabel'));
$('#databaseHostLabel').text($.i18n._('database-source/databaseHostLabel')); $('#databaseHostLabel').text($.i18n('database-source/databaseHostLabel'));
$('#databasePortLabel').text($.i18n._('database-source/databasePortLabel')); $('#databasePortLabel').text($.i18n('database-source/databasePortLabel'));
$('#databaseUserLabel').text($.i18n._('database-source/databaseUserLabel')); $('#databaseUserLabel').text($.i18n('database-source/databaseUserLabel'));
$('#databasePasswordLabel').text($.i18n._('database-source/databasePasswordLabel')); $('#databasePasswordLabel').text($.i18n('database-source/databasePasswordLabel'));
$('#databaseNameLabel').text($.i18n._('database-source/databaseNameLabel')); $('#databaseNameLabel').text($.i18n('database-source/databaseNameLabel'));
$('#databaseSchemaLabel').text($.i18n._('database-source/databaseSchemaLabel')); $('#databaseSchemaLabel').text($.i18n('database-source/databaseSchemaLabel'));
$('#databaseTestButton').text($.i18n._('database-source/databaseTestButton')); $('#databaseTestButton').text($.i18n('database-source/databaseTestButton'));
$('#databaseSaveButton').text($.i18n._('database-source/databaseSaveButton')); $('#databaseSaveButton').text($.i18n('database-source/databaseSaveButton'));
$('#databaseConnectButton').text($.i18n._('database-source/databaseConnectButton')); $('#databaseConnectButton').text($.i18n('database-source/databaseConnectButton'));
$('#newConnectionButtonDiv').text($.i18n._('database-source/newConnectionButtonDiv')); $('#newConnectionButtonDiv').text($.i18n('database-source/newConnectionButtonDiv'));
$('#savedConnectionSpan').text($.i18n._('database-source/savedConnectionSpan')); $('#savedConnectionSpan').text($.i18n('database-source/savedConnectionSpan'));
this._elmts.newConnectionButton.click(function(evt) { this._elmts.newConnectionButton.click(function(evt) {
@ -129,7 +129,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
if(self._validateNewConnectionForm() == true){ if(self._validateNewConnectionForm() == true){
var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value); var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value);
if (connectionNameInput.length === 0) { if (connectionNameInput.length === 0) {
window.alert($.i18n._('database-source/alert-connection-name')); window.alert($.i18n('database-source/alert-connection-name'));
} else{ } else{
self._saveConnection(self._getConnectionInfo()); self._saveConnection(self._getConnectionInfo());
} }
@ -152,7 +152,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
// if(jdbcQueryInfo.query && jdbcQueryInfo.query.length > 0 ) { // if(jdbcQueryInfo.query && jdbcQueryInfo.query.length > 0 ) {
// self._executeQuery(jdbcQueryInfo); // self._executeQuery(jdbcQueryInfo);
// }else{ // }else{
// window.alert($.i18n._('database-source/alert-query')); // window.alert($.i18n('database-source/alert-query'));
// } // }
if(self.validateQuery(jdbcQueryInfo.query)) { if(self.validateQuery(jdbcQueryInfo.query)) {
@ -171,7 +171,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
if(self._validateNewConnectionForm() == true){ if(self._validateNewConnectionForm() == true){
var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value); var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value);
if (connectionNameInput.length === 0) { if (connectionNameInput.length === 0) {
window.alert($.i18n._('database-source/alert-connection-name')); window.alert($.i18n('database-source/alert-connection-name'));
} else{ } else{
self._editConnection(self._getConnectionInfo()); self._editConnection(self._getConnectionInfo());
} }
@ -198,38 +198,38 @@ Refine.DatabaseSourceUI.prototype.focus = function() {
Refine.DatabaseSourceUI.prototype.validateQuery = function(query) { Refine.DatabaseSourceUI.prototype.validateQuery = function(query) {
//alert("query::" + query); //alert("query::" + query);
if(!query || query.length <= 0 ) { if(!query || query.length <= 0 ) {
window.alert($.i18n._('database-source/alert-query')); window.alert($.i18n('database-source/alert-query'));
return false; return false;
} }
var allCapsQuery = query.toUpperCase(); var allCapsQuery = query.toUpperCase();
if(allCapsQuery.indexOf('DROP') > -1){ if(allCapsQuery.indexOf('DROP') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " DROP"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " DROP");
return false; return false;
}else if(allCapsQuery.indexOf('TRUNCATE') > -1){ }else if(allCapsQuery.indexOf('TRUNCATE') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " TRUNCATE"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " TRUNCATE");
return false; return false;
}else if(allCapsQuery.indexOf('DELETE') > -1){ }else if(allCapsQuery.indexOf('DELETE') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " DELETE"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " DELETE");
return false; return false;
}else if(allCapsQuery.indexOf('ROLLBACK') > -1){ }else if(allCapsQuery.indexOf('ROLLBACK') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " ROLLBACK"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " ROLLBACK");
return false; return false;
}else if(allCapsQuery.indexOf('SHUTDOWN') > -1){ }else if(allCapsQuery.indexOf('SHUTDOWN') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " SHUTDOWN"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " SHUTDOWN");
return false; return false;
}else if(allCapsQuery.indexOf('INSERT') > -1){ }else if(allCapsQuery.indexOf('INSERT') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " INSERT"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " INSERT");
return false; return false;
}else if(allCapsQuery.indexOf('ALTER') > -1){ }else if(allCapsQuery.indexOf('ALTER') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " ALTER"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " ALTER");
return false; return false;
}else if(allCapsQuery.indexOf('UPDATE') > -1){ }else if(allCapsQuery.indexOf('UPDATE') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " UPDATE"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " UPDATE");
return false; return false;
}else if(allCapsQuery.indexOf('LIMIT') > -1){ }else if(allCapsQuery.indexOf('LIMIT') > -1){
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " LIMIT"); window.alert($.i18n('database-source/alert-invalid-query-keyword') + " LIMIT");
return false; return false;
} }
@ -238,12 +238,12 @@ Refine.DatabaseSourceUI.prototype.validateQuery = function(query) {
// || (allCapsQuery.indexOf('SHUTDOWN') > -1) || (allCapsQuery.indexOf('INSERT') > -1) // || (allCapsQuery.indexOf('SHUTDOWN') > -1) || (allCapsQuery.indexOf('INSERT') > -1)
// || (allCapsQuery.indexOf('ALTER') > -1) || (allCapsQuery.indexOf('UPDATE') > -1)) // || (allCapsQuery.indexOf('ALTER') > -1) || (allCapsQuery.indexOf('UPDATE') > -1))
// { // {
// window.alert($.i18n._('database-source/alert-invalid-query-keyword')); // window.alert($.i18n('database-source/alert-invalid-query-keyword'));
// return false; // return false;
// } // }
if(!allCapsQuery.startsWith('SELECT')) { if(!allCapsQuery.startsWith('SELECT')) {
window.alert($.i18n._('database-source/alert-invalid-query-select')); window.alert($.i18n('database-source/alert-invalid-query-select'));
return false; return false;
} }
@ -273,7 +273,7 @@ Refine.DatabaseSourceUI.prototype._editConnection = function(connectionInfo) {
}) })
$( "#menuListUl" ).append(items.join('')); $( "#menuListUl" ).append(items.join(''));
window.alert($.i18n._('database-source/alert-connection-edit')); window.alert($.i18n('database-source/alert-connection-edit'));
} }
} }
}).fail(function( jqXhr, textStatus, errorThrown ){ }).fail(function( jqXhr, textStatus, errorThrown ){
@ -286,7 +286,7 @@ Refine.DatabaseSourceUI.prototype._executeQuery = function(jdbcQueryInfo) {
var self = this; var self = this;
//remove start line //remove start line
var dismiss = DialogSystem.showBusy($.i18n._('database-import/checking')); var dismiss = DialogSystem.showBusy($.i18n('database-import/checking'));
//$("#executeQueryBtn").text('Please wait ...').attr('disabled','disabled'); //$("#executeQueryBtn").text('Please wait ...').attr('disabled','disabled');
$.post( $.post(
@ -467,16 +467,16 @@ Refine.DatabaseSourceUI.prototype._validateNewConnectionForm = function() {
var initialSchemaInput = $.trim(self._elmts.initialSchemaInput[0].value); var initialSchemaInput = $.trim(self._elmts.initialSchemaInput[0].value);
if (databaseHostInput.length === 0) { if (databaseHostInput.length === 0) {
window.alert($.i18n._('database-source/alert-server')); window.alert($.i18n('database-source/alert-server'));
return false; return false;
}else if(databasePortInput.length === 0){ }else if(databasePortInput.length === 0){
window.alert($.i18n._('database-source/alert-port')); window.alert($.i18n('database-source/alert-port'));
return false; return false;
}else if(databaseUserInput.length === 0){ }else if(databaseUserInput.length === 0){
window.alert($.i18n._('database-source/alert-user')); window.alert($.i18n('database-source/alert-user'));
return false; return false;
}else if(initialDatabaseInput.length === 0){ }else if(initialDatabaseInput.length === 0){
window.alert($.i18n._('database-source/alert-initial-database')); window.alert($.i18n('database-source/alert-initial-database'));
return false; return false;
} }
else{ else{

5
extensions/database/module/scripts/project/database-exporters.js
View File

@ -37,10 +37,11 @@ $.ajax({
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
dictionary = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
// End internationalization // End internationalization
(function() { (function() {

32
extensions/gdata/module/scripts/index/gdata-source-ui.js
View File

@ -41,17 +41,17 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) {
this._body.html(DOM.loadHTML("gdata", "scripts/index/import-from-gdata-form.html")); this._body.html(DOM.loadHTML("gdata", "scripts/index/import-from-gdata-form.html"));
this._elmts = DOM.bind(this._body); this._elmts = DOM.bind(this._body);
$('#gdata-title').text($.i18n._('gdata-import/title')); $('#gdata-title').text($.i18n('gdata-import/title'));
$('#gdata-import').html($.i18n._('gdata-import/import-by-url')); $('#gdata-import').html($.i18n('gdata-import/import-by-url'));
$('#gdata-next').html($.i18n._("gdata-import")["next->"]); $('#gdata-next').html($.i18n('gdata-import')["next->"]);
$('#gdata-auth-doc').text($.i18n._('gdata-import/auth-doc')); $('#gdata-auth-doc').text($.i18n('gdata-import/auth-doc'));
$('#gdata-please').text($.i18n._('gdata-import/please')); $('#gdata-please').text($.i18n('gdata-import/please'));
$('#gdata-signin-btn').text($.i18n._('gdata-import/sign-in')); $('#gdata-signin-btn').text($.i18n('gdata-import/sign-in'));
$('#gdata-access-data').text($.i18n._('gdata-import/access-data')); $('#gdata-access-data').text($.i18n('gdata-import/access-data'));
$('#gdata-retrieving').text($.i18n._('gdata-import/retrieving')); $('#gdata-retrieving').text($.i18n('gdata-import/retrieving'));
$('#gdata-signout').text($.i18n._('gdata-import/sign-out')); $('#gdata-signout').text($.i18n('gdata-import/sign-out'));
$('#gdata-resignin').text($.i18n._('gdata-import/re-sign-in')); $('#gdata-resignin').text($.i18n('gdata-import/re-sign-in'));
$('#gdata-another-account').text($.i18n._('gdata-import/another-account')); $('#gdata-another-account').text($.i18n('gdata-import/another-account'));
var self = this; var self = this;
this._body.find('.gdata-signin.button').click(function() { this._body.find('.gdata-signin.button').click(function() {
@ -74,7 +74,7 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) {
this._elmts.urlNextButton.click(function(evt) { this._elmts.urlNextButton.click(function(evt) {
var url = $.trim(self._elmts.urlInput[0].value); var url = $.trim(self._elmts.urlInput[0].value);
if (url.length === 0) { if (url.length === 0) {
window.alert($.i18n._('gdata-source/alert-url')); window.alert($.i18n('gdata-source/alert-url'));
} else { } else {
var doc = {}; var doc = {};
doc.docSelfLink = url; doc.docSelfLink = url;
@ -130,10 +130,10 @@ Refine.GDataSourceUI.prototype._renderDocuments = function(o) {
var table = $( var table = $(
'<table><tr>' + '<table><tr>' +
'<th></th>' + // starred '<th></th>' + // starred
'<th>'+$.i18n._('gdata-source/type')+'</th>' + '<th>'+$.i18n('gdata-source/type')+'</th>' +
'<th>'+$.i18n._('gdata-source/title')+'</th>' + '<th>'+$.i18n('gdata-source/title')+'</th>' +
'<th>'+$.i18n._('gdata-source/authors')+'</th>' + '<th>'+$.i18n('gdata-source/authors')+'</th>' +
'<th>'+$.i18n._('gdata-source/updated')+'</th>' + '<th>'+$.i18n('gdata-source/updated')+'</th>' +
'</tr></table>' '</tr></table>'
).appendTo(this._elmts.listingContainer)[0]; ).appendTo(this._elmts.listingContainer)[0];

49
extensions/gdata/module/scripts/index/importing-controller.js
View File

@ -44,10 +44,11 @@ $.ajax({
// lang : lang // lang : lang
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
lang = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
// End internationalization // End internationalization
Refine.GDataImportingController = function(createProjectUI) { Refine.GDataImportingController = function(createProjectUI) {
@ -61,13 +62,13 @@ Refine.GDataImportingController = function(createProjectUI) {
ui: new Refine.GDataSourceUI(this) ui: new Refine.GDataSourceUI(this)
}); });
$('#gdata-authorize').text($.i18n._('gdata-auth/authorize-label')); $('#gdata-authorize').text($.i18n('gdata-auth/authorize-label'));
$('#gdata-authorized').text($.i18n._('gdata-auth/authorized-label')); $('#gdata-authorized').text($.i18n('gdata-auth/authorized-label'));
}; };
Refine.CreateProjectUI.controllers.push(Refine.GDataImportingController); Refine.CreateProjectUI.controllers.push(Refine.GDataImportingController);
Refine.GDataImportingController.prototype.startImportingDocument = function(doc) { Refine.GDataImportingController.prototype.startImportingDocument = function(doc) {
var dismiss = DialogSystem.showBusy($.i18n._('gdata-import/preparing')); var dismiss = DialogSystem.showBusy($.i18n('gdata-import/preparing'));
var self = this; var self = this;
$.post( $.post(
@ -166,25 +167,25 @@ Refine.GDataImportingController.prototype._showParsingPanel = function() {
this._parsingPanelElmts = DOM.bind(this._parsingPanel); this._parsingPanelElmts = DOM.bind(this._parsingPanel);
if(this._doc.type != 'table'){ if(this._doc.type != 'table'){
this._parsingPanelElmts.gdata_worksheet.html($.i18n._('gdata-parsing/worksheet')); this._parsingPanelElmts.gdata_worksheet.html($.i18n('gdata-parsing/worksheet'));
this._parsingPanelElmts.gdata_ignore_first.html($.i18n._('gdata-parsing/ignore-first')); this._parsingPanelElmts.gdata_ignore_first.html($.i18n('gdata-parsing/ignore-first'));
this._parsingPanelElmts.gdata_ignore.html($.i18n._('gdata-parsing/ignore')); this._parsingPanelElmts.gdata_ignore.html($.i18n('gdata-parsing/ignore'));
this._parsingPanelElmts.gdata_parse_next.html($.i18n._('gdata-parsing/parse-next')); this._parsingPanelElmts.gdata_parse_next.html($.i18n('gdata-parsing/parse-next'));
this._parsingPanelElmts.gdata_parse.html($.i18n._('gdata-parsing/parse')); this._parsingPanelElmts.gdata_parse.html($.i18n('gdata-parsing/parse'));
} }
this._parsingPanelElmts.startOverButton.html($.i18n._('gdata-parsing/start-over')); this._parsingPanelElmts.startOverButton.html($.i18n('gdata-parsing/start-over'));
this._parsingPanelElmts.gdata_conf_pars.html($.i18n._('gdata-parsing/conf-pars')); this._parsingPanelElmts.gdata_conf_pars.html($.i18n('gdata-parsing/conf-pars'));
this._parsingPanelElmts.gdata_proj_name.html($.i18n._('gdata-parsing/proj-name')); this._parsingPanelElmts.gdata_proj_name.html($.i18n('gdata-parsing/proj-name'));
this._parsingPanelElmts.createProjectButton.html($.i18n._('gdata-parsing/create-proj')); this._parsingPanelElmts.createProjectButton.html($.i18n('gdata-parsing/create-proj'));
this._parsingPanelElmts.gdata_options.html($.i18n._('gdata-parsing/option')); this._parsingPanelElmts.gdata_options.html($.i18n('gdata-parsing/option'));
this._parsingPanelElmts.previewButton.html($.i18n._('gdata-parsing/preview-button')); this._parsingPanelElmts.previewButton.html($.i18n('gdata-parsing/preview-button'));
this._parsingPanelElmts.gdata_updating.html($.i18n._('gdata-parsing/updating-preview')); this._parsingPanelElmts.gdata_updating.html($.i18n('gdata-parsing/updating-preview'));
this._parsingPanelElmts.gdata_discard_next.html($.i18n._('gdata-parsing/discard-next')); this._parsingPanelElmts.gdata_discard_next.html($.i18n('gdata-parsing/discard-next'));
this._parsingPanelElmts.gdata_discard.html($.i18n._('gdata-parsing/discard')); this._parsingPanelElmts.gdata_discard.html($.i18n('gdata-parsing/discard'));
this._parsingPanelElmts.gdata_limit_next.html($.i18n._('gdata-parsing/limit-next')); this._parsingPanelElmts.gdata_limit_next.html($.i18n('gdata-parsing/limit-next'));
this._parsingPanelElmts.gdata_limit.html($.i18n._('gdata-parsing/limit')); this._parsingPanelElmts.gdata_limit.html($.i18n('gdata-parsing/limit'));
this._parsingPanelElmts.gdata_store_row.html($.i18n._('gdata-parsing/store-row')); this._parsingPanelElmts.gdata_store_row.html($.i18n('gdata-parsing/store-row'));
this._parsingPanelElmts.gdata_store_cell.html($.i18n._('gdata-parsing/store-cell')); this._parsingPanelElmts.gdata_store_cell.html($.i18n('gdata-parsing/store-cell'));
if (this._parsingPanelResizer) { if (this._parsingPanelResizer) {
$(window).unbind('resize', this._parsingPanelResizer); $(window).unbind('resize', this._parsingPanelResizer);
@ -419,7 +420,7 @@ Refine.GDataImportingController.prototype._createProject = function() {
}, },
1000 1000
); );
self._createProjectUI.showImportProgressPanel($.i18n._('gdata-import/creating'), function() { self._createProjectUI.showImportProgressPanel($.i18n('gdata-import/creating'), function() {
// stop the timed polling // stop the timed polling
window.clearInterval(timerID); window.clearInterval(timerID);

17
extensions/gdata/module/scripts/project/exporters.js
View File

@ -41,10 +41,11 @@ $.ajax({
// lang : lang // lang : lang
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
lang = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
// End internationalization // End internationalization
(function() { (function() {
@ -52,7 +53,7 @@ $.i18n.setDictionary(dictionary);
var doUpload = function() { var doUpload = function() {
var name = window.prompt(prompt, theProject.metadata.name); var name = window.prompt(prompt, theProject.metadata.name);
if (name) { if (name) {
var dismiss = DialogSystem.showBusy($.i18n._('gdata-exporter/uploading')); var dismiss = DialogSystem.showBusy($.i18n('gdata-exporter/uploading'));
$.post( $.post(
"command/gdata/upload", "command/gdata/upload",
{ {
@ -68,7 +69,7 @@ $.i18n.setDictionary(dictionary);
if (o.url) { if (o.url) {
window.open(o.url, '_blank'); window.open(o.url, '_blank');
} else { } else {
alert($.i18n._('gdata-exporter/upload-error') + o.message) alert($.i18n('gdata-exporter/upload-error') + o.message)
} }
onDone(); onDone();
}, },
@ -86,16 +87,16 @@ $.i18n.setDictionary(dictionary);
CustomTabularExporterDialog.uploadTargets.push({ CustomTabularExporterDialog.uploadTargets.push({
id: 'gdata/google-spreadsheet', id: 'gdata/google-spreadsheet',
label: $.i18n._('gdata-exporter/new-spreadsheet'), label: $.i18n('gdata-exporter/new-spreadsheet'),
handler: function(options, exportAllRows, onDone) { handler: function(options, exportAllRows, onDone) {
handleUpload(options, exportAllRows, onDone, $.i18n._('gdata-exporter/enter-spreadsheet')); handleUpload(options, exportAllRows, onDone, $.i18n('gdata-exporter/enter-spreadsheet'));
} }
}); });
CustomTabularExporterDialog.uploadTargets.push({ CustomTabularExporterDialog.uploadTargets.push({
id: 'gdata/fusion-table', id: 'gdata/fusion-table',
label: $.i18n._('gdata-exporter/new-fusion'), label: $.i18n('gdata-exporter/new-fusion'),
handler: function(options, exportAllRows, onDone) { handler: function(options, exportAllRows, onDone) {
handleUpload(options, exportAllRows, onDone, $.i18n._('gdata-exporter/enter-fusion')); handleUpload(options, exportAllRows, onDone, $.i18n('gdata-exporter/enter-fusion'));
} }
}); });
})(); })();

14
extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js
View File

@ -5,11 +5,11 @@ ImportSchemaDialog.launch = function() {
var frame = $(DOM.loadHTML("wikidata", "scripts/dialogs/import-schema-dialog.html")); var frame = $(DOM.loadHTML("wikidata", "scripts/dialogs/import-schema-dialog.html"));
var elmts = this._elmts = DOM.bind(frame); var elmts = this._elmts = DOM.bind(frame);
this._elmts.dialogHeader.text($.i18n._('import-wikibase-schema/dialog-header')); this._elmts.dialogHeader.text($.i18n('import-wikibase-schema/dialog-header'));
this._elmts.fileLabel.html($.i18n._('import-wikibase-schema/file-label')); this._elmts.fileLabel.html($.i18n('import-wikibase-schema/file-label'));
this._elmts.schemaLabel.text($.i18n._('import-wikibase-schema/schema-label')); this._elmts.schemaLabel.text($.i18n('import-wikibase-schema/schema-label'));
this._elmts.cancelButton.text($.i18n._('core-project/cancel')); this._elmts.cancelButton.text($.i18n('core-project/cancel'));
this._elmts.importButton.text($.i18n._('import-wikibase-schema/import')); this._elmts.importButton.text($.i18n('import-wikibase-schema/import'));
this._level = DialogSystem.showDialog(frame); this._level = DialogSystem.showDialog(frame);
@ -38,7 +38,7 @@ ImportSchemaDialog.launch = function() {
try { try {
schema = JSON.parse(elmts.schemaTextarea.val()); schema = JSON.parse(elmts.schemaTextarea.val());
} catch(e) { } catch(e) {
elmts.invalidSchema.text($.i18n._('import-wikibase-schema/invalid-schema')); elmts.invalidSchema.text($.i18n('import-wikibase-schema/invalid-schema'));
return; return;
} }
@ -55,7 +55,7 @@ ImportSchemaDialog.launch = function() {
dismiss(); dismiss();
}, },
onError: function(e) { onError: function(e) {
elmts.invalidSchema.text($.i18n._('import-wikibase-schema/invalid-schema')); elmts.invalidSchema.text($.i18n('import-wikibase-schema/invalid-schema'));
}, },
} }
); );

28
extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js
View File

@ -19,19 +19,19 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca
var elmts = this._elmts = DOM.bind(frame); var elmts = this._elmts = DOM.bind(frame);
ManageAccountDialog.firstLaunch = false; ManageAccountDialog.firstLaunch = false;
this._elmts.dialogHeader.text($.i18n._('wikidata-account/dialog-header')); this._elmts.dialogHeader.text($.i18n('wikidata-account/dialog-header'));
this._elmts.explainLogIn.html($.i18n._('wikidata-account/explain-log-in')); this._elmts.explainLogIn.html($.i18n('wikidata-account/explain-log-in'));
this._elmts.usernameLabel.text($.i18n._('wikidata-account/username-label')); this._elmts.usernameLabel.text($.i18n('wikidata-account/username-label'));
this._elmts.usernameInput.attr("placeholder", $.i18n._('wikidata-account/username-placeholder')); this._elmts.usernameInput.attr("placeholder", $.i18n('wikidata-account/username-placeholder'));
this._elmts.passwordLabel.text($.i18n._('wikidata-account/password-label')); this._elmts.passwordLabel.text($.i18n('wikidata-account/password-label'));
this._elmts.passwordInput.attr("placeholder", $.i18n._('wikidata-account/password-placeholder')); this._elmts.passwordInput.attr("placeholder", $.i18n('wikidata-account/password-placeholder'));
this._elmts.rememberCredentialsLabel.text($.i18n._('wikidata-account/remember-credentials-label')); this._elmts.rememberCredentialsLabel.text($.i18n('wikidata-account/remember-credentials-label'));
this._elmts.dialogHeader.text($.i18n._('wikidata-account/dialog-header')); this._elmts.dialogHeader.text($.i18n('wikidata-account/dialog-header'));
this._elmts.cancelButton1.text($.i18n._('wikidata-account/close')); this._elmts.cancelButton1.text($.i18n('wikidata-account/close'));
this._elmts.cancelButton2.text($.i18n._('wikidata-account/close')); this._elmts.cancelButton2.text($.i18n('wikidata-account/close'));
this._elmts.loggedInAs.text($.i18n._('wikidata-account/logged-in-as')); this._elmts.loggedInAs.text($.i18n('wikidata-account/logged-in-as'));
this._elmts.logoutButton.text($.i18n._('wikidata-account/log-out')); this._elmts.logoutButton.text($.i18n('wikidata-account/log-out'));
this._elmts.loginButton.text($.i18n._('wikidata-account/log-in')); this._elmts.loginButton.text($.i18n('wikidata-account/log-in'));
this._level = DialogSystem.showDialog(frame); this._level = DialogSystem.showDialog(frame);
@ -86,7 +86,7 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca
ManageAccountDialog.isLoggedIn = function(callback) { ManageAccountDialog.isLoggedIn = function(callback) {
var discardWaiter = function() { }; var discardWaiter = function() { };
if(ManageAccountDialog.firstLogin) { if(ManageAccountDialog.firstLogin) {
discardWaiter = DialogSystem.showBusy($.i18n._('wikidata-account/connecting-to-wikidata')); discardWaiter = DialogSystem.showBusy($.i18n('wikidata-account/connecting-to-wikidata'));
} }
$.get( $.get(
"command/wikidata/login", "command/wikidata/login",

16
extensions/wikidata/module/scripts/dialogs/perform-edits-dialog.js
View File

@ -11,12 +11,12 @@ PerformEditsDialog.launch = function(logged_in_username, max_severity) {
this._level = DialogSystem.showDialog(frame); this._level = DialogSystem.showDialog(frame);
this._elmts.dialogHeader.text($.i18n._('perform-wikidata-edits/dialog-header')); this._elmts.dialogHeader.text($.i18n('perform-wikidata-edits/dialog-header'));
this._elmts.loggedInAs.text($.i18n._('perform-wikidata-edits/logged-in-as')); this._elmts.loggedInAs.text($.i18n('perform-wikidata-edits/logged-in-as'));
this._elmts.editSummaryLabel.text($.i18n._('perform-wikidata-edits/edit-summary-label')); this._elmts.editSummaryLabel.text($.i18n('perform-wikidata-edits/edit-summary-label'));
this._elmts.editSummary.attr('placeholder', $.i18n._('perform-wikidata-edits/edit-summary-placeholder')); this._elmts.editSummary.attr('placeholder', $.i18n('perform-wikidata-edits/edit-summary-placeholder'));
this._elmts.performEditsButton.text($.i18n._('perform-wikidata-edits/perform-edits')); this._elmts.performEditsButton.text($.i18n('perform-wikidata-edits/perform-edits'));
this._elmts.cancelButton.text($.i18n._('perform-wikidata-edits/cancel')); this._elmts.cancelButton.text($.i18n('perform-wikidata-edits/cancel'));
var dismiss = function() { var dismiss = function() {
DialogSystem.dismissUntil(self._level - 1); DialogSystem.dismissUntil(self._level - 1);
@ -65,7 +65,7 @@ PerformEditsDialog.launch = function(logged_in_username, max_severity) {
PerformEditsDialog.updateEditCount = function(edit_count) { PerformEditsDialog.updateEditCount = function(edit_count) {
this._elmts.reviewYourEdits.html( this._elmts.reviewYourEdits.html(
$.i18n._('perform-wikidata-edits/review-your-edits') $.i18n('perform-wikidata-edits/review-your-edits')
.replace('{nb_edits}', edit_count)); .replace('{nb_edits}', edit_count));
} }
@ -93,7 +93,7 @@ PerformEditsDialog.checkAndLaunch = function () {
var onSaved = function() { var onSaved = function() {
ManageAccountDialog.ensureLoggedIn(function(logged_in_username) { ManageAccountDialog.ensureLoggedIn(function(logged_in_username) {
if (logged_in_username) { if (logged_in_username) {
var discardWaiter = DialogSystem.showBusy($.i18n._('perform-wikidata-edits/analyzing-edits')); var discardWaiter = DialogSystem.showBusy($.i18n('perform-wikidata-edits/analyzing-edits'));
$.post( $.post(
"command/wikidata/preview-wikibase-schema?" + $.param({ project: theProject.id }), "command/wikidata/preview-wikibase-schema?" + $.param({ project: theProject.id }),
{ engine: JSON.stringify(ui.browsingEngine.getJSON()) }, { engine: JSON.stringify(ui.browsingEngine.getJSON()) },

82
extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js
View File

@ -66,12 +66,12 @@ SchemaAlignmentDialog.setUpTabs = function() {
var schemaButton = $('<div></div>') var schemaButton = $('<div></div>')
.addClass('main-view-panel-tab-header') .addClass('main-view-panel-tab-header')
.attr('href', '#wikidata-schema-panel') .attr('href', '#wikidata-schema-panel')
.text($.i18n._('wikidata-schema/schema-tab-header')) .text($.i18n('wikidata-schema/schema-tab-header'))
.appendTo(this._toolPanel); .appendTo(this._toolPanel);
var issuesButton = $('<div></div>') var issuesButton = $('<div></div>')
.addClass('main-view-panel-tab-header') .addClass('main-view-panel-tab-header')
.attr('href', '#wikidata-issues-panel') .attr('href', '#wikidata-issues-panel')
.text($.i18n._('wikidata-schema/warnings-tab-header')+' ') .text($.i18n('wikidata-schema/warnings-tab-header')+' ')
.appendTo(this._toolPanel); .appendTo(this._toolPanel);
this.issuesTabCount = $('<span></span>') this.issuesTabCount = $('<span></span>')
.addClass('schema-alignment-total-warning-count') .addClass('schema-alignment-total-warning-count')
@ -84,7 +84,7 @@ SchemaAlignmentDialog.setUpTabs = function() {
var previewButton = $('<div></div>') var previewButton = $('<div></div>')
.addClass('main-view-panel-tab-header') .addClass('main-view-panel-tab-header')
.attr('href', '#wikidata-preview-panel') .attr('href', '#wikidata-preview-panel')
.text($.i18n._('wikidata-schema/edits-preview-tab-header')) .text($.i18n('wikidata-schema/edits-preview-tab-header'))
.appendTo(this._toolPanel); .appendTo(this._toolPanel);
this.previewSpinner = $('<img />') this.previewSpinner = $('<img />')
.attr('src', 'images/large-spinner.gif') .attr('src', 'images/large-spinner.gif')
@ -93,7 +93,7 @@ SchemaAlignmentDialog.setUpTabs = function() {
this._unsavedIndicator = $('<span></span>') this._unsavedIndicator = $('<span></span>')
.html('&nbsp;*') .html('&nbsp;*')
.attr('title', $.i18n._('wikidata-schema/unsaved-changes-alt')) .attr('title', $.i18n('wikidata-schema/unsaved-changes-alt'))
.hide() .hide()
.appendTo(schemaButton); .appendTo(schemaButton);
@ -108,22 +108,22 @@ SchemaAlignmentDialog.setUpTabs = function() {
*/ */
var schemaTab = $(DOM.loadHTML("wikidata", "scripts/schema-alignment-tab.html")).appendTo(this._schemaPanel); var schemaTab = $(DOM.loadHTML("wikidata", "scripts/schema-alignment-tab.html")).appendTo(this._schemaPanel);
var schemaElmts = this._schemaElmts = DOM.bind(schemaTab); var schemaElmts = this._schemaElmts = DOM.bind(schemaTab);
schemaElmts.dialogExplanation.text($.i18n._('wikidata-schema/dialog-explanation')); schemaElmts.dialogExplanation.text($.i18n('wikidata-schema/dialog-explanation'));
this._plusButton($.i18n._('wikidata-schema/add-item-button'), schemaElmts.addItemButton); this._plusButton($.i18n('wikidata-schema/add-item-button'), schemaElmts.addItemButton);
schemaElmts.addItemButton.click(function(e) { schemaElmts.addItemButton.click(function(e) {
self._addItem(); self._addItem();
SchemaAlignmentDialog._hasChanged(); SchemaAlignmentDialog._hasChanged();
e.preventDefault(); e.preventDefault();
}); });
schemaElmts.saveButton schemaElmts.saveButton
.text($.i18n._('wikidata-schema/save-button')) .text($.i18n('wikidata-schema/save-button'))
.attr('title', $.i18n._('wikidata-schema/save-schema-alt')) .attr('title', $.i18n('wikidata-schema/save-schema-alt'))
.prop('disabled', true) .prop('disabled', true)
.addClass('disabled') .addClass('disabled')
.click(function() { SchemaAlignmentDialog._save(); }); .click(function() { SchemaAlignmentDialog._save(); });
schemaElmts.discardButton schemaElmts.discardButton
.text($.i18n._('wikidata-schema/discard-button')) .text($.i18n('wikidata-schema/discard-button'))
.attr('title', $.i18n._('wikidata-schema/discard-schema-changes-alt')) .attr('title', $.i18n('wikidata-schema/discard-schema-changes-alt'))
.prop('disabled', true) .prop('disabled', true)
.addClass('disabled') .addClass('disabled')
.click(function() { SchemaAlignmentDialog._discardChanges(); }); .click(function() { SchemaAlignmentDialog._discardChanges(); });
@ -141,7 +141,7 @@ SchemaAlignmentDialog.setUpTabs = function() {
*/ */
var issuesTab = $(DOM.loadHTML("wikidata", "scripts/issues-tab.html")).appendTo(this._issuesPanel); var issuesTab = $(DOM.loadHTML("wikidata", "scripts/issues-tab.html")).appendTo(this._issuesPanel);
var issuesElmts = this._issuesElmts = DOM.bind(issuesTab); var issuesElmts = this._issuesElmts = DOM.bind(issuesTab);
issuesElmts.invalidSchemaWarningIssues.text($.i18n._('wikidata-schema/invalid-schema-warning-issues')); issuesElmts.invalidSchemaWarningIssues.text($.i18n('wikidata-schema/invalid-schema-warning-issues'));
/** /**
* Init the preview tab * Init the preview tab
@ -149,7 +149,7 @@ SchemaAlignmentDialog.setUpTabs = function() {
var previewTab = $(DOM.loadHTML("wikidata", "scripts/preview-tab.html")).appendTo(this._previewPanel); var previewTab = $(DOM.loadHTML("wikidata", "scripts/preview-tab.html")).appendTo(this._previewPanel);
var previewElmts = this._previewElmts = DOM.bind(previewTab); var previewElmts = this._previewElmts = DOM.bind(previewTab);
SchemaAlignmentDialog.updateNbEdits(0); SchemaAlignmentDialog.updateNbEdits(0);
previewElmts.invalidSchemaWarningPreview.text($.i18n._('wikidata-schema/invalid-schema-warning-preview')); previewElmts.invalidSchemaWarningPreview.text($.i18n('wikidata-schema/invalid-schema-warning-preview'));
this._previewPanes = $(".schema-alignment-dialog-preview"); this._previewPanes = $(".schema-alignment-dialog-preview");
@ -223,7 +223,7 @@ SchemaAlignmentDialog.launch = function(onDone) {
var beforeUnload = function(e) { var beforeUnload = function(e) {
if (SchemaAlignmentDialog.isSetUp() && SchemaAlignmentDialog._hasUnsavedChanges === true) { if (SchemaAlignmentDialog.isSetUp() && SchemaAlignmentDialog._hasUnsavedChanges === true) {
return (e = $.i18n._('wikidata-schema/unsaved-warning')); return (e = $.i18n('wikidata-schema/unsaved-warning'));
} }
}; };
@ -266,7 +266,7 @@ SchemaAlignmentDialog._save = function(onDone) {
if (onDone) onDone(); if (onDone) onDone();
}, },
onError: function(e) { onError: function(e) {
alert($.i18n._('wikidata-schema/incomplete-schema-could-not-be-saved')); alert($.i18n('wikidata-schema/incomplete-schema-could-not-be-saved'));
}, },
} }
); );
@ -310,7 +310,7 @@ SchemaAlignmentDialog._makeDeleteButton = function (noText) {
); );
if(noText === undefined) { if(noText === undefined) {
button.append( button.append(
$('<span></span>').text($.i18n._('wikidata-schema/remove'))); $('<span></span>').text($.i18n('wikidata-schema/remove')));
} }
return button; return button;
} }
@ -347,9 +347,9 @@ SchemaAlignmentDialog._addItem = function(json) {
// Terms // Terms
$('<span></span>').addClass('wbs-namedesc-header') $('<span></span>').addClass('wbs-namedesc-header')
.text($.i18n._('wikidata-schema/terms-header')).appendTo(right); .text($.i18n('wikidata-schema/terms-header')).appendTo(right);
$('<div></div>').addClass('wbs-namedesc-container') $('<div></div>').addClass('wbs-namedesc-container')
.attr('data-emptyplaceholder', $.i18n._('wikidata-schema/empty-terms')) .attr('data-emptyplaceholder', $.i18n('wikidata-schema/empty-terms'))
.appendTo(right); .appendTo(right);
var termToolbar = $('<div></div>').addClass('wbs-toolbar').appendTo(right); var termToolbar = $('<div></div>').addClass('wbs-toolbar').appendTo(right);
var addNamedescButton = $('<a></a>').addClass('wbs-add-namedesc') var addNamedescButton = $('<a></a>').addClass('wbs-add-namedesc')
@ -358,16 +358,16 @@ SchemaAlignmentDialog._addItem = function(json) {
e.preventDefault(); e.preventDefault();
}).appendTo(termToolbar); }).appendTo(termToolbar);
SchemaAlignmentDialog._plusButton( SchemaAlignmentDialog._plusButton(
$.i18n._('wikidata-schema/add-term'), addNamedescButton); $.i18n('wikidata-schema/add-term'), addNamedescButton);
// Clear the float // Clear the float
$('<div></div>').attr('style', 'clear: right').appendTo(right); $('<div></div>').attr('style', 'clear: right').appendTo(right);
// Statements // Statements
$('<div></div>').addClass('wbs-statements-header') $('<div></div>').addClass('wbs-statements-header')
.text($.i18n._('wikidata-schema/statements-header')).appendTo(right); .text($.i18n('wikidata-schema/statements-header')).appendTo(right);
$('<div></div>').addClass('wbs-statement-group-container') $('<div></div>').addClass('wbs-statement-group-container')
.attr('data-emptyplaceholder', $.i18n._('wikidata-schema/empty-statements')) .attr('data-emptyplaceholder', $.i18n('wikidata-schema/empty-statements'))
.appendTo(right); .appendTo(right);
var statementToolbar = $('<div></div>').addClass('wbs-toolbar').appendTo(right); var statementToolbar = $('<div></div>').addClass('wbs-toolbar').appendTo(right);
var addStatementButton = $('<a></a>').addClass('wbs-add-statement-group') var addStatementButton = $('<a></a>').addClass('wbs-add-statement-group')
@ -377,7 +377,7 @@ SchemaAlignmentDialog._addItem = function(json) {
}).appendTo(statementToolbar); }).appendTo(statementToolbar);
SchemaAlignmentDialog._plusButton( SchemaAlignmentDialog._plusButton(
$.i18n._('wikidata-schema/add-statement'), addStatementButton); $.i18n('wikidata-schema/add-statement'), addStatementButton);
if (statementGroups) { if (statementGroups) {
for(var i = 0; i != statementGroups.length; i++) { for(var i = 0; i != statementGroups.length; i++) {
@ -425,15 +425,15 @@ SchemaAlignmentDialog._addNameDesc = function(item, json) {
var type_input = $('<select></select>').appendTo(type_container); var type_input = $('<select></select>').appendTo(type_container);
$('<option></option>') $('<option></option>')
.attr('value', 'LABEL') .attr('value', 'LABEL')
.text($.i18n._('wikidata-schema/label')) .text($.i18n('wikidata-schema/label'))
.appendTo(type_input); .appendTo(type_input);
$('<option></option>') $('<option></option>')
.attr('value', 'DESCRIPTION') .attr('value', 'DESCRIPTION')
.text($.i18n._('wikidata-schema/description')) .text($.i18n('wikidata-schema/description'))
.appendTo(type_input); .appendTo(type_input);
$('<option></option>') $('<option></option>')
.attr('value', 'ALIAS') .attr('value', 'ALIAS')
.text($.i18n._('wikidata-schema/alias')) .text($.i18n('wikidata-schema/alias'))
.appendTo(type_input); .appendTo(type_input);
type_input.val(type); type_input.val(type);
type_input.on('change', function(e) { type_input.on('change', function(e) {
@ -488,7 +488,7 @@ SchemaAlignmentDialog._addStatementGroup = function(item, json) {
SchemaAlignmentDialog._addStatement(statementContainer, datatype, null); SchemaAlignmentDialog._addStatement(statementContainer, datatype, null);
e.preventDefault(); e.preventDefault();
}).appendTo(toolbar).hide(); }).appendTo(toolbar).hide();
SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-value'), addValueButton); SchemaAlignmentDialog._plusButton($.i18n('wikidata-schema/add-value'), addValueButton);
var removeButton = SchemaAlignmentDialog._makeDeleteButton() var removeButton = SchemaAlignmentDialog._makeDeleteButton()
.addClass('wbs-remove-statement-group') .addClass('wbs-remove-statement-group')
.appendTo(toolbar) .appendTo(toolbar)
@ -561,7 +561,7 @@ SchemaAlignmentDialog._addStatement = function(container, datatype, json) {
SchemaAlignmentDialog._addQualifier(qualifierContainer, null); SchemaAlignmentDialog._addQualifier(qualifierContainer, null);
e.preventDefault(); e.preventDefault();
}).appendTo(toolbar2); }).appendTo(toolbar2);
SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-qualifier'), addQualifierButton); SchemaAlignmentDialog._plusButton($.i18n('wikidata-schema/add-qualifier'), addQualifierButton);
if (qualifiers) { if (qualifiers) {
for (var i = 0; i != qualifiers.length; i++) { for (var i = 0; i != qualifiers.length; i++) {
@ -592,7 +592,7 @@ SchemaAlignmentDialog._addStatement = function(container, datatype, json) {
SchemaAlignmentDialog._updateReferencesNumber(referenceContainer); SchemaAlignmentDialog._updateReferencesNumber(referenceContainer);
e.preventDefault(); e.preventDefault();
}).appendTo(toolbar3); }).appendTo(toolbar3);
SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-reference'), addReferenceButton); SchemaAlignmentDialog._plusButton($.i18n('wikidata-schema/add-reference'), addReferenceButton);
if (references) { if (references) {
for (var i = 0; i != references.length; i++) { for (var i = 0; i != references.length; i++) {
SchemaAlignmentDialog._addReference(referenceContainer, references[i]); SchemaAlignmentDialog._addReference(referenceContainer, references[i]);
@ -688,7 +688,7 @@ SchemaAlignmentDialog._addReference = function(container, json) {
SchemaAlignmentDialog._addQualifier(qualifierContainer, null); SchemaAlignmentDialog._addQualifier(qualifierContainer, null);
e.preventDefault(); e.preventDefault();
}).appendTo(toolbar2); }).appendTo(toolbar2);
SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-reference-snak'), addSnakButton); SchemaAlignmentDialog._plusButton($.i18n('wikidata-schema/add-reference-snak'), addSnakButton);
if (snaks) { if (snaks) {
for (var i = 0; i != snaks.length; i++) { for (var i = 0; i != snaks.length; i++) {
@ -712,7 +712,7 @@ SchemaAlignmentDialog._updateReferencesNumber = function(container) {
var childrenCount = container.children().length; var childrenCount = container.children().length;
var statement = container.parents('.wbs-statement'); var statement = container.parents('.wbs-statement');
var a = statement.find('.wbs-references-toggle a').first(); var a = statement.find('.wbs-references-toggle a').first();
a.html(childrenCount+$.i18n._('wikidata-schema/nb-references')); a.html(childrenCount+$.i18n('wikidata-schema/nb-references'));
} }
/************************ /************************
@ -736,7 +736,7 @@ SchemaAlignmentDialog._getPropertyType = function(pid, callback) {
SchemaAlignmentDialog._initPropertyField = function(inputContainer, targetContainer, initialValue) { SchemaAlignmentDialog._initPropertyField = function(inputContainer, targetContainer, initialValue) {
var input = $('<input></input>').appendTo(inputContainer); var input = $('<input></input>').appendTo(inputContainer);
input.attr("placeholder", $.i18n._('wikidata-schema/property-placeholder')); input.attr("placeholder", $.i18n('wikidata-schema/property-placeholder'));
if (this._reconService !== null) { if (this._reconService !== null) {
endpoint = this._reconService.suggest.property; endpoint = this._reconService.suggest.property;
@ -793,9 +793,9 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue,
if (this._reconService !== null && (mode === "wikibase-item" || mode === "unit")) { if (this._reconService !== null && (mode === "wikibase-item" || mode === "unit")) {
if (mode === "wikibase-item") { if (mode === "wikibase-item") {
input.attr("placeholder", $.i18n._('wikidata-schema/item-or-reconciled-column')); input.attr("placeholder", $.i18n('wikidata-schema/item-or-reconciled-column'));
} else { } else {
input.attr("placeholder", $.i18n._('wikidata-schema/unit')); input.attr("placeholder", $.i18n('wikidata-schema/unit'));
} }
var endpoint = null; var endpoint = null;
endpoint = this._reconService.suggest.entity; endpoint = this._reconService.suggest.entity;
@ -951,20 +951,20 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue,
changedCallback(); changedCallback();
}); });
if (mode === "amount") { if (mode === "amount") {
input.attr("placeholder", $.i18n._('wikidata-schema/amount')); input.attr("placeholder", $.i18n('wikidata-schema/amount'));
SchemaAlignmentDialog.setupStringInputValidation(input, /^[\-+]?\d+(\.\d*)?(E[\-+]\d+)?$/); SchemaAlignmentDialog.setupStringInputValidation(input, /^[\-+]?\d+(\.\d*)?(E[\-+]\d+)?$/);
} else if (mode === "url") { } else if (mode === "url") {
input.attr("placeholder", $.i18n._('wikidata-schema/full-url')); input.attr("placeholder", $.i18n('wikidata-schema/full-url'));
SchemaAlignmentDialog.setupStringInputValidation(input, /^https?:\/\/.+$/); SchemaAlignmentDialog.setupStringInputValidation(input, /^https?:\/\/.+$/);
} else if (mode === "tabular-data") { } else if (mode === "tabular-data") {
input.attr("placeholder", $.i18n._('wikidata-schema/tabular-data-with-prefix')); input.attr("placeholder", $.i18n('wikidata-schema/tabular-data-with-prefix'));
SchemaAlignmentDialog.setupStringInputValidation(input, /^Data:.+$/); SchemaAlignmentDialog.setupStringInputValidation(input, /^Data:.+$/);
} else if (mode === "commonsMedia") { } else if (mode === "commonsMedia") {
input.attr("placeholder", $.i18n._('wikidata-schema/commons-media')); input.attr("placeholder", $.i18n('wikidata-schema/commons-media'));
} else if (mode === "math") { } else if (mode === "math") {
input.attr("placeholder", $.i18n._('wikidata-schema/math-expression')); input.attr("placeholder", $.i18n('wikidata-schema/math-expression'));
} else if (mode === "geo-shape") { } else if (mode === "geo-shape") {
input.attr("placeholder", $.i18n._('wikidata-schema/geoshape-with-prefix')); input.attr("placeholder", $.i18n('wikidata-schema/geoshape-with-prefix'));
SchemaAlignmentDialog.setupStringInputValidation(input, /^Data:.+$/); SchemaAlignmentDialog.setupStringInputValidation(input, /^Data:.+$/);
} else { } else {
SchemaAlignmentDialog.setupStringInputValidation(input, /^.+$/); SchemaAlignmentDialog.setupStringInputValidation(input, /^.+$/);
@ -977,7 +977,7 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue,
mode !== "commonsMedia" && mode !== "commonsMedia" &&
mode !== "geo-shape" && mode !== "geo-shape" &&
mode !== "math") { mode !== "math") {
alert($.i18n._('wikidata-schema/datatype-not-supported-yet')); alert($.i18n('wikidata-schema/datatype-not-supported-yet'));
} }
} }
@ -990,7 +990,7 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue,
column.text(""); column.text("");
column.append($('<div></div>').addClass('wbs-restricted-column-name').text(origText)); column.append($('<div></div>').addClass('wbs-restricted-column-name').text(origText));
var deleteButton = SchemaAlignmentDialog._makeDeleteButton(true).appendTo(column); var deleteButton = SchemaAlignmentDialog._makeDeleteButton(true).appendTo(column);
deleteButton.attr('alt', $.i18n._('wikidata-schema/remove-column')); deleteButton.attr('alt', $.i18n('wikidata-schema/remove-column'));
deleteButton.click(function (e) { deleteButton.click(function (e) {
columnDiv.remove(); columnDiv.remove();
input.show(); input.show();
@ -1118,7 +1118,7 @@ SchemaAlignmentDialog._hasChanged = function() {
SchemaAlignmentDialog.updateNbEdits = function(nb_edits) { SchemaAlignmentDialog.updateNbEdits = function(nb_edits) {
this._previewElmts.previewExplanation.text( this._previewElmts.previewExplanation.text(
$.i18n._('wikidata-schema/preview-explanation').replace('{nb_edits}',nb_edits)); $.i18n('wikidata-schema/preview-explanation').replace('{nb_edits}',nb_edits));
} }
SchemaAlignmentDialog.preview = function() { SchemaAlignmentDialog.preview = function() {

25
extensions/wikidata/module/scripts/menu-bar-extension.js
View File

@ -9,10 +9,11 @@ $.ajax({
// lang : lang // lang : lang
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
lang = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
@ -20,19 +21,19 @@ ExporterManager.MenuItems.push({});
ExporterManager.MenuItems.push( ExporterManager.MenuItems.push(
{ {
id:"performWikibaseEdits", id:"performWikibaseEdits",
label: $.i18n._('wikidata-extension/perform-edits-on-wikidata'), label: $.i18n('wikidata-extension/perform-edits-on-wikidata'),
click: function() { PerformEditsDialog.checkAndLaunch(); } click: function() { PerformEditsDialog.checkAndLaunch(); }
}); });
ExporterManager.MenuItems.push( ExporterManager.MenuItems.push(
{ {
id:"exportQuickStatements", id:"exportQuickStatements",
label: $.i18n._('wikidata-extension/export-to-qs'), label: $.i18n('wikidata-extension/export-to-qs'),
click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("quickstatements"); } click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("quickstatements"); }
}); });
ExporterManager.MenuItems.push( ExporterManager.MenuItems.push(
{ {
id:"exportWikibaseSchema", id:"exportWikibaseSchema",
label: $.i18n._('wikidata-extension/export-schema'), label: $.i18n('wikidata-extension/export-schema'),
click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("wikibase-schema"); } click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("wikibase-schema"); }
} }
); );
@ -91,38 +92,38 @@ $(function(){
ExtensionBar.MenuItems.push( ExtensionBar.MenuItems.push(
{ {
"id":"reconcile", "id":"reconcile",
"label": $.i18n._('wikidata-extension/menu-label'), "label": $.i18n('wikidata-extension/menu-label'),
"submenu" : [ "submenu" : [
{ {
id: "wikidata/edit-schema", id: "wikidata/edit-schema",
label: $.i18n._('wikidata-extension/edit-wikidata-schema'), label: $.i18n('wikidata-extension/edit-wikidata-schema'),
click: function() { SchemaAlignmentDialog.launch(false); } click: function() { SchemaAlignmentDialog.launch(false); }
}, },
{ {
id:"wikidata/manage-account", id:"wikidata/manage-account",
label: $.i18n._('wikidata-extension/manage-wikidata-account'), label: $.i18n('wikidata-extension/manage-wikidata-account'),
click: function() { ManageAccountDialog.checkAndLaunch(); } click: function() { ManageAccountDialog.checkAndLaunch(); }
}, },
{}, {},
{ {
id: "wikidata/import-schema", id: "wikidata/import-schema",
label: $.i18n._('wikidata-extension/import-wikidata-schema'), label: $.i18n('wikidata-extension/import-wikidata-schema'),
click: function() { ImportSchemaDialog.launch(); } click: function() { ImportSchemaDialog.launch(); }
}, },
{ {
id:"wikidata/export-schema", id:"wikidata/export-schema",
label: $.i18n._('wikidata-extension/export-schema'), label: $.i18n('wikidata-extension/export-schema'),
click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("wikibase-schema"); } click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("wikibase-schema"); }
}, },
{}, {},
{ {
id:"wikidata/perform-edits", id:"wikidata/perform-edits",
label: $.i18n._('wikidata-extension/perform-edits-on-wikidata'), label: $.i18n('wikidata-extension/perform-edits-on-wikidata'),
click: function() { PerformEditsDialog.checkAndLaunch(); } click: function() { PerformEditsDialog.checkAndLaunch(); }
}, },
{ {
id:"wikidata/export-qs", id:"wikidata/export-qs",
label: $.i18n._('wikidata-extension/export-to-qs'), label: $.i18n('wikidata-extension/export-to-qs'),
click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("quickstatements"); } click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("quickstatements"); }
}, },

8
extensions/wikidata/module/scripts/previewrenderer.js
View File

@ -53,7 +53,7 @@ EditRenderer._renderItem = function(json, container) {
// Statements // Statements
if (json.addedStatementGroups && json.addedStatementGroups.length) { if (json.addedStatementGroups && json.addedStatementGroups.length) {
// $('<div></div>').addClass('wbs-statements-header') // $('<div></div>').addClass('wbs-statements-header')
// .text($.i18n._('wikidata-schema/statements-header')).appendTo(right); // .text($.i18n('wikidata-schema/statements-header')).appendTo(right);
var statementsGroupContainer = $('<div></div>').addClass('wbs-statement-group-container') var statementsGroupContainer = $('<div></div>').addClass('wbs-statement-group-container')
.appendTo(right); .appendTo(right);
for(var i = 0; i != json.addedStatementGroups.length; i++) { for(var i = 0; i != json.addedStatementGroups.length; i++) {
@ -82,7 +82,7 @@ EditRenderer._renderTerm = function(termType, json, container) {
var namedesc = $('<div></div>').addClass('wbs-namedesc').appendTo(container); var namedesc = $('<div></div>').addClass('wbs-namedesc').appendTo(container);
var type_container = $('<div></div>').addClass('wbs-namedesc-type').appendTo(namedesc); var type_container = $('<div></div>').addClass('wbs-namedesc-type').appendTo(namedesc);
var type_span = $('<span></span>').appendTo(type_container) var type_span = $('<span></span>').appendTo(type_container)
.text($.i18n._('wikidata-schema')[termType]); .text($.i18n('wikidata-schema')[termType]);
var right = $('<div></div>').addClass('wbs-right').appendTo(namedesc); var right = $('<div></div>').addClass('wbs-right').appendTo(namedesc);
var value_container = $('<div></div>').addClass('wbs-namedesc-value').appendTo(namedesc); var value_container = $('<div></div>').addClass('wbs-namedesc-value').appendTo(namedesc);
@ -202,7 +202,7 @@ EditRenderer._updateReferencesNumber = function(container) {
var childrenCount = container.children().length; var childrenCount = container.children().length;
var statement = container.parents('.wbs-statement'); var statement = container.parents('.wbs-statement');
var a = statement.find('.wbs-references-toggle a').first(); var a = statement.find('.wbs-references-toggle a').first();
a.html(childrenCount+$.i18n._('wikidata-schema/nb-references')); a.html(childrenCount+$.i18n('wikidata-schema/nb-references'));
} }
/******************* /*******************
@ -231,7 +231,7 @@ EditRenderer._renderValue = function(json, container) {
action: 'wbformatvalue', action: 'wbformatvalue',
generate: 'text/html', generate: 'text/html',
datavalue: jsonValue, datavalue: jsonValue,
options: '{"lang":"'+$.i18n._('core-recon/wd-recon-lang')+'"}', options: '{"lang":"'+$.i18n('core-recon/wd-recon-lang')+'"}',
format: 'json' format: 'json'
}; };
if ('property' in json) { if ('property' in json) {

4
extensions/wikidata/module/scripts/warningsrenderer.js
View File

@ -8,7 +8,7 @@ WarningsRenderer._renderEntity = function(entity) {
var id = entity.id; var id = entity.id;
var is_new = entity.siteIri == "http://localhost/entity/"; var is_new = entity.siteIri == "http://localhost/entity/";
if (is_new) { if (is_new) {
id = $.i18n._('wikidata-preview/new-id'); id = $.i18n('wikidata-preview/new-id');
} }
var fullLabel = id; var fullLabel = id;
if (entity.label) { if (entity.label) {
@ -46,7 +46,7 @@ WarningsRenderer._replaceIssueProperties = function(template, properties) {
} }
WarningsRenderer._renderWarning = function(warning) { WarningsRenderer._renderWarning = function(warning) {
var localized = $.i18n._('warnings-messages')[warning.type]; var localized = $.i18n('warnings-messages')[warning.type];
var title = warning.type; var title = warning.type;
var body = ""; var body = "";
if (localized) { if (localized) {

21
licenses/jquery.i18n.LICENSE.txt Normal file
View File

@ -0,0 +1,21 @@
Copyright (c) 2012-2013 Santhosh Thottingal and other
contributors. See CREDITS for a list.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

19
licenses/recurser_jquery-i18n.LICENSE.txt
View File

@ -1,19 +0,0 @@
Copyright (c) 2010 Dave Perrett, http://recursive-design.com/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

5
main/src/com/google/refine/commands/lang/LoadLanguageCommand.java
View File

@ -69,7 +69,10 @@ public class LoadLanguageCommand extends Command {
response.setCharacterEncoding("UTF-8"); response.setCharacterEncoding("UTF-8");
response.setContentType("application/json"); response.setContentType("application/json");
try { try {
json.write(response.getWriter()); JSONObject fullJson = new JSONObject();
fullJson.put("dictionary", json);
fullJson.put("lang", lang);
fullJson.write(response.getWriter());
} catch (JSONException e) { } catch (JSONException e) {
logger.error("Error writing language labels to response stream"); logger.error("Error writing language labels to response stream");
} }

13
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -345,6 +345,11 @@ function init() {
"externals/jsoneditor/jsoneditor.js", "externals/jsoneditor/jsoneditor.js",
"externals/select2/select2.min.js", "externals/select2/select2.min.js",
"externals/jquery.lavalamp.min.js", "externals/jquery.lavalamp.min.js",
"externals/jquery.i18n.messagestore.js",
"externals/jquery.i18n.emitter.js",
"externals/jquery.i18n.parser.js",
"externals/jquery.i18n.emitter.js",
"externals/jquery.i18n.language.js",
"scripts/util/misc.js", "scripts/util/misc.js",
"scripts/util/url.js", "scripts/util/url.js",
@ -429,6 +434,10 @@ function init() {
"externals/imgareaselect/jquery.imgareaselect.js", "externals/imgareaselect/jquery.imgareaselect.js",
"externals/date.js", "externals/date.js",
"externals/jquery.i18n.js", "externals/jquery.i18n.js",
"externals/jquery.i18n.messagestore.js",
"externals/jquery.i18n.parser.js",
"externals/jquery.i18n.emitter.js",
"externals/jquery.i18n.language.js",
"externals/underscore-min.js", "externals/underscore-min.js",
"externals/jsoneditor/jsoneditor.js", "externals/jsoneditor/jsoneditor.js",
@ -541,6 +550,10 @@ function init() {
"externals/imgareaselect/jquery.imgareaselect.js", "externals/imgareaselect/jquery.imgareaselect.js",
"externals/date.js", "externals/date.js",
"externals/jquery.i18n.js", "externals/jquery.i18n.js",
"externals/jquery.i18n.messagestore.js",
"externals/jquery.i18n.parser.js",
"externals/jquery.i18n.emitter.js",
"externals/jquery.i18n.language.js",
"externals/underscore-min.js", "externals/underscore-min.js",
"scripts/preferences.js", "scripts/preferences.js",
] ]

1
main/webapp/modules/core/externals/jquery.i18n.emitter.js vendored Normal file
View File

@ -0,0 +1 @@
!function(e){"use strict";var n=function(){this.language=e.i18n.languages[String.locale]||e.i18n.languages.default};n.prototype={constructor:n,emit:function(n,r){var t,a,u,i=this;switch(typeof n){case"string":case"number":t=n;break;case"object":if(a=e.map(n.slice(1),function(e){return i.emit(e,r)}),u=n[0].toLowerCase(),"function"!=typeof i[u])throw new Error('unknown operation "'+u+'"');t=i[u](a,r);break;case"undefined":t="";break;default:throw new Error("unexpected type in AST: "+typeof n)}return t},concat:function(n){var r="";return e.each(n,function(e,n){r+=n}),r},replace:function(e,n){var r=parseInt(e[0],10);return r<n.length?n[r]:"$"+(r+1)},plural:function(e){var n=parseFloat(this.language.convertNumber(e[0],10)),r=e.slice(1);return r.length?this.language.convertPlural(n,r):""},gender:function(e){var n=e[0],r=e.slice(1);return this.language.gender(n,r)},grammar:function(e){var n=e[0],r=e[1];return r&&n&&this.language.convertGrammar(r,n)}},e.extend(e.i18n.parser.emitter,new n)}(jQuery);

8
main/webapp/modules/core/externals/jquery.i18n.js vendored
View File

@ -1,4 +1,4 @@
/*! jQuery based internationalization library, Copyright 2010 Dave Perrett, http://recursive-design.com/ /* jQuery Internationalization library 1.0.4
* Released under the MIT license -- https://opensource.org/licenses/MIT */ * Copyright (C) 2012 Santhosh Thottingal
(function(f){f.i18n={dict:null,plural:null,setDictionary:function(a){null===this.dict?this.dict=a:f.extend(this.dict,a)},setPlural:function(a){this.plural=a},_p:function(a,d,e){var c=this.dict[a],b=[];b.push(e);if(void 0===c||null===this.plural)return this.printf(1<e?d:a,b);a=this.plural.replace(/n%/g,e+"%");eval(a);return this.printf(c[plural],b)},_:function(a,d){var e=a;this.dict&&this.dict[a]&&(e=this.dict[a]);return this.printf(e,d)},printf:function(a,d){if(!d)return a;for(var e="",c=/%(\d+)\$s/g, * Dual licensed GPLv2 or later and MIT. */
b=c.exec(a);b;){var f=parseInt(b[1],10)-1;a=a.replace("%"+b[1]+"$s",d[f]);b=c.exec(a)}c=a.split("%s");if(1<c.length)for(b=0;b<d.length;b++)0<c[b].length&&c[b].lastIndexOf("%")==c[b].length-1&&(c[b]+="s"+c.splice(b+1,1)[0]),e+=c[b]+d[b];return e+c[c.length-1]}};f.fn._t=function(a,d){return f(this).text(f.i18n._(a,d))}})(jQuery); !function(e){"use strict";var n,a,o=Array.prototype.slice;(a=function(n){this.options=e.extend({},a.defaults,n),this.parser=this.options.parser,this.locale=this.options.locale,this.messageStore=this.options.messageStore,this.languages={},this.init()}).prototype={init:function(){var n=this;String.locale=n.locale,String.prototype.toLocaleString=function(){var a,o,t,i,l,r,s;for(t=this.valueOf(),i=n.locale,l=0;i;){o=(a=i.split("-")).length;do{if(r=a.slice(0,o).join("-"),s=n.messageStore.get(r,t))return s;o--}while(o);if("en"===i)break;i=e.i18n.fallbacks[n.locale]&&e.i18n.fallbacks[n.locale][l]||n.options.fallbackLocale,e.i18n.log("Trying fallback locale for "+n.locale+": "+i),l++}return""}},destroy:function(){e.removeData(document,"i18n")},load:function(n,a){var o,t,i,l={};if(n||a||(n="i18n/"+e.i18n().locale+".json",a=e.i18n().locale),"string"==typeof n&&"json"!==n.split(".").pop()){l[a]=n+"/"+a+".json",o=(e.i18n.fallbacks[a]||[]).concat(this.options.fallbackLocale);for(t in o)l[i=o[t]]=n+"/"+i+".json";return this.load(l)}return this.messageStore.load(n,a)},parse:function(n,a){var o=n.toLocaleString();return this.parser.language=e.i18n.languages[e.i18n().locale]||e.i18n.languages.default,""===o&&(o=n),this.parser.parse(o,a)}},e.i18n=function(n,t){var i,l=e.data(document,"i18n"),r="object"==typeof n&&n;return r&&r.locale&&l&&l.locale!==r.locale&&(String.locale=l.locale=r.locale),l||(l=new a(r),e.data(document,"i18n",l)),"string"==typeof n?(i=void 0!==t?o.call(arguments,1):[],l.parse(n,i)):l},e.fn.i18n=function(){var n=e.data(document,"i18n");return n||(n=new a,e.data(document,"i18n",n)),String.locale=n.locale,this.each(function(){var a=e(this),o=a.data("i18n");o?a.text(n.parse(o)):a.find("[data-i18n]").i18n()})},String.locale=String.locale||e("html").attr("lang"),String.locale||(void 0!==typeof window.navigator?(n=window.navigator,String.locale=n.language||n.userLanguage||""):String.locale=""),e.i18n.languages={},e.i18n.messageStore=e.i18n.messageStore||{},e.i18n.parser={parse:function(e,n){return e.replace(/\$(\d+)/g,function(e,a){var o=parseInt(a,10)-1;return void 0!==n[o]?n[o]:"$"+a})},emitter:{}},e.i18n.fallbacks={},e.i18n.debug=!1,e.i18n.log=function(){window.console&&e.i18n.debug&&window.console.log.apply(window.console,arguments)},a.defaults={locale:String.locale,fallbackLocale:"en",parser:e.i18n.parser,messageStore:e.i18n.messageStore},e.i18n.constructor=a}(jQuery);

4
main/webapp/modules/core/externals/jquery.i18n.language.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
main/webapp/modules/core/externals/jquery.i18n.messagestore.js vendored Normal file
View File

@ -0,0 +1,4 @@
/* jQuery Internationalization library 1.0.4
* Copyright (C) 2012 Santhosh Thottingal
* Dual licensed GPLv2 or later and MIT. */
!function(e,s,t){"use strict";function n(s){var t=e.Deferred();return e.getJSON(s).done(t.resolve).fail(function(n,r,o){e.i18n.log("Error in loading messages from "+s+" Exception: "+o),t.resolve()}),t.promise()}var r=function(){this.messages={},this.sources={}};r.prototype={load:function(s,t){var r=null,o=[],i=this;if("string"==typeof s)return e.i18n.log("Loading messages from: "+s),n(s).done(function(e){i.set(t,e)}).promise();if(t)return i.set(t,s),e.Deferred().resolve();for(r in s)Object.prototype.hasOwnProperty.call(s,r)&&(t=r,o.push(i.load(s[r],t)));return e.when.apply(e,o)},set:function(s,t){this.messages[s]?this.messages[s]=e.extend(this.messages[s],t):this.messages[s]=t},get:function(e,s){return this.messages[e]&&this.messages[e][s]}},e.extend(e.i18n.messageStore,new r)}(jQuery,window);

4
main/webapp/modules/core/externals/jquery.i18n.parser.js vendored Normal file
View File

@ -0,0 +1,4 @@
/* jQuery Internationalization library 1.0.4
* Copyright (C) 2012 Santhosh Thottingal
* Dual licensed GPLv2 or later and MIT. */
!function(n){"use strict";var r=function(r){this.options=n.extend({},n.i18n.parser.defaults,r),this.language=n.i18n.languages[String.locale]||n.i18n.languages.default,this.emitter=n.i18n.parser.emitter};r.prototype={constructor:r,simpleParse:function(n,r){return n.replace(/\$(\d+)/g,function(n,t){var u=parseInt(t,10)-1;return void 0!==r[u]?r[u]:"$"+t})},parse:function(r,t){return r.indexOf("{{")<0?this.simpleParse(r,t):(this.emitter.language=n.i18n.languages[n.i18n().locale]||n.i18n.languages.default,this.emitter.emit(this.ast(r),t))},ast:function(n){function r(n){return function(){var r,t;for(r=0;r<n.length;r++)if(null!==(t=n[r]()))return t;return null}}function t(n){var r,t,u=F,l=[];for(r=0;r<n.length;r++){if(null===(t=n[r]()))return F=u,null;l.push(t)}return l}function u(n,r){return function(){for(var t=F,u=[],l=r();null!==l;)u.push(l),l=r();return u.length<n?(F=t,null):u}}function l(r){var t=r.length;return function(){var u=null;return n.substr(F,t)===r&&(u=r,F+=t),u}}function e(r){return function(){var t=n.substr(F).match(r);return null===t?null:(F+=t[0].length,t[0])}}function i(){var n=t([h,p]);return null===n?null:n[1]}function a(){var n=t([d,m]);return null===n?null:["REPLACE",parseInt(n[1],10)-1]}function o(){var n,r=t([g,u(0,b)]);return null===r?null:(n=r[1]).length>1?["CONCAT"].concat(n):n[0]}function c(){var n=t([w,v,a]);return null===n?null:[n[0],n[2]]}function f(){var n=t([w,v,b]);return null===n?null:[n[0],n[2]]}function s(){var n=t([E,j,O]);return null===n?null:n[1]}var g,v,h,p,d,m,$,x,C,A,P,j,w,E,O,S,b,y,F=0;if(g=l("|"),v=l(":"),h=l("\\"),p=e(/^./),d=l("$"),m=e(/^\d+/),$=e(/^[^{}\[\]$\\]/),x=e(/^[^{}\[\]$\\|]/),C=e(/^[^{}\[\]$\s]/),r([i,C]),A=r([i,x]),P=r([i,$]),w=function(n,r){return function(){var t=n();return null===t?null:r(t)}}(e(/^[ !"$&'()*,.\/0-9;=?@A-Z\^_`a-z~\x80-\xFF+\-]+/),function(n){return n.toString()}),j=r([function(){var n=t([r([c,f]),u(0,o)]);return null===n?null:n[0].concat(n[1])},function(){var n=t([w,u(0,o)]);return null===n?null:[n[0]].concat(n[1])}]),E=l("{{"),O=l("}}"),S=r([s,a,function(){var n=u(1,P)();return null===n?null:n.join("")}]),b=r([s,a,function(){var n=u(1,A)();return null===n?null:n.join("")}]),null===(y=function(){var n=u(0,S)();return null===n?null:["CONCAT"].concat(n)}())||F!==n.length)throw new Error("Parse error at position "+F.toString()+" in input: "+n);return y}},n.extend(n.i18n.parser,new r)}(jQuery);

82
main/webapp/modules/core/scripts/dialogs/clustering-dialog.js
View File

@ -49,39 +49,39 @@ ClusteringDialog.prototype._createDialog = function() {
var dialog = $(DOM.loadHTML("core", "scripts/dialogs/clustering-dialog.html")); var dialog = $(DOM.loadHTML("core", "scripts/dialogs/clustering-dialog.html"));
this._elmts = DOM.bind(dialog); this._elmts = DOM.bind(dialog);
this._elmts.dialogHeader.text($.i18n._('core-dialogs/cluster-edit')+' "' + this._columnName + '"'); this._elmts.dialogHeader.text($.i18n('core-dialogs/cluster-edit')+' "' + this._columnName + '"');
this._elmts.or_dialog_descr.html($.i18n._('core-dialogs/cluster-descr')); this._elmts.or_dialog_descr.html($.i18n('core-dialogs/cluster-descr'));
this._elmts.or_dialog_findMore.html($.i18n._('core-dialogs/find-more')); this._elmts.or_dialog_findMore.html($.i18n('core-dialogs/find-more'));
this._elmts.or_dialog_method.html($.i18n._('core-dialogs/method')); this._elmts.or_dialog_method.html($.i18n('core-dialogs/method'));
this._elmts.or_dialog_keyCollision.html($.i18n._('core-dialogs/key-collision')); this._elmts.or_dialog_keyCollision.html($.i18n('core-dialogs/key-collision'));
this._elmts.or_dialog_neighbor.html($.i18n._('core-dialogs/nearest-neighbor')); this._elmts.or_dialog_neighbor.html($.i18n('core-dialogs/nearest-neighbor'));
this._elmts.or_dialog_keying.html($.i18n._('core-dialogs/keying-function')); this._elmts.or_dialog_keying.html($.i18n('core-dialogs/keying-function'));
this._elmts.or_dialog_fingerprint.html($.i18n._('core-dialogs/fingerprint')); this._elmts.or_dialog_fingerprint.html($.i18n('core-dialogs/fingerprint'));
this._elmts.or_dialog_ngram.html($.i18n._('core-dialogs/ngram')); this._elmts.or_dialog_ngram.html($.i18n('core-dialogs/ngram'));
this._elmts.or_dialog_metaphone.html($.i18n._('core-dialogs/metaphone')); this._elmts.or_dialog_metaphone.html($.i18n('core-dialogs/metaphone'));
this._elmts.or_dialog_phonetic.html($.i18n._('core-dialogs/phonetic')); this._elmts.or_dialog_phonetic.html($.i18n('core-dialogs/phonetic'));
this._elmts.or_dialog_distance.html($.i18n._('core-dialogs/distance-fun')); this._elmts.or_dialog_distance.html($.i18n('core-dialogs/distance-fun'));
this._elmts.or_dialog_leven.html($.i18n._('core-dialogs/leven')); this._elmts.or_dialog_leven.html($.i18n('core-dialogs/leven'));
this._elmts.or_dialog_ppm.html($.i18n._('core-dialogs/ppm')); this._elmts.or_dialog_ppm.html($.i18n('core-dialogs/ppm'));
this._elmts.or_dialog_ngramSize.html($.i18n._('core-dialogs/ngram-size')); this._elmts.or_dialog_ngramSize.html($.i18n('core-dialogs/ngram-size'));
this._elmts.or_dialog_radius.html($.i18n._('core-dialogs/ngram-radius')); this._elmts.or_dialog_radius.html($.i18n('core-dialogs/ngram-radius'));
this._elmts.or_dialog_blockChars.html($.i18n._('core-dialogs/block-chars')); this._elmts.or_dialog_blockChars.html($.i18n('core-dialogs/block-chars'));
this._elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); this._elmts.selectAllButton.html($.i18n('core-buttons/select-all'));
this._elmts.deselectAllButton.html($.i18n._('core-buttons/unselect-all')); this._elmts.deselectAllButton.html($.i18n('core-buttons/unselect-all'));
this._elmts.exportClusterButton.html($.i18n._('core-buttons/export-cluster')); this._elmts.exportClusterButton.html($.i18n('core-buttons/export-cluster'));
this._elmts.applyReClusterButton.html($.i18n._('core-buttons/merge-cluster')); this._elmts.applyReClusterButton.html($.i18n('core-buttons/merge-cluster'));
this._elmts.applyCloseButton.html($.i18n._('core-buttons/merge-close')); this._elmts.applyCloseButton.html($.i18n('core-buttons/merge-close'));
this._elmts.closeButton.html($.i18n._('core-buttons/close')); this._elmts.closeButton.html($.i18n('core-buttons/close'));
this._elmts.methodSelector.change(function() { this._elmts.methodSelector.change(function() {
var selection = $(this).find("option:selected").text(); var selection = $(this).find("option:selected").text();
if (selection == $.i18n._('core-dialogs/key-collision')) { if (selection == $.i18n('core-dialogs/key-collision')) {
dialog.find(".binning-controls").show(); dialog.find(".binning-controls").show();
dialog.find(".knn-controls").hide(); dialog.find(".knn-controls").hide();
self._method = "binning"; self._method = "binning";
self._elmts.keyingFunctionSelector.change(); self._elmts.keyingFunctionSelector.change();
} else if (selection === $.i18n._('core-dialogs/nearest-neighbor')) { } else if (selection === $.i18n('core-dialogs/nearest-neighbor')) {
dialog.find(".binning-controls").hide(); dialog.find(".binning-controls").hide();
dialog.find(".knn-controls").show(); dialog.find(".knn-controls").show();
self._method = "knn"; self._method = "knn";
@ -140,11 +140,11 @@ ClusteringDialog.prototype._renderTable = function(clusters) {
var trHead = table.insertRow(table.rows.length); var trHead = table.insertRow(table.rows.length);
trHead.className = "header"; trHead.className = "header";
$(trHead.insertCell(0)).text($.i18n._('core-dialogs/cluster-size')); $(trHead.insertCell(0)).text($.i18n('core-dialogs/cluster-size'));
$(trHead.insertCell(1)).text($.i18n._('core-dialogs/row-count')); $(trHead.insertCell(1)).text($.i18n('core-dialogs/row-count'));
$(trHead.insertCell(2)).text($.i18n._('core-dialogs/cluster-values')); $(trHead.insertCell(2)).text($.i18n('core-dialogs/cluster-values'));
$(trHead.insertCell(3)).text($.i18n._('core-dialogs/merge')); $(trHead.insertCell(3)).text($.i18n('core-dialogs/merge'));
$(trHead.insertCell(4)).text($.i18n._('core-dialogs/new-cell-val')); $(trHead.insertCell(4)).text($.i18n('core-dialogs/new-cell-val'));
var renderCluster = function(cluster) { var renderCluster = function(cluster) {
var tr = table.insertRow(table.rows.length); var tr = table.insertRow(table.rows.length);
@ -184,7 +184,7 @@ ClusteringDialog.prototype._renderTable = function(clusters) {
for (var c = 0; c < choices.length; c++) { for (var c = 0; c < choices.length; c++) {
var choice = choices[c]; var choice = choices[c];
var li = $('<li></li>'); var li = $('<li></li>');
$('<a href="javascript:{}" title='+$.i18n._('core-dialogs/use-this-val')+'></a>').text(choice.v).click(onClick).appendTo(li); $('<a href="javascript:{}" title='+$.i18n('core-dialogs/use-this-val')+'></a>').text(choice.v).click(onClick).appendTo(li);
$('<span></span>').text("(" + choice.c + " rows)").addClass("clustering-dialog-entry-count").appendTo(li); $('<span></span>').text("(" + choice.c + " rows)").addClass("clustering-dialog-entry-count").appendTo(li);
rowCount += choice.c; rowCount += choice.c;
facet.s[c] = { facet.s[c] = {
@ -206,7 +206,7 @@ ClusteringDialog.prototype._renderTable = function(clusters) {
var div = $('<div></div>').addClass("clustering-dialog-value-focus"); var div = $('<div></div>').addClass("clustering-dialog-value-focus");
var browseLink = $('<a target="_new" title="'+$.i18n._('core-dialogs/browse-only-these')+'">'+$.i18n._('core-dialogs/browse-this-cluster')+'</a>') var browseLink = $('<a target="_new" title="'+$.i18n('core-dialogs/browse-only-these')+'">'+$.i18n('core-dialogs/browse-this-cluster')+'</a>')
.addClass("clustering-dialog-browse-focus") .addClass("clustering-dialog-browse-focus")
.attr("href",url) .attr("href",url)
.css("visibility","hidden") .css("visibility","hidden")
@ -242,13 +242,13 @@ ClusteringDialog.prototype._renderTable = function(clusters) {
this._elmts.resultSummary.html( this._elmts.resultSummary.html(
(clusters.length === this._clusters.length) ? (clusters.length === this._clusters.length) ?
("<b>" + this._clusters.length + "</b> cluster" + ((this._clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs/found')) : ("<b>" + this._clusters.length + "</b> cluster" + ((this._clusters.length != 1) ? "s" : "") + " "+$.i18n('core-dialogs/found')) :
("<b>" + clusters.length + "</b> cluster" + ((clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs/filtered-from')+ this._clusters.length +$.i18n._('core-dialogs/from-total') ) ("<b>" + clusters.length + "</b> cluster" + ((clusters.length != 1) ? "s" : "") + " "+$.i18n('core-dialogs/filtered-from')+ this._clusters.length +$.i18n('core-dialogs/from-total') )
); );
} else { } else {
container.html( container.html(
'<div style="margin: 2em;"><div style="font-size: 130%; color: #333;">'+$.i18n._('core-dialogs/no-cluster-found')+'</div><div style="padding-top: 1em; font-size: 110%; color: #888;">'+$.i18n._('core-dialogs/try-another-method')+'</div></div>' '<div style="margin: 2em;"><div style="font-size: 130%; color: #333;">'+$.i18n('core-dialogs/no-cluster-found')+'</div><div style="padding-top: 1em; font-size: 110%; color: #888;">'+$.i18n('core-dialogs/try-another-method')+'</div></div>'
); );
} }
}; };
@ -257,7 +257,7 @@ ClusteringDialog.prototype._cluster = function() {
var self = this; var self = this;
var container = this._elmts.tableContainer.html( var container = this._elmts.tableContainer.html(
'<div style="margin: 1em; font-size: 130%; color: #888;">'+$.i18n._('core-dialogs/clustering')+'<img src="images/small-spinner.gif"></div>' '<div style="margin: 1em; font-size: 130%; color: #888;">'+$.i18n('core-dialogs/clustering')+'<img src="images/small-spinner.gif"></div>'
); );
this._elmts.resultSummary.empty(); this._elmts.resultSummary.empty();
@ -376,7 +376,7 @@ ClusteringDialog.prototype._apply = function(onDone) {
} }
); );
} else { } else {
alert($.i18n._('core-dialogs/warning-check-boxes')); alert($.i18n('core-dialogs/warning-check-boxes'));
} }
}; };
@ -438,10 +438,10 @@ ClusteringDialog.prototype._resetFacets = function() {
} }
this._facets = []; this._facets = [];
this._createFacet($.i18n._('core-dialogs/choices-in-cluster'), "size"); this._createFacet($.i18n('core-dialogs/choices-in-cluster'), "size");
this._createFacet($.i18n._('core-dialogs/rows-in-cluster'), "rowCount"); this._createFacet($.i18n('core-dialogs/rows-in-cluster'), "rowCount");
this._createFacet($.i18n._('core-dialogs/choice-avg-length'), "avg"); this._createFacet($.i18n('core-dialogs/choice-avg-length'), "avg");
this._createFacet($.i18n._('core-dialogs/choice-var-length'), "variance"); this._createFacet($.i18n('core-dialogs/choice-var-length'), "variance");
}; };
ClusteringDialog.prototype._createFacet = function(title, property) { ClusteringDialog.prototype._createFacet = function(title, property) {

10
main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js
View File

@ -43,11 +43,11 @@ ColumnReorderingDialog.prototype._createDialog = function() {
this._elmts.cancelButton.click(function() { self._dismiss(); }); this._elmts.cancelButton.click(function() { self._dismiss(); });
this._elmts.okButton.click(function() { self._commit(); }); this._elmts.okButton.click(function() { self._commit(); });
this._elmts.dialogHeader.html($.i18n._('core-dialogs/reorder-column')); this._elmts.dialogHeader.html($.i18n('core-dialogs/reorder-column'));
this._elmts.or_dialog_dragCol.html($.i18n._('core-dialogs/drag-column')); this._elmts.or_dialog_dragCol.html($.i18n('core-dialogs/drag-column'));
this._elmts.or_dialog_dropCol.html($.i18n._('core-dialogs/drop-column')); this._elmts.or_dialog_dropCol.html($.i18n('core-dialogs/drop-column'));
this._elmts.okButton.html($.i18n._('core-buttons/ok')); this._elmts.okButton.html($.i18n('core-buttons/ok'));
this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));
this._level = DialogSystem.showDialog(dialog); this._level = DialogSystem.showDialog(dialog);

92
main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js
View File

@ -82,50 +82,50 @@ CustomTabularExporterDialog.prototype._createDialog = function(options) {
this._elmts.uploadTabBody.remove(); this._elmts.uploadTabBody.remove();
} }
this._elmts.dialogHeader.html($.i18n._('core-dialogs/custom-tab-exp')); this._elmts.dialogHeader.html($.i18n('core-dialogs/custom-tab-exp'));
this._elmts.or_dialog_content.html($.i18n._('core-dialogs/content')); this._elmts.or_dialog_content.html($.i18n('core-dialogs/content'));
this._elmts.or_dialog_download.html($.i18n._('core-dialogs/download')); this._elmts.or_dialog_download.html($.i18n('core-dialogs/download'));
this._elmts.or_dialog_upload.html($.i18n._('core-dialogs/upload')); this._elmts.or_dialog_upload.html($.i18n('core-dialogs/upload'));
this._elmts.or_dialog_optCode.html($.i18n._('core-dialogs/opt-code')); this._elmts.or_dialog_optCode.html($.i18n('core-dialogs/opt-code'));
this._elmts.or_dialog_selAndOrd.html($.i18n._('core-dialogs/sel-and-ord')); this._elmts.or_dialog_selAndOrd.html($.i18n('core-dialogs/sel-and-ord'));
this._elmts.or_dialog_optFor.html($.i18n._('core-dialogs/opt-for')+" "); this._elmts.or_dialog_optFor.html($.i18n('core-dialogs/opt-for')+" ");
this._elmts.or_dialog_forReconCell.html($.i18n._('core-dialogs/for-recon-cell')); this._elmts.or_dialog_forReconCell.html($.i18n('core-dialogs/for-recon-cell'));
this._elmts.or_dialog_matchedName.html($.i18n._('core-dialogs/match-ent-name')); this._elmts.or_dialog_matchedName.html($.i18n('core-dialogs/match-ent-name'));
this._elmts.or_dialog_cellCont.html($.i18n._('core-dialogs/cell-content')); this._elmts.or_dialog_cellCont.html($.i18n('core-dialogs/cell-content'));
this._elmts.or_dialog_matchedId.html($.i18n._('core-dialogs/match-ent-id')); this._elmts.or_dialog_matchedId.html($.i18n('core-dialogs/match-ent-id'));
this._elmts.or_dialog_linkMatch.html($.i18n._('core-dialogs/link-match')); this._elmts.or_dialog_linkMatch.html($.i18n('core-dialogs/link-match'));
this._elmts.or_dialog_outNotUnMatch.html($.i18n._('core-dialogs/out-not-unmatch')); this._elmts.or_dialog_outNotUnMatch.html($.i18n('core-dialogs/out-not-unmatch'));
this._elmts.or_dialog_dateIso.html($.i18n._('core-dialogs/date-iso')); this._elmts.or_dialog_dateIso.html($.i18n('core-dialogs/date-iso'));
this._elmts.or_dialog_shortFormat.html($.i18n._('core-dialogs/short-format')); this._elmts.or_dialog_shortFormat.html($.i18n('core-dialogs/short-format'));
this._elmts.or_dialog_mediumFormat.html($.i18n._('core-dialogs/medium-format')); this._elmts.or_dialog_mediumFormat.html($.i18n('core-dialogs/medium-format'));
this._elmts.or_dialog_longFormat.html($.i18n._('core-dialogs/long-format')); this._elmts.or_dialog_longFormat.html($.i18n('core-dialogs/long-format'));
this._elmts.or_dialog_fullFormat.html($.i18n._('core-dialogs/full-format')); this._elmts.or_dialog_fullFormat.html($.i18n('core-dialogs/full-format'));
this._elmts.or_dialog_custom.html($.i18n._('core-dialogs/custom')); this._elmts.or_dialog_custom.html($.i18n('core-dialogs/custom'));
this._elmts.or_dialog_help.html($.i18n._('core-dialogs/help')); this._elmts.or_dialog_help.html($.i18n('core-dialogs/help'));
this._elmts.or_dialog_localTime.html($.i18n._('core-dialogs/local-time')); this._elmts.or_dialog_localTime.html($.i18n('core-dialogs/local-time'));
this._elmts.or_dialog_omitTime.html($.i18n._('core-dialogs/omit-time')); this._elmts.or_dialog_omitTime.html($.i18n('core-dialogs/omit-time'));
this._elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); this._elmts.selectAllButton.html($.i18n('core-buttons/select-all'));
this._elmts.deselectAllButton.html($.i18n._('core-buttons/deselect-all')); this._elmts.deselectAllButton.html($.i18n('core-buttons/deselect-all'));
this._elmts.or_dialog_outColHeader.html($.i18n._('core-dialogs/out-col-header')); this._elmts.or_dialog_outColHeader.html($.i18n('core-dialogs/out-col-header'));
this._elmts.or_dialog_outEmptyRow.html($.i18n._('core-dialogs/out-empty-row')); this._elmts.or_dialog_outEmptyRow.html($.i18n('core-dialogs/out-empty-row'));
this._elmts.or_dialog_ignoreFacets.html($.i18n._('core-dialogs/ignore-facets')); this._elmts.or_dialog_ignoreFacets.html($.i18n('core-dialogs/ignore-facets'));
this._elmts.or_dialog_lineFormat.html($.i18n._('core-dialogs/line-based')); this._elmts.or_dialog_lineFormat.html($.i18n('core-dialogs/line-based'));
this._elmts.or_dialog_otherFormat.html($.i18n._('core-dialogs/other-format')); this._elmts.or_dialog_otherFormat.html($.i18n('core-dialogs/other-format'));
this._elmts.or_dialog_tsv.html($.i18n._('core-dialogs/tsv')); this._elmts.or_dialog_tsv.html($.i18n('core-dialogs/tsv'));
this._elmts.or_dialog_csv.html($.i18n._('core-dialogs/csv')); this._elmts.or_dialog_csv.html($.i18n('core-dialogs/csv'));
this._elmts.or_dialog_customSep.html($.i18n._('core-dialogs/custom-separator')); this._elmts.or_dialog_customSep.html($.i18n('core-dialogs/custom-separator'));
this._elmts.or_dialog_excel.html($.i18n._('core-dialogs/excel')); this._elmts.or_dialog_excel.html($.i18n('core-dialogs/excel'));
this._elmts.or_dialog_excelXml.html($.i18n._('core-dialogs/excel-xml')); this._elmts.or_dialog_excelXml.html($.i18n('core-dialogs/excel-xml'));
this._elmts.or_dialog_htmlTable.html($.i18n._('core-dialogs/html-table')); this._elmts.or_dialog_htmlTable.html($.i18n('core-dialogs/html-table'));
this._elmts.or_dialog_lineSep.html($.i18n._('core-dialogs/line-sep')); this._elmts.or_dialog_lineSep.html($.i18n('core-dialogs/line-sep'));
this._elmts.or_dialog_charEnc.html($.i18n._('core-dialogs/char-enc')); this._elmts.or_dialog_charEnc.html($.i18n('core-dialogs/char-enc'));
this._elmts.downloadPreviewButton.html($.i18n._('core-buttons/preview')); this._elmts.downloadPreviewButton.html($.i18n('core-buttons/preview'));
this._elmts.downloadButton.html($.i18n._('core-buttons/download')); this._elmts.downloadButton.html($.i18n('core-buttons/download'));
this._elmts.or_dialog_uploadTo.html($.i18n._('core-dialogs/upload-to')); this._elmts.or_dialog_uploadTo.html($.i18n('core-dialogs/upload-to'));
this._elmts.uploadButton.html($.i18n._('core-buttons/upload')); this._elmts.uploadButton.html($.i18n('core-buttons/upload'));
this._elmts.or_dialog_jsonText.html($.i18n._('core-dialogs/json-text')); this._elmts.or_dialog_jsonText.html($.i18n('core-dialogs/json-text'));
this._elmts.applyOptionCodeButton.html($.i18n._('core-buttons/apply')); this._elmts.applyOptionCodeButton.html($.i18n('core-buttons/apply'));
this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));
$("#custom-tabular-exporter-tabs-content").css("display", ""); $("#custom-tabular-exporter-tabs-content").css("display", "");
$("#custom-tabular-exporter-tabs-download").css("display", ""); $("#custom-tabular-exporter-tabs-download").css("display", "");
@ -371,9 +371,9 @@ CustomTabularExporterDialog.prototype._applyOptionCode = function() {
var json = JSON.parse(s); var json = JSON.parse(s);
this._configureUIFromOptionCode(json); this._configureUIFromOptionCode(json);
alert($.i18n._('core-dialogs/opt-code-applied')); alert($.i18n('core-dialogs/opt-code-applied'));
} catch (e) { } catch (e) {
alert($.i18n._('core-dialogs/error-apply-code')+': ' + e); alert($.i18n('core-dialogs/error-apply-code')+': ' + e);
} }
}; };

14
main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js
View File

@ -31,13 +31,13 @@ ExpressionColumnDialog.prototype._createDialog = function() {
this._level = DialogSystem.showDialog(this._dialog); this._level = DialogSystem.showDialog(this._dialog);
this._elmts.dialogHeader.html($.i18n._('core-dialogs/select-columns-dialog')); this._elmts.dialogHeader.html($.i18n('core-dialogs/select-columns-dialog'));
this._elmts.or_dialog_content.html($.i18n._('core-dialogs/content')); this._elmts.or_dialog_content.html($.i18n('core-dialogs/content'));
this._elmts.or_dialog_selAndOrd.html($.i18n._('core-dialogs/sel-and-ord')); this._elmts.or_dialog_selAndOrd.html($.i18n('core-dialogs/sel-and-ord'));
this._elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); this._elmts.selectAllButton.html($.i18n('core-buttons/select-all'));
this._elmts.deselectAllButton.html($.i18n._('core-buttons/deselect-all')); this._elmts.deselectAllButton.html($.i18n('core-buttons/deselect-all'));
this._elmts.okButton.html($.i18n._('core-buttons/ok')); this._elmts.okButton.html($.i18n('core-buttons/ok'));
this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));
/* /*

42
main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js
View File

@ -45,12 +45,12 @@ function ExpressionPreviewDialog(title, cellIndex, rowIndices, values, expressio
this._elmts = DOM.bind(html); this._elmts = DOM.bind(html);
$('<button class="button"></button>').html($.i18n._('core-buttons/ok')).click(function() { $('<button class="button"></button>').html($.i18n('core-buttons/ok')).click(function() {
DialogSystem.dismissUntil(self._level - 1); DialogSystem.dismissUntil(self._level - 1);
self._onDone(self._previewWidget.getExpression(true)); self._onDone(self._previewWidget.getExpression(true));
}).appendTo(footer); }).appendTo(footer);
$('<button class="button"></button>').text($.i18n._('core-buttons/cancel')).click(function() { $('<button class="button"></button>').text($.i18n('core-buttons/cancel')).click(function() {
DialogSystem.dismissUntil(self._level - 1); DialogSystem.dismissUntil(self._level - 1);
}).appendTo(footer); }).appendTo(footer);
@ -136,12 +136,12 @@ ExpressionPreviewDialog.Widget = function(
this._tabContentWidth = this._elmts.expressionPreviewPreviewContainer.width() + "px"; this._tabContentWidth = this._elmts.expressionPreviewPreviewContainer.width() + "px";
this._elmts.or_dialog_expr.html($.i18n._('core-dialogs/expression')); this._elmts.or_dialog_expr.html($.i18n('core-dialogs/expression'));
this._elmts.or_dialog_lang.html($.i18n._('core-dialogs/language')); this._elmts.or_dialog_lang.html($.i18n('core-dialogs/language'));
this._elmts.or_dialog_preview.html($.i18n._('core-dialogs/preview')); this._elmts.or_dialog_preview.html($.i18n('core-dialogs/preview'));
this._elmts.or_dialog_history.html($.i18n._('core-dialogs/history')); this._elmts.or_dialog_history.html($.i18n('core-dialogs/history'));
this._elmts.or_dialog_starred.html($.i18n._('core-dialogs/starred')); this._elmts.or_dialog_starred.html($.i18n('core-dialogs/starred'));
this._elmts.or_dialog_help.html($.i18n._('core-dialogs/help')); this._elmts.or_dialog_help.html($.i18n('core-dialogs/help'));
this.update(); this.update();
this._renderExpressionHistoryTab(); this._renderExpressionHistoryTab();
@ -192,19 +192,19 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) {
var varTable = $('<table cellspacing="5"></table>').appendTo(elmt)[0]; var varTable = $('<table cellspacing="5"></table>').appendTo(elmt)[0];
var vars = [ var vars = [
{ name: "cell", { name: "cell",
description: $.i18n._('core-dialogs/cell-fields') description: $.i18n('core-dialogs/cell-fields')
}, },
{ name: "value", { name: "value",
description: $.i18n._('core-dialogs/cell-value') description: $.i18n('core-dialogs/cell-value')
}, },
{ name: "row", { name: "row",
description: $.i18n._('core-dialogs/row-fields') description: $.i18n('core-dialogs/row-fields')
}, },
{ name: "cells", { name: "cells",
description: $.i18n._('core-dialogs/cells-of-row') description: $.i18n('core-dialogs/cells-of-row')
}, },
{ name: "rowIndex", { name: "rowIndex",
description: $.i18n._('core-dialogs/row-index') description: $.i18n('core-dialogs/row-index')
} }
]; ];
for (var i = 0; i < vars.length; i++) { for (var i = 0; i < vars.length; i++) {
@ -223,7 +223,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) {
$(tr0.insertCell(1)).addClass("expression-preview-doc-item-params").text("(" + entry.params + ")"); $(tr0.insertCell(1)).addClass("expression-preview-doc-item-params").text("(" + entry.params + ")");
$(tr1.insertCell(0)); $(tr1.insertCell(0));
$(tr1.insertCell(1)).addClass("expression-preview-doc-item-returns").text($.i18n._('core-dialogs/returns')+": " + entry.returns); $(tr1.insertCell(1)).addClass("expression-preview-doc-item-returns").text($.i18n('core-dialogs/returns')+": " + entry.returns);
$(tr2.insertCell(0)); $(tr2.insertCell(0));
$(tr2.insertCell(1)).addClass("expression-preview-doc-item-desc").text(entry.description); $(tr2.insertCell(1)).addClass("expression-preview-doc-item-desc").text(entry.description);
@ -270,7 +270,7 @@ ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(dat
var table = $( var table = $(
'<table>' + '<table>' +
'<tr><th></th><th></th><th>'+$.i18n._('core-dialogs/from')+'</th><th colspan="2">'+$.i18n._('core-dialogs/expression')+'</th><th></th></tr>' + '<tr><th></th><th></th><th>'+$.i18n('core-dialogs/from')+'</th><th colspan="2">'+$.i18n('core-dialogs/expression')+'</th><th></th></tr>' +
'</table>' '</table>'
).appendTo($('<div>').addClass("expression-preview-table-wrapper").appendTo(elmt))[0]; ).appendTo($('<div>').addClass("expression-preview-table-wrapper").appendTo(elmt))[0];
@ -293,7 +293,7 @@ ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(dat
); );
}); });
$('<a href="javascript:{}">'+$.i18n._('core-dialogs/reuse')+'</a>').appendTo(tr.insertCell(1)).click(function() { $('<a href="javascript:{}">'+$.i18n('core-dialogs/reuse')+'</a>').appendTo(tr.insertCell(1)).click(function() {
self._elmts.expressionPreviewTextarea[0].value = o.expression; self._elmts.expressionPreviewTextarea[0].value = o.expression;
self._elmts.expressionPreviewLanguageSelect[0].value = o.language; self._elmts.expressionPreviewLanguageSelect[0].value = o.language;
@ -336,7 +336,7 @@ ExpressionPreviewDialog.Widget.prototype._renderStarredExpressions = function(da
var table = $( var table = $(
'<table>' + '<table>' +
'<tr><th></th><th></th><th colspan="2">'+$.i18n._('core-dialogs/expression')+'</th><th></th></tr>' + '<tr><th></th><th></th><th colspan="2">'+$.i18n('core-dialogs/expression')+'</th><th></th></tr>' +
'</table>' '</table>'
).appendTo($('<div>').addClass("expression-preview-table-wrapper").appendTo(elmt))[0]; ).appendTo($('<div>').addClass("expression-preview-table-wrapper").appendTo(elmt))[0];
@ -344,7 +344,7 @@ ExpressionPreviewDialog.Widget.prototype._renderStarredExpressions = function(da
var tr = table.insertRow(table.rows.length); var tr = table.insertRow(table.rows.length);
var o = Scripting.parse(entry.code); var o = Scripting.parse(entry.code);
$('<a href="javascript:{}">'+$.i18n._('core-dialogs/remove')+'</a>').appendTo(tr.insertCell(0)).click(function() { $('<a href="javascript:{}">'+$.i18n('core-dialogs/remove')+'</a>').appendTo(tr.insertCell(0)).click(function() {
$.post( $.post(
"command/core/toggle-starred-expression", "command/core/toggle-starred-expression",
{ expression: entry.code, returnList: true }, { expression: entry.code, returnList: true },
@ -431,7 +431,7 @@ ExpressionPreviewDialog.Widget.prototype._renderPreview = function(expression, d
var renderValue = function(td, v) { var renderValue = function(td, v) {
if (v !== null && v !== undefined) { if (v !== null && v !== undefined) {
if ($.isPlainObject(v)) { if ($.isPlainObject(v)) {
$('<span></span>').addClass("expression-preview-special-value").text($.i18n._('core-dialogs/error')+": " + v.message).appendTo(td); $('<span></span>').addClass("expression-preview-special-value").text($.i18n('core-dialogs/error')+": " + v.message).appendTo(td);
} else { } else {
td.text(v); td.text(v);
} }
@ -441,9 +441,9 @@ ExpressionPreviewDialog.Widget.prototype._renderPreview = function(expression, d
}; };
if (this._results !== null) { if (this._results !== null) {
this._elmts.expressionPreviewParsingStatus.empty().removeClass("error").text($.i18n._('core-dialogs/no-syntax-err')+"."); this._elmts.expressionPreviewParsingStatus.empty().removeClass("error").text($.i18n('core-dialogs/no-syntax-err')+".");
} else { } else {
var message = (data.type == "parser") ? data.message : $.i18n._('core-dialogs/internal-err'); var message = (data.type == "parser") ? data.message : $.i18n('core-dialogs/internal-err');
this._elmts.expressionPreviewParsingStatus.empty().addClass("error").text(message); this._elmts.expressionPreviewParsingStatus.empty().addClass("error").text(message);
} }

26
main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js
View File

@ -41,7 +41,7 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo
var self = this; var self = this;
this._dialog = $(DOM.loadHTML("core", "scripts/views/data-table/extend-data-preview-dialog.html")); this._dialog = $(DOM.loadHTML("core", "scripts/views/data-table/extend-data-preview-dialog.html"));
this._elmts = DOM.bind(this._dialog); this._elmts = DOM.bind(this._dialog);
this._elmts.dialogHeader.html($.i18n._('core-views/add-col-recon-col')+" "+column.name); this._elmts.dialogHeader.html($.i18n('core-views/add-col-recon-col')+" "+column.name);
this._elmts.resetButton.click(function() { this._elmts.resetButton.click(function() {
self._extension.properties = []; self._extension.properties = [];
self._update(); self._update();
@ -49,7 +49,7 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo
this._elmts.okButton.click(function() { this._elmts.okButton.click(function() {
if (self._extension.properties.length === 0) { if (self._extension.properties.length === 0) {
alert($.i18n._('core-views/warning-no-property')); alert($.i18n('core-views/warning-no-property'));
} else { } else {
DialogSystem.dismissUntil(self._level - 1); DialogSystem.dismissUntil(self._level - 1);
self._onDone(self._extension, self._onDone(self._extension,
@ -83,9 +83,9 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo
} }
if (this._serviceMetadata === null) { if (this._serviceMetadata === null) {
alert($.i18n._('core-views/extend-not-reconciled')); alert($.i18n('core-views/extend-not-reconciled'));
} else if(extend === null) { } else if(extend === null) {
alert($.i18n._('core-views/extend-not-supported')); alert($.i18n('core-views/extend-not-supported'));
} else { } else {
var dismissBusy = DialogSystem.showBusy(); var dismissBusy = DialogSystem.showBusy();
ExtendReconciledDataPreviewDialog.getAllProperties(this._proposePropertiesUrl, type, function(properties) { ExtendReconciledDataPreviewDialog.getAllProperties(this._proposePropertiesUrl, type, function(properties) {
@ -196,7 +196,7 @@ ExtendReconciledDataPreviewDialog.prototype._update = function() {
}, },
"json" "json"
).fail(function(data) { ).fail(function(data) {
alert($.i18n._('core-views/internal-err')); alert($.i18n('core-views/internal-err'));
}); });
} }
}; };
@ -255,17 +255,17 @@ ExtendReconciledDataPreviewDialog.prototype._renderPreview = function(data) {
$('<br>').appendTo(th); $('<br>').appendTo(th);
$('<a href="javascript:{}"></a>') $('<a href="javascript:{}"></a>')
.text($.i18n._('core-views/remove-prop')) .text($.i18n('core-views/remove-prop'))
.addClass("action") .addClass("action")
.attr("title", $.i18n._('core-views/remove-col')) .attr("title", $.i18n('core-views/remove-col'))
.click(function() { .click(function() {
self._removeProperty(column.id); self._removeProperty(column.id);
}).appendTo(th); }).appendTo(th);
$('<a href="javascript:{}"></a>') $('<a href="javascript:{}"></a>')
.text($.i18n._('core-views/configure-prop')) .text($.i18n('core-views/configure-prop'))
.addClass("action") .addClass("action")
.attr("title", $.i18n._('core-views/configure-col')) .attr("title", $.i18n('core-views/configure-col'))
.click(function() { .click(function() {
self._constrainProperty(column.id); self._constrainProperty(column.id);
}).appendTo(th); }).appendTo(th);
@ -380,7 +380,7 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
if (table.children().length === 0) { if (table.children().length === 0) {
var tr = $('<tr></tr>').appendTo(table); var tr = $('<tr></tr>').appendTo(table);
$('<td></td>').text($.i18n._('core-views/no-settings')).appendTo(tr); $('<td></td>').text($.i18n('core-views/no-settings')).appendTo(tr);
} }
var form = $('<form class="data-extension-property-config" bind="form"></form>').append(table); var form = $('<form class="data-extension-property-config" bind="form"></form>').append(table);
@ -389,8 +389,8 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
var bodyElmts = DOM.bind(body); var bodyElmts = DOM.bind(body);
footer.html( footer.html(
'<button class="button" bind="okButton">'+$.i18n._('core-buttons/ok')+'</button>' + '<button class="button" bind="okButton">'+$.i18n('core-buttons/ok')+'</button>' +
'<button class="button" bind="cancelButton">'+$.i18n._('core-buttons/cancel')+'</button>' '<button class="button" bind="cancelButton">'+$.i18n('core-buttons/cancel')+'</button>'
); );
var footerElmts = DOM.bind(footer); var footerElmts = DOM.bind(footer);
@ -416,7 +416,7 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
self._update(); self._update();
} catch (e) { } catch (e) {
alert($.i18n._('core-views/internal-err')); alert($.i18n('core-views/internal-err'));
} }
}); });

28
main/webapp/modules/core/scripts/dialogs/scatterplot-dialog.js
View File

@ -43,19 +43,19 @@ ScatterplotDialog.prototype._createDialog = function() {
var dialog = $(DOM.loadHTML("core", "scripts/dialogs/scatterplot-dialog.html")); var dialog = $(DOM.loadHTML("core", "scripts/dialogs/scatterplot-dialog.html"));
this._elmts = DOM.bind(dialog); this._elmts = DOM.bind(dialog);
this._elmts.dialogHeader.text( this._elmts.dialogHeader.text(
$.i18n._('core-dialogs/scatterplot-matrix') + $.i18n('core-dialogs/scatterplot-matrix') +
((typeof this._column == "undefined") ? "" : " ("+$.i18n._('core-dialogs/focusing-on')+" '" + this._column + "')")); ((typeof this._column == "undefined") ? "" : " ("+$.i18n('core-dialogs/focusing-on')+" '" + this._column + "')"));
this._elmts.closeButton.click(function() { self._dismiss(); }); this._elmts.closeButton.click(function() { self._dismiss(); });
this._elmts.or_dialog_linplot.attr("title", $.i18n._('core-dialogs/linear-plot')); this._elmts.or_dialog_linplot.attr("title", $.i18n('core-dialogs/linear-plot'));
this._elmts.or_dialog_logplot.attr("title", $.i18n._('core-dialogs/logarithmic-plot')); this._elmts.or_dialog_logplot.attr("title", $.i18n('core-dialogs/logarithmic-plot'));
this._elmts.or_dialog_counter.attr("title", $.i18n._('core-dialogs/rotated-counter-clock')); this._elmts.or_dialog_counter.attr("title", $.i18n('core-dialogs/rotated-counter-clock'));
this._elmts.or_dialog_norot.attr("title", $.i18n._('core-dialogs/no-rotation')); this._elmts.or_dialog_norot.attr("title", $.i18n('core-dialogs/no-rotation'));
this._elmts.or_dialog_clock.attr("title", $.i18n._('core-dialogs/rotated-clock')); this._elmts.or_dialog_clock.attr("title", $.i18n('core-dialogs/rotated-clock'));
this._elmts.or_dialog_smallDot.attr("title", $.i18n._('core-dialogs/small-dot')); this._elmts.or_dialog_smallDot.attr("title", $.i18n('core-dialogs/small-dot'));
this._elmts.or_dialog_regularDot.attr("title", $.i18n._('core-dialogs/regular-dot')); this._elmts.or_dialog_regularDot.attr("title", $.i18n('core-dialogs/regular-dot'));
this._elmts.or_dialog_bigDot.attr("title", $.i18n._('core-dialogs/big-dot')); this._elmts.or_dialog_bigDot.attr("title", $.i18n('core-dialogs/big-dot'));
this._elmts.closeButton.text($.i18n._('core-buttons/close')); this._elmts.closeButton.text($.i18n('core-buttons/close'));
this._elmts.plotSelector.buttonset().change(function() { this._elmts.plotSelector.buttonset().change(function() {
self._plot_method = $(this).find("input:checked").val(); self._plot_method = $(this).find("input:checked").val();
@ -87,7 +87,7 @@ ScatterplotDialog.prototype._renderMatrix = function() {
var self = this; var self = this;
var container = this._elmts.tableContainer.html( var container = this._elmts.tableContainer.html(
'<div style="margin: 1em; font-size: 130%; color: #888; background-color: white;">'+$.i18n._('core-dialogs/focusing-on')+' <img src="images/small-spinner.gif"></div>' '<div style="margin: 1em; font-size: 130%; color: #888; background-color: white;">'+$.i18n('core-dialogs/focusing-on')+' <img src="images/small-spinner.gif"></div>'
); );
if (theProject.columnModel.columns.length > 0) { if (theProject.columnModel.columns.length > 0) {
@ -96,7 +96,7 @@ ScatterplotDialog.prototype._renderMatrix = function() {
}; };
$.getJSON("command/core/get-columns-info?" + $.param(params),function(data) { $.getJSON("command/core/get-columns-info?" + $.param(params),function(data) {
if (data === null || typeof data.length == 'undefined') { if (data === null || typeof data.length == 'undefined') {
container.html($.i18n._('core-dialogs')["error-getColumnInfo"]); container.html($.i18n('core-dialogs')["error-getColumnInfo"]);
return; return;
} }
@ -214,7 +214,7 @@ ScatterplotDialog.prototype._renderMatrix = function() {
}); });
} else { } else {
container.html( container.html(
'<div style="margin: 2em;"><div style="font-size: 130%; color: #333;">'+$.i18n._('core-dialogs/no-column-dataset')+ '</div></div>' '<div style="margin: 2em;"><div style="font-size: 130%; color: #333;">'+$.i18n('core-dialogs/no-column-dataset')+ '</div></div>'
); );
} }

36
main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js
View File

@ -48,30 +48,30 @@ function SqlExporterDialog(options) {
this._dialog = $(DOM.loadHTML("core", "scripts/dialogs/sql-exporter-dialog.html")); this._dialog = $(DOM.loadHTML("core", "scripts/dialogs/sql-exporter-dialog.html"));
this._elmts = DOM.bind(this._dialog); this._elmts = DOM.bind(this._dialog);
this._level = DialogSystem.showDialog(this._dialog); this._level = DialogSystem.showDialog(this._dialog);
this._elmts.dialogHeader.html($.i18n._('core-dialogs/sql-exporter')); this._elmts.dialogHeader.html($.i18n('core-dialogs/sql-exporter'));
this._elmts.or_dialog_content.html($.i18n._('core-dialogs/content')); this._elmts.or_dialog_content.html($.i18n('core-dialogs/content'));
this._elmts.or_dialog_download.html($.i18n._('core-dialogs/download')); this._elmts.or_dialog_download.html($.i18n('core-dialogs/download'));
this._elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); this._elmts.selectAllButton.html($.i18n('core-buttons/select-all'));
this._elmts.deselectAllButton.html($.i18n._('core-buttons/deselect-all')); this._elmts.deselectAllButton.html($.i18n('core-buttons/deselect-all'));
this._elmts.downloadPreviewButton.html($.i18n._('core-buttons/preview')); this._elmts.downloadPreviewButton.html($.i18n('core-buttons/preview'));
this._elmts.downloadButton.html($.i18n._('core-buttons/download')); this._elmts.downloadButton.html($.i18n('core-buttons/download'));
this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));
// this._elmts.nextButton.html($.i18n._('core-buttons/next')); // this._elmts.nextButton.html($.i18n('core-buttons/next'));
this._elmts.tableNameLabel.html($.i18n._('core-dialogs/tableNameLabel')); this._elmts.tableNameLabel.html($.i18n('core-dialogs/tableNameLabel'));
this._elmts.includeStructureLabel.html($.i18n._('core-dialogs/for-include-structure-checkbox')); this._elmts.includeStructureLabel.html($.i18n('core-dialogs/for-include-structure-checkbox'));
this._elmts.includeDropStatementLabel.html($.i18n._('core-dialogs/for-include-drop-statement-checkbox')); this._elmts.includeDropStatementLabel.html($.i18n('core-dialogs/for-include-drop-statement-checkbox'));
this._elmts.includeContentLabel.html($.i18n._('core-dialogs/for-include-content-checkbox')); this._elmts.includeContentLabel.html($.i18n('core-dialogs/for-include-content-checkbox'));
this._elmts.includeIfExistDropStatementLabel.html($.i18n._('core-dialogs/for-include-if-exist-drop-stmt-checkbox')); this._elmts.includeIfExistDropStatementLabel.html($.i18n('core-dialogs/for-include-if-exist-drop-stmt-checkbox'));
this._elmts.nullCellValueToEmptyStringLabel.html($.i18n._('core-dialogs/for-null-cell-value-to-empty-str-label')); this._elmts.nullCellValueToEmptyStringLabel.html($.i18n('core-dialogs/for-null-cell-value-to-empty-str-label'));
this._elmts.sqlExportIgnoreFacetsLabel.html($.i18n._('core-dialogs/sqlExporterIgnoreFacets')); this._elmts.sqlExportIgnoreFacetsLabel.html($.i18n('core-dialogs/sqlExporterIgnoreFacets'));
this._elmts.sqlExportTrimAllColumnsLabel.html($.i18n._('core-dialogs/sqlExporterTrimColumns')); this._elmts.sqlExportTrimAllColumnsLabel.html($.i18n('core-dialogs/sqlExporterTrimColumns'));
this._elmts.sqlExportOutputEmptyRowsLabel.html($.i18n._('core-dialogs/sqlExporterOutputEmptyRows')); this._elmts.sqlExportOutputEmptyRowsLabel.html($.i18n('core-dialogs/sqlExporterOutputEmptyRows'));
$("#sql-exporter-tabs-content").css("display", ""); $("#sql-exporter-tabs-content").css("display", "");
$("#sql-exporter-tabs-download").css("display", ""); $("#sql-exporter-tabs-download").css("display", "");

20
main/webapp/modules/core/scripts/dialogs/templating-exporter-dialog.js
View File

@ -43,14 +43,14 @@ TemplatingExporterDialog.prototype._createDialog = function() {
this._elmts = DOM.bind(dialog); this._elmts = DOM.bind(dialog);
this._elmts.controls.find("textarea").bind("keyup change input",function() { self._scheduleUpdate(); }); this._elmts.controls.find("textarea").bind("keyup change input",function() { self._scheduleUpdate(); });
this._elmts.dialogHeader.html($.i18n._('core-dialogs/template-export')); this._elmts.dialogHeader.html($.i18n('core-dialogs/template-export'));
this._elmts.or_dialog_prefix.html($.i18n._('core-dialogs/template-prefix')); this._elmts.or_dialog_prefix.html($.i18n('core-dialogs/template-prefix'));
this._elmts.or_dialog_rowTmpl.html($.i18n._('core-dialogs/template-rowt')); this._elmts.or_dialog_rowTmpl.html($.i18n('core-dialogs/template-rowt'));
this._elmts.or_dialog_rowSep.html($.i18n._('core-dialogs/template-rows')); this._elmts.or_dialog_rowSep.html($.i18n('core-dialogs/template-rows'));
this._elmts.or_dialog_suffix.html($.i18n._('core-dialogs/template-suffix')); this._elmts.or_dialog_suffix.html($.i18n('core-dialogs/template-suffix'));
this._elmts.resetButton.html($.i18n._('core-buttons/reset-template')); this._elmts.resetButton.html($.i18n('core-buttons/reset-template'));
this._elmts.exportButton.html($.i18n._('core-buttons/export')); this._elmts.exportButton.html($.i18n('core-buttons/export'));
this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));
this._elmts.exportButton.click(function() { self._export(); self._dismiss(); }); this._elmts.exportButton.click(function() { self._export(); self._dismiss(); });
this._elmts.cancelButton.click(function() { self._dismiss(); }); this._elmts.cancelButton.click(function() { self._dismiss(); });
@ -107,10 +107,10 @@ TemplatingExporterDialog.prototype._scheduleUpdate = function() {
window.clearTimeout(this._timerID); window.clearTimeout(this._timerID);
} }
this._elmts.previewTextarea[0].value = $.i18n._('core-dialogs/idling'); this._elmts.previewTextarea[0].value = $.i18n('core-dialogs/idling');
this._timerID = window.setTimeout(function() { this._timerID = window.setTimeout(function() {
self._timerID = null; self._timerID = null;
self._elmts.previewTextarea[0].value = $.i18n._('core-dialogs/updating'); self._elmts.previewTextarea[0].value = $.i18n('core-dialogs/updating');
self._updatePreview(); self._updatePreview();
}, 1000); }, 1000);
}; };

50
main/webapp/modules/core/scripts/facets/list-facet.js
View File

@ -148,23 +148,23 @@ ListFacet.prototype._initializeUI = function() {
this._div.empty().show().html( this._div.empty().show().html(
'<div class="facet-title" bind="facetTitle">' + '<div class="facet-title" bind="facetTitle">' +
'<div class="grid-layout layout-tightest layout-full"><table><tr>' + '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
'<td width="1%"><a href="javascript:{}" title="'+$.i18n._('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' + '<td width="1%"><a href="javascript:{}" title="'+$.i18n('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
'<td>' + '<td>' +
'<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n._('core-facets/reset')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n('core-facets/reset')+'</a>' +
'<a href="javascript:{}" class="facet-choice-link" bind="invertButton">'+$.i18n._('core-facets/invert')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="invertButton">'+$.i18n('core-facets/invert')+'</a>' +
'<a href="javascript:{}" class="facet-choice-link" bind="changeButton">'+$.i18n._('core-facets/change')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">'+$.i18n('core-facets/change')+'</a>' +
'<span bind="titleSpan"></span>' + '<span bind="titleSpan"></span>' +
'</td>' + '</td>' +
'</tr></table></div>' + '</tr></table></div>' +
'</div>' + '</div>' +
'<div class="facet-expression" bind="expressionDiv" title="'+$.i18n._('core-facets/click-to-edit')+'"></div>' + '<div class="facet-expression" bind="expressionDiv" title="'+$.i18n('core-facets/click-to-edit')+'"></div>' +
'<div class="facet-controls" bind="controlsDiv" style="display:none;">' + '<div class="facet-controls" bind="controlsDiv" style="display:none;">' +
'<a bind="choiceCountContainer" class="action" href="javascript:{}"></a> ' + '<a bind="choiceCountContainer" class="action" href="javascript:{}"></a> ' +
'<span class="facet-controls-sortControls" bind="sortGroup">'+$.i18n._('core-facets/sort-by')+': ' + '<span class="facet-controls-sortControls" bind="sortGroup">'+$.i18n('core-facets/sort-by')+': ' +
'<a href="javascript:{}" bind="sortByNameLink">'+$.i18n._('core-facets/name')+'</a>' + '<a href="javascript:{}" bind="sortByNameLink">'+$.i18n('core-facets/name')+'</a>' +
'<a href="javascript:{}" bind="sortByCountLink">'+$.i18n._('core-facets/count')+'</a>' + '<a href="javascript:{}" bind="sortByCountLink">'+$.i18n('core-facets/count')+'</a>' +
'</span>' + '</span>' +
'<button bind="clusterLink" class="facet-controls-button button">'+$.i18n._('core-facets/cluster')+'</button>' + '<button bind="clusterLink" class="facet-controls-button button">'+$.i18n('core-facets/cluster')+'</button>' +
'</div>' + '</div>' +
'<div class="facet-body" bind="bodyDiv">' + '<div class="facet-body" bind="bodyDiv">' +
'<div class="facet-body-inner" bind="bodyInnerDiv"></div>' + '<div class="facet-body-inner" bind="bodyInnerDiv"></div>' +
@ -173,7 +173,7 @@ ListFacet.prototype._initializeUI = function() {
this._elmts = DOM.bind(this._div); this._elmts = DOM.bind(this._div);
this._elmts.titleSpan.text(this._config.name); this._elmts.titleSpan.text(this._config.name);
this._elmts.changeButton.attr("title",$.i18n._('core-facets/current-exp')+": " + this._config.expression).click(function() { this._elmts.changeButton.attr("title",$.i18n('core-facets/current-exp')+": " + this._config.expression).click(function() {
self._elmts.expressionDiv.slideToggle(100, function() { self._elmts.expressionDiv.slideToggle(100, function() {
if (self._elmts.expressionDiv.css("display") != "none") { if (self._elmts.expressionDiv.css("display") != "none") {
self._editExpression(); self._editExpression();
@ -223,14 +223,14 @@ ListFacet.prototype._copyChoices = function() {
var frame = DialogSystem.createDialog(); var frame = DialogSystem.createDialog();
frame.width("600px"); frame.width("600px");
var header = $('<div></div>').addClass("dialog-header").text($.i18n._('core-facets/facet-choices')).appendTo(frame); var header = $('<div></div>').addClass("dialog-header").text($.i18n('core-facets/facet-choices')).appendTo(frame);
var body = $('<div></div>').addClass("dialog-body").appendTo(frame); var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame); var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
body.html('<textarea wrap="off" bind="textarea" style="display: block; width: 100%; height: 400px;" />'); body.html('<textarea wrap="off" bind="textarea" style="display: block; width: 100%; height: 400px;" />');
var elmts = DOM.bind(body); var elmts = DOM.bind(body);
$('<button class="button"></button>').text($.i18n._('core-buttons/close')).click(function() { $('<button class="button"></button>').text($.i18n('core-buttons/close')).click(function() {
DialogSystem.dismissUntil(level - 1); DialogSystem.dismissUntil(level - 1);
}).appendTo(footer); }).appendTo(footer);
@ -272,7 +272,7 @@ ListFacet.prototype._update = function(resetScroll) {
//this._elmts.statusDiv.hide(); //this._elmts.statusDiv.hide();
this._elmts.controlsDiv.hide(); this._elmts.controlsDiv.hide();
this._elmts.bodyInnerDiv.empty().append( this._elmts.bodyInnerDiv.empty().append(
$('<div>').text($.i18n._('core-facets/loading')).addClass("facet-body-message")); $('<div>').text($.i18n('core-facets/loading')).addClass("facet-body-message"));
return; return;
} else if ("error" in this._data) { } else if ("error" in this._data) {
@ -283,12 +283,12 @@ ListFacet.prototype._update = function(resetScroll) {
this._elmts.bodyInnerDiv.empty(); this._elmts.bodyInnerDiv.empty();
var messageDiv = $('<div>') var messageDiv = $('<div>')
.text(this._data.choiceCount + " "+$.i18n._('core-facets/too-many-choices')) .text(this._data.choiceCount + " "+$.i18n('core-facets/too-many-choices'))
.addClass("facet-body-message") .addClass("facet-body-message")
.appendTo(this._elmts.bodyInnerDiv); .appendTo(this._elmts.bodyInnerDiv);
$('<br>').appendTo(messageDiv); $('<br>').appendTo(messageDiv);
$('<a>') $('<a>')
.text($.i18n._('core-facets/set-choice-count')) .text($.i18n('core-facets/set-choice-count'))
.attr("href", "javascript:{}") .attr("href", "javascript:{}")
.addClass("action") .addClass("action")
.addClass("secondary") .addClass("secondary")
@ -378,7 +378,7 @@ ListFacet.prototype._update = function(resetScroll) {
// edit link // edit link
if (renderEdit) { if (renderEdit) {
html.push('<a href="javascript:{}" class="facet-choice-link facet-choice-edit" style="visibility: hidden">'+$.i18n._('core-facets/edit')+'</a>'); html.push('<a href="javascript:{}" class="facet-choice-link facet-choice-edit" style="visibility: hidden">'+$.i18n('core-facets/edit')+'</a>');
} }
html.push('<a href="javascript:{}" class="facet-choice-label">' + encodeHtml(label) + '</a>'); html.push('<a href="javascript:{}" class="facet-choice-label">' + encodeHtml(label) + '</a>');
@ -481,7 +481,7 @@ ListFacet.prototype._renderBodyControls = function() {
.appendTo(this._elmts.bodyInnerDiv); .appendTo(this._elmts.bodyInnerDiv);
$('<a>') $('<a>')
.text($.i18n._('core-facets/facet-by-count')) .text($.i18n('core-facets/facet-by-count'))
.attr("href", "javascript:{}") .attr("href", "javascript:{}")
.addClass("action") .addClass("action")
.addClass("secondary") .addClass("secondary")
@ -523,12 +523,12 @@ ListFacet.prototype._editChoice = function(choice, choiceDiv) {
'<textarea class="data-table-cell-editor-editor" bind="textarea" />' + '<textarea class="data-table-cell-editor-editor" bind="textarea" />' +
'<div id="data-table-cell-editor-actions">' + '<div id="data-table-cell-editor-actions">' +
'<div class="data-table-cell-editor-action">' + '<div class="data-table-cell-editor-action">' +
'<button class="button" bind="okButton">'+$.i18n._('core-buttons/apply')+'</button>' + '<button class="button" bind="okButton">'+$.i18n('core-buttons/apply')+'</button>' +
'<div class="data-table-cell-editor-key">'+$.i18n._('core-buttons/enter')+'</div>' + '<div class="data-table-cell-editor-key">'+$.i18n('core-buttons/enter')+'</div>' +
'</div>' + '</div>' +
'<div class="data-table-cell-editor-action">' + '<div class="data-table-cell-editor-action">' +
'<button class="button" bind="cancelButton">'+$.i18n._('core-buttons/cancel')+'</button>' + '<button class="button" bind="cancelButton">'+$.i18n('core-buttons/cancel')+'</button>' +
'<div class="data-table-cell-editor-key">'+$.i18n._('core-buttons/esc')+'</div>' + '<div class="data-table-cell-editor-key">'+$.i18n('core-buttons/esc')+'</div>' +
'</div>' + '</div>' +
'</div>' '</div>'
); );
@ -681,8 +681,8 @@ ListFacet.prototype._updateRest = function() {
ListFacet.prototype._editExpression = function() { ListFacet.prototype._editExpression = function() {
var self = this; var self = this;
var title = (this._config.columnName) ? var title = (this._config.columnName) ?
($.i18n._('core-facets/edit-based-col')+" " + this._config.columnName) : ($.i18n('core-facets/edit-based-col')+" " + this._config.columnName) :
$.i18n._('core-facets/edit-facet-exp'); $.i18n('core-facets/edit-facet-exp');
var column = Refine.columnNameToColumn(this._config.columnName); var column = Refine.columnNameToColumn(this._config.columnName);
var o = DataTableView.sampleVisibleRows(column); var o = DataTableView.sampleVisibleRows(column);
@ -698,7 +698,7 @@ ListFacet.prototype._editExpression = function() {
self._config.expression = expr; self._config.expression = expr;
self._elmts.expressionDiv.text(self._config.expression); self._elmts.expressionDiv.text(self._config.expression);
self._elmts.changeButton.attr("title", $.i18n._('core-facets/current-exp')+": " + self._config.expression); self._elmts.changeButton.attr("title", $.i18n('core-facets/current-exp')+": " + self._config.expression);
if (self._config.expression === "value" || self._config.expression === "grel:value") { if (self._config.expression === "value" || self._config.expression === "grel:value") {
self._elmts.clusterLink.show(); self._elmts.clusterLink.show();
} else { } else {
@ -715,7 +715,7 @@ ListFacet.prototype._editExpression = function() {
ListFacet.prototype._setChoiceCountLimit = function(choiceCount) { ListFacet.prototype._setChoiceCountLimit = function(choiceCount) {
var limit = Math.ceil(choiceCount / 1000) * 1000; var limit = Math.ceil(choiceCount / 1000) * 1000;
var s = window.prompt($.i18n._('core-facets/set-max-choices'), limit); var s = window.prompt($.i18n('core-facets/set-max-choices'), limit);
if (s) { if (s) {
var n = parseInt(s,10); var n = parseInt(s,10);

20
main/webapp/modules/core/scripts/facets/range-facet.js
View File

@ -132,17 +132,17 @@ RangeFacet.prototype._initializeUI = function() {
.html( .html(
'<div class="facet-title" bind="headerDiv">' + '<div class="facet-title" bind="headerDiv">' +
'<div class="grid-layout layout-tightest layout-full"><table><tr>' + '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
'<td width="1%"><a href="javascript:{}" title="'+$.i18n._('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' + '<td width="1%"><a href="javascript:{}" title="'+$.i18n('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
'<td>' + '<td>' +
'<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n._('core-facets/reset')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n('core-facets/reset')+'</a>' +
'<a href="javascript:{}" class="facet-choice-link" bind="changeButton">'+$.i18n._('core-facets/change')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">'+$.i18n('core-facets/change')+'</a>' +
'<span bind="facetTitle"></span>' + '<span bind="facetTitle"></span>' +
'</td>' + '</td>' +
'</tr></table></div>' + '</tr></table></div>' +
'</div>' + '</div>' +
'<div class="facet-expression" bind="expressionDiv" title="'+$.i18n._('core-facets/click-to-edit')+'"></div>' + '<div class="facet-expression" bind="expressionDiv" title="'+$.i18n('core-facets/click-to-edit')+'"></div>' +
'<div class="facet-range-body">' + '<div class="facet-range-body">' +
'<div class="facet-range-message" bind="messageDiv">'+$.i18n._('core-facets/loading')+'</div>' + '<div class="facet-range-message" bind="messageDiv">'+$.i18n('core-facets/loading')+'</div>' +
'<div class="facet-range-slider" bind="sliderWidgetDiv">' + '<div class="facet-range-slider" bind="sliderWidgetDiv">' +
'<div class="facet-range-histogram" bind="histogramDiv"></div>' + '<div class="facet-range-histogram" bind="histogramDiv"></div>' +
'</div>' + '</div>' +
@ -153,7 +153,7 @@ RangeFacet.prototype._initializeUI = function() {
this._elmts = DOM.bind(this._div); this._elmts = DOM.bind(this._div);
this._elmts.facetTitle.text(this._config.name); this._elmts.facetTitle.text(this._config.name);
this._elmts.changeButton.attr("title",$.i18n._('core-facets/current-expression')+": " + this._config.expression).click(function() { this._elmts.changeButton.attr("title",$.i18n('core-facets/current-expression')+": " + this._config.expression).click(function() {
self._elmts.expressionDiv.slideToggle(100, function() { self._elmts.expressionDiv.slideToggle(100, function() {
if (self._elmts.expressionDiv.css("display") != "none") { if (self._elmts.expressionDiv.css("display") != "none") {
self._editExpression(); self._editExpression();
@ -209,7 +209,7 @@ RangeFacet.prototype._renderOtherChoices = function() {
if (this._selectNumeric) numericCheck.attr("checked","checked"); if (this._selectNumeric) numericCheck.attr("checked","checked");
var numericLabel = $('<label>').attr("for", facet_id + "-numeric").appendTo(numericDiv); var numericLabel = $('<label>').attr("for", facet_id + "-numeric").appendTo(numericDiv);
$('<span>').text($.i18n._('core-facets/numeric')+" ").addClass("facet-range-choice-label").appendTo(numericLabel); $('<span>').text($.i18n('core-facets/numeric')+" ").addClass("facet-range-choice-label").appendTo(numericLabel);
$('<div>').text(this._numericCount).addClass("facet-range-choice-count").appendTo(numericLabel); $('<div>').text(this._numericCount).addClass("facet-range-choice-count").appendTo(numericLabel);
// ----------------- non-numeric ----------------- // ----------------- non-numeric -----------------
@ -315,7 +315,7 @@ RangeFacet.prototype.updateState = function(data) {
this._errorCount = data.errorCount; this._errorCount = data.errorCount;
} else { } else {
this._error = true; this._error = true;
this._errorMessage = "error" in data ? data.error : $.i18n._('core-facets/unknown-error')+"."; this._errorMessage = "error" in data ? data.error : $.i18n('core-facets/unknown-error')+".";
} }
this.render(); this.render();
@ -375,8 +375,8 @@ RangeFacet.prototype._updateRest = function() {
RangeFacet.prototype._editExpression = function() { RangeFacet.prototype._editExpression = function() {
var self = this; var self = this;
var title = (this._config.columnName) ? var title = (this._config.columnName) ?
($.i18n._('core-facets/edit-based-col')+" " + this._config.columnName) : ($.i18n('core-facets/edit-based-col')+" " + this._config.columnName) :
$.i18n._('core-facets/edit-facet-exp'); $.i18n('core-facets/edit-facet-exp');
var column = Refine.columnNameToColumn(this._config.columnName); var column = Refine.columnNameToColumn(this._config.columnName);
var o = DataTableView.sampleVisibleRows(column); var o = DataTableView.sampleVisibleRows(column);

26
main/webapp/modules/core/scripts/facets/scatterplot-facet.js
View File

@ -93,15 +93,15 @@ ScatterplotFacet.prototype._initializeUI = function() {
this._div.empty().show().html( this._div.empty().show().html(
'<div class="facet-title">' + '<div class="facet-title">' +
'<div class="grid-layout layout-tightest layout-full"><table><tr>' + '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
'<td width="1%"><a href="javascript:{}" title="'+$.i18n._('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' + '<td width="1%"><a href="javascript:{}" title="'+$.i18n('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
'<td>' + '<td>' +
'<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n._('core-facets/reset')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n('core-facets/reset')+'</a>' +
'<span bind="titleSpan"></span>' + '<span bind="titleSpan"></span>' +
'</td>' + '</td>' +
'</tr></table></div>' + '</tr></table></div>' +
'</div>' + '</div>' +
'<div class="facet-scatterplot-body" bind="bodyDiv">' + '<div class="facet-scatterplot-body" bind="bodyDiv">' +
'<div class="facet-scatterplot-message" bind="messageDiv">'+$.i18n._('core-facets/loading')+'</div>' + '<div class="facet-scatterplot-message" bind="messageDiv">'+$.i18n('core-facets/loading')+'</div>' +
'<table width="100%"><tr>' + '<table width="100%"><tr>' +
'<td>' + '<td>' +
'<div class="facet-scatterplot-plot-container">' + '<div class="facet-scatterplot-plot-container">' +
@ -114,20 +114,20 @@ ScatterplotFacet.prototype._initializeUI = function() {
'<td class="facet-scatterplot-selectors-container" width="100%">' + '<td class="facet-scatterplot-selectors-container" width="100%">' +
'<div class="scatterplot-selectors" bind="selectors">' + '<div class="scatterplot-selectors" bind="selectors">' +
'<div class="buttonset scatterplot-dim-selector">' + '<div class="buttonset scatterplot-dim-selector">' +
'<input type="radio" id="' + facet_id + '-dim-lin" name="' + facet_id + '-dim" value="lin"/><label class="dim-lin-label" for="' + facet_id + '-dim-lin" title="'+$.i18n._('core-facets/linear-plot')+'">'+$.i18n._('core-facets/linear-plot-abbr')+'</label>' + '<input type="radio" id="' + facet_id + '-dim-lin" name="' + facet_id + '-dim" value="lin"/><label class="dim-lin-label" for="' + facet_id + '-dim-lin" title="'+$.i18n('core-facets/linear-plot')+'">'+$.i18n('core-facets/linear-plot-abbr')+'</label>' +
'<input type="radio" id="' + facet_id + '-dim-log" name="' + facet_id + '-dim" value="log"/><label class="dim-log-label" for="' + facet_id + '-dim-log" title="'+$.i18n._('core-facets/logar-plot')+'">'+$.i18n._('core-facets/logar-plot-abbr')+'</label>' + '<input type="radio" id="' + facet_id + '-dim-log" name="' + facet_id + '-dim" value="log"/><label class="dim-log-label" for="' + facet_id + '-dim-log" title="'+$.i18n('core-facets/logar-plot')+'">'+$.i18n('core-facets/logar-plot-abbr')+'</label>' +
'</div>' + '</div>' +
'<div class="buttonset scatterplot-rot-selector">' + '<div class="buttonset scatterplot-rot-selector">' +
'<input type="radio" id="' + facet_id + '-rot-ccw" name="' + facet_id + '-rot" value="ccw"/><label class="rot-ccw-label" for="' + facet_id + '-rot-ccw" title="'+$.i18n._('core-facets/rotated-counter-clock')+'">&nbsp;</label>' + '<input type="radio" id="' + facet_id + '-rot-ccw" name="' + facet_id + '-rot" value="ccw"/><label class="rot-ccw-label" for="' + facet_id + '-rot-ccw" title="'+$.i18n('core-facets/rotated-counter-clock')+'">&nbsp;</label>' +
'<input type="radio" id="' + facet_id + '-rot-none" name="' + facet_id + '-rot" value="none"/><label class="rot-none-label" for="' + facet_id + '-rot-none" title="'+$.i18n._('core-facets/no-rotation')+'">&nbsp;</label>' + '<input type="radio" id="' + facet_id + '-rot-none" name="' + facet_id + '-rot" value="none"/><label class="rot-none-label" for="' + facet_id + '-rot-none" title="'+$.i18n('core-facets/no-rotation')+'">&nbsp;</label>' +
'<input type="radio" id="' + facet_id + '-rot-cw" name="' + facet_id + '-rot" value="cw"/><label class="rot-cw-label" for="' + facet_id + '-rot-cw" title="'+$.i18n._('core-facets/rotated-clock')+'">&nbsp;</label>' + '<input type="radio" id="' + facet_id + '-rot-cw" name="' + facet_id + '-rot" value="cw"/><label class="rot-cw-label" for="' + facet_id + '-rot-cw" title="'+$.i18n('core-facets/rotated-clock')+'">&nbsp;</label>' +
'</div>' + '</div>' +
'<div class="buttonset scatterplot-dot-selector">' + '<div class="buttonset scatterplot-dot-selector">' +
'<input type="radio" id="' + facet_id + '-dot-small" name="' + facet_id + '-dot" value="small"/><label class="dot-small-label" for="' + facet_id + '-dot-small" title="'+$.i18n._('core-facets/small-dot')+'">&nbsp;</label>' + '<input type="radio" id="' + facet_id + '-dot-small" name="' + facet_id + '-dot" value="small"/><label class="dot-small-label" for="' + facet_id + '-dot-small" title="'+$.i18n('core-facets/small-dot')+'">&nbsp;</label>' +
'<input type="radio" id="' + facet_id + '-dot-regular" name="' + facet_id + '-dot" value="regular"/><label class="dot-regular-label" for="' + facet_id + '-dot-regular" title="'+$.i18n._('core-facets/regular-dot')+'">&nbsp;</label>' + '<input type="radio" id="' + facet_id + '-dot-regular" name="' + facet_id + '-dot" value="regular"/><label class="dot-regular-label" for="' + facet_id + '-dot-regular" title="'+$.i18n('core-facets/regular-dot')+'">&nbsp;</label>' +
'<input type="radio" id="' + facet_id + '-dot-big" name="' + facet_id + '-dot" value="big"/><label class="dot-big-label" for="' + facet_id + '-dot-big" title="'+$.i18n._('core-facets/big-dot')+'">&nbsp;</label>' + '<input type="radio" id="' + facet_id + '-dot-big" name="' + facet_id + '-dot" value="big"/><label class="dot-big-label" for="' + facet_id + '-dot-big" title="'+$.i18n('core-facets/big-dot')+'">&nbsp;</label>' +
'</div>' + '</div>' +
'<div class="scatterplot-export-plot"><a bind="exportPlotLink" class="action" target="_blank">'+$.i18n._('core-facets/export-plot')+'</a></div>' + '<div class="scatterplot-export-plot"><a bind="exportPlotLink" class="action" target="_blank">'+$.i18n('core-facets/export-plot')+'</a></div>' +
'</div>' + '</div>' +
'</td>' + '</td>' +
'</tr></table>' + '</tr></table>' +
@ -279,7 +279,7 @@ ScatterplotFacet.prototype._formulateImageUrl = function(engineConfig, conf) {
ScatterplotFacet.prototype.updateState = function(data) { ScatterplotFacet.prototype.updateState = function(data) {
if ("error" in data) { if ("error" in data) {
this._error = true; this._error = true;
this._errorMessage = "error" in data ? data.error : $.i18n._('core-facets/unknown-error')+"."; this._errorMessage = "error" in data ? data.error : $.i18n('core-facets/unknown-error')+".";
} else { } else {
this._error = false; this._error = false;

10
main/webapp/modules/core/scripts/facets/text-search-facet.js
View File

@ -90,10 +90,10 @@ TextSearchFacet.prototype._initializeUI = function() {
this._div.empty().show().html( this._div.empty().show().html(
'<div class="facet-title" bind="facetTitle">' + '<div class="facet-title" bind="facetTitle">' +
'<div class="grid-layout layout-tightest layout-full"><table><tr>' + '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
'<td width="1%"><a href="javascript:{}" title="'+$.i18n._('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' + '<td width="1%"><a href="javascript:{}" title="'+$.i18n('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
'<td>' + '<td>' +
'<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n._('core-facets/reset')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n('core-facets/reset')+'</a>' +
'<a href="javascript:{}" class="facet-choice-link" bind="invertButton">'+$.i18n._('core-facets/invert')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="invertButton">'+$.i18n('core-facets/invert')+'</a>' +
'<span bind="titleSpan"></span>' + '<span bind="titleSpan"></span>' +
'</td>' + '</td>' +
'</tr></table></div>' + '</tr></table></div>' +
@ -101,8 +101,8 @@ TextSearchFacet.prototype._initializeUI = function() {
'<div class="facet-text-body"><div class="grid-layout layout-tightest layout-full"><table>' + '<div class="facet-text-body"><div class="grid-layout layout-tightest layout-full"><table>' +
'<tr><td colspan="4"><div class="input-container"><input bind="input" /></div></td></tr>' + '<tr><td colspan="4"><div class="input-container"><input bind="input" /></div></td></tr>' +
'<tr>' + '<tr>' +
'<td width="1%"><input type="checkbox" bind="caseSensitiveCheckbox" id="caseSensitiveCheckbox" /></td><td><label for="caseSensitiveCheckbox">'+$.i18n._('core-facets/case-sensitive')+'</label></td>' + '<td width="1%"><input type="checkbox" bind="caseSensitiveCheckbox" id="caseSensitiveCheckbox" /></td><td><label for="caseSensitiveCheckbox">'+$.i18n('core-facets/case-sensitive')+'</label></td>' +
'<td width="1%"><input type="checkbox" bind="regexCheckbox" id="regexCheckbox" /></td><td><label for="regexCheckbox">'+$.i18n._('core-facets/regular-exp')+'</label></td>' + '<td width="1%"><input type="checkbox" bind="regexCheckbox" id="regexCheckbox" /></td><td><label for="regexCheckbox">'+$.i18n('core-facets/regular-exp')+'</label></td>' +
'</tr>' + '</tr>' +
'</table></div></div>' '</table></div></div>'
); );

26
main/webapp/modules/core/scripts/facets/timerange-facet.js
View File

@ -133,17 +133,17 @@ TimeRangeFacet.prototype._initializeUI = function() {
.html( .html(
'<div class="facet-title" bind="headerDiv">' + '<div class="facet-title" bind="headerDiv">' +
'<div class="grid-layout layout-tightest layout-full"><table><tr>' + '<div class="grid-layout layout-tightest layout-full"><table><tr>' +
'<td width="1%"><a href="javascript:{}" title="'+$.i18n._('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' + '<td width="1%"><a href="javascript:{}" title="'+$.i18n('core-facets/remove-facet')+'" class="facet-title-remove" bind="removeButton">&nbsp;</a></td>' +
'<td>' + '<td>' +
'<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n._('core-facets/reset')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="resetButton">'+$.i18n('core-facets/reset')+'</a>' +
'<a href="javascript:{}" class="facet-choice-link" bind="changeButton">'+$.i18n._('core-facets/change')+'</a>' + '<a href="javascript:{}" class="facet-choice-link" bind="changeButton">'+$.i18n('core-facets/change')+'</a>' +
'<span bind="facetTitle"></span>' + '<span bind="facetTitle"></span>' +
'</td>' + '</td>' +
'</tr></table></div>' + '</tr></table></div>' +
'</div>' + '</div>' +
'<div class="facet-expression" bind="expressionDiv" title="'+$.i18n._('core-facets/click-to-edit')+'"></div>' + '<div class="facet-expression" bind="expressionDiv" title="'+$.i18n('core-facets/click-to-edit')+'"></div>' +
'<div class="facet-range-body">' + '<div class="facet-range-body">' +
'<div class="facet-range-message" bind="messageDiv">'+$.i18n._('core-facets/loading')+'</div>' + '<div class="facet-range-message" bind="messageDiv">'+$.i18n('core-facets/loading')+'</div>' +
'<div class="facet-range-slider" bind="sliderWidgetDiv">' + '<div class="facet-range-slider" bind="sliderWidgetDiv">' +
'<div class="facet-range-histogram" bind="histogramDiv"></div>' + '<div class="facet-range-histogram" bind="histogramDiv"></div>' +
'</div>' + '</div>' +
@ -154,7 +154,7 @@ TimeRangeFacet.prototype._initializeUI = function() {
this._elmts = DOM.bind(this._div); this._elmts = DOM.bind(this._div);
this._elmts.facetTitle.text(this._config.name); this._elmts.facetTitle.text(this._config.name);
this._elmts.changeButton.attr("title",$.i18n._('core-facets/current-exp')+": " + this._config.expression).click(function() { this._elmts.changeButton.attr("title",$.i18n('core-facets/current-exp')+": " + this._config.expression).click(function() {
self._elmts.expressionDiv.slideToggle(100, function() { self._elmts.expressionDiv.slideToggle(100, function() {
if (self._elmts.expressionDiv.css("display") != "none") { if (self._elmts.expressionDiv.css("display") != "none") {
self._editExpression(); self._editExpression();
@ -210,7 +210,7 @@ TimeRangeFacet.prototype._renderOtherChoices = function() {
if (this._selectTime) timeCheck.attr("checked","checked"); if (this._selectTime) timeCheck.attr("checked","checked");
var timeLabel = $('<label>').attr("for", facet_id + "-time").appendTo(timeDiv); var timeLabel = $('<label>').attr("for", facet_id + "-time").appendTo(timeDiv);
$('<span>').text($.i18n._('core-facets/time')+" ").addClass("facet-range-choice-label").appendTo(timeLabel); $('<span>').text($.i18n('core-facets/time')+" ").addClass("facet-range-choice-label").appendTo(timeLabel);
$('<div>').text(this._timeCount).addClass("facet-range-choice-count").appendTo(timeLabel); $('<div>').text(this._timeCount).addClass("facet-range-choice-count").appendTo(timeLabel);
// ----------------- non-Time ----------------- // ----------------- non-Time -----------------
@ -223,7 +223,7 @@ TimeRangeFacet.prototype._renderOtherChoices = function() {
if (this._selectNonTime) nonTimeCheck.attr("checked","checked"); if (this._selectNonTime) nonTimeCheck.attr("checked","checked");
var nonTimeLabel = $('<label>').attr("for", facet_id + "-non-time").appendTo(nonTimeDiv); var nonTimeLabel = $('<label>').attr("for", facet_id + "-non-time").appendTo(nonTimeDiv);
$('<span>').text($.i18n._('core-facets/non-time')+" ").addClass("facet-range-choice-label").appendTo(nonTimeLabel); $('<span>').text($.i18n('core-facets/non-time')+" ").addClass("facet-range-choice-label").appendTo(nonTimeLabel);
$('<div>').text(this._nonTimeCount).addClass("facet-range-choice-count").appendTo(nonTimeLabel); $('<div>').text(this._nonTimeCount).addClass("facet-range-choice-count").appendTo(nonTimeLabel);
if (this._baseNonTimeCount === 0) nonTimeCheck.removeAttr("checked"); if (this._baseNonTimeCount === 0) nonTimeCheck.removeAttr("checked");
@ -238,7 +238,7 @@ TimeRangeFacet.prototype._renderOtherChoices = function() {
if (this._selectBlank) blankCheck.attr("checked","checked"); if (this._selectBlank) blankCheck.attr("checked","checked");
var blankLabel = $('<label>').attr("for", facet_id + "-blank").appendTo(blankDiv); var blankLabel = $('<label>').attr("for", facet_id + "-blank").appendTo(blankDiv);
$('<span>').text($.i18n._('core-facets/blank')+" ").addClass("facet-range-choice-label").appendTo(blankLabel); $('<span>').text($.i18n('core-facets/blank')+" ").addClass("facet-range-choice-label").appendTo(blankLabel);
$('<div>').text(this._blankCount).addClass("facet-range-choice-count").appendTo(blankLabel); $('<div>').text(this._blankCount).addClass("facet-range-choice-count").appendTo(blankLabel);
if (this._baseBlankCount === 0) blankCheck.removeAttr("checked"); if (this._baseBlankCount === 0) blankCheck.removeAttr("checked");
@ -253,7 +253,7 @@ TimeRangeFacet.prototype._renderOtherChoices = function() {
if (this._selectError) errorCheck.attr("checked","checked"); if (this._selectError) errorCheck.attr("checked","checked");
var errorLabel = $('<label>').attr("for", facet_id + "-error").appendTo(errorDiv); var errorLabel = $('<label>').attr("for", facet_id + "-error").appendTo(errorDiv);
$('<span>').text($.i18n._('core-facets/error')+" ").addClass("facet-range-choice-label").appendTo(errorLabel); $('<span>').text($.i18n('core-facets/error')+" ").addClass("facet-range-choice-label").appendTo(errorLabel);
$('<div>').text(this._errorCount).addClass("facet-range-choice-count").appendTo(errorLabel); $('<div>').text(this._errorCount).addClass("facet-range-choice-count").appendTo(errorLabel);
if (this._baseErrorCount === 0) errorCheck.removeAttr("checked"); if (this._baseErrorCount === 0) errorCheck.removeAttr("checked");
@ -342,7 +342,7 @@ TimeRangeFacet.prototype.updateState = function(data) {
this._errorCount = data.errorCount; this._errorCount = data.errorCount;
} else { } else {
this._error = true; this._error = true;
this._errorMessage = "error" in data ? data.error : $.i18n._('core-facets/unknown-error')+"."; this._errorMessage = "error" in data ? data.error : $.i18n('core-facets/unknown-error')+".";
} }
this.render(); this.render();
@ -402,8 +402,8 @@ TimeRangeFacet.prototype._updateRest = function() {
TimeRangeFacet.prototype._editExpression = function() { TimeRangeFacet.prototype._editExpression = function() {
var self = this; var self = this;
var title = (this._config.columnName) ? var title = (this._config.columnName) ?
($.i18n._('core-facets/edit-based-col')+" " + this._config.columnName) : ($.i18n('core-facets/edit-based-col')+" " + this._config.columnName) :
$.i18n._('core-facets/edit-facet-exp'); $.i18n('core-facets/edit-facet-exp');
var column = Refine.columnNameToColumn(this._config.columnName); var column = Refine.columnNameToColumn(this._config.columnName);
var o = DataTableView.sampleVisibleRows(column); var o = DataTableView.sampleVisibleRows(column);

26
main/webapp/modules/core/scripts/index.js
View File

@ -48,10 +48,12 @@ $.ajax({
// lang : lang // lang : lang
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
lang = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
$.i18n({ locale: lang });
// End internationalization // End internationalization
Refine.selectActionArea = function(id) { Refine.selectActionArea = function(id) {
@ -100,7 +102,7 @@ $(function() {
function(data) { function(data) {
OpenRefineVersion = data; OpenRefineVersion = data;
$("#openrefine-version").text($.i18n._('core-index/version')+" " + OpenRefineVersion.full_version); $("#openrefine-version").text($.i18n('core-index/version')+" " + OpenRefineVersion.full_version);
$.getJSON("https://api.github.com/repos/openrefine/openrefine/releases/latest", $.getJSON("https://api.github.com/repos/openrefine/openrefine/releases/latest",
@ -118,13 +120,13 @@ $(function() {
var container = $('<div id="notification-container">') var container = $('<div id="notification-container">')
.appendTo(document.body); .appendTo(document.body);
var notification = $('<div id="notification">') var notification = $('<div id="notification">')
.text($.i18n._('core-index/new-version')+' ') .text($.i18n('core-index/new-version')+' ')
.appendTo(container); .appendTo(container);
$('<a>') $('<a>')
.addClass('notification-action') .addClass('notification-action')
.attr("href", latestVersionUrl) .attr("href", latestVersionUrl)
.attr("target", "_blank") .attr("target", "_blank")
.text($.i18n._('core-index/download')+' ' + latestVersionName + ' '+$.i18n._('core-index/now')+'.') .text($.i18n('core-index/download')+' ' + latestVersionName + ' '+$.i18n('core-index/now')+'.')
.appendTo(notification); .appendTo(notification);
} }
}); });
@ -201,13 +203,13 @@ $(function() {
} }
Refine.selectActionArea('create-project'); Refine.selectActionArea('create-project');
$("#slogan").text($.i18n._('core-index/slogan')+"."); $("#slogan").text($.i18n('core-index/slogan')+".");
$("#or-index-pref").text($.i18n._('core-index/preferences')); $("#or-index-pref").text($.i18n('core-index/preferences'));
$("#or-index-help").text($.i18n._('core-index/help')); $("#or-index-help").text($.i18n('core-index/help'));
$("#or-index-about").text($.i18n._('core-index/about')); $("#or-index-about").text($.i18n('core-index/about'));
$("#or-index-noProj").text($.i18n._('core-index/no-proj')+"."); $("#or-index-noProj").text($.i18n('core-index/no-proj')+".");
$("#or-index-try").text($.i18n._('core-index/try-these')); $("#or-index-try").text($.i18n('core-index/try-these'));
$("#or-index-sample").text($.i18n._('core-index/sample-data')); $("#or-index-sample").text($.i18n('core-index/sample-data'));
showVersion(); showVersion();
}); });

26
main/webapp/modules/core/scripts/index/create-project-ui.js
View File

@ -49,12 +49,12 @@ Refine.CreateProjectUI = function(elmt) {
this._errorPanel = this.addCustomPanel(); this._errorPanel = this.addCustomPanel();
this._errorPanel.html(DOM.loadHTML("core", "scripts/index/create-project-error-panel.html")); this._errorPanel.html(DOM.loadHTML("core", "scripts/index/create-project-error-panel.html"));
$('#or-create-question').text($.i18n._('core-index-create/question')); $('#or-create-question').text($.i18n('core-index-create/question'));
$('#or-create-formats').text($.i18n._('core-index-create/formats')); $('#or-create-formats').text($.i18n('core-index-create/formats'));
$('#or-create-from').text($.i18n._('core-index-create/from')); $('#or-create-from').text($.i18n('core-index-create/from'));
$('#create-project-progress-cancel-button').text($.i18n._('core-buttons/cancel')); $('#create-project-progress-cancel-button').text($.i18n('core-buttons/cancel'));
$('#create-project-error-ok-button').html($.i18n._('core-buttons/ok')); $('#create-project-error-ok-button').html($.i18n('core-buttons/ok'));
$.post( $.post(
"command/core/get-importing-configuration", "command/core/get-importing-configuration",
@ -162,7 +162,7 @@ Refine.CreateProjectUI.prototype.showSourceSelectionPanel = function() {
Refine.actionAreas.push({ Refine.actionAreas.push({
id: "create-project", id: "create-project",
label: $.i18n._('core-index-create/create-proj'), label: $.i18n('core-index-create/create-proj'),
uiClass: Refine.CreateProjectUI uiClass: Refine.CreateProjectUI
}); });
@ -173,7 +173,7 @@ Refine.CreateProjectUI.prototype.showImportProgressPanel = function(progressMess
$('#create-project-progress-message').text(progressMessage); $('#create-project-progress-message').text(progressMessage);
$('#create-project-progress-bar-body').css("width", "0%"); $('#create-project-progress-bar-body').css("width", "0%");
$('#create-project-progress-message-left').text($.i18n._('core-index-create/starting')); $('#create-project-progress-message-left').text($.i18n('core-index-create/starting'));
$('#create-project-progress-message-center').empty(); $('#create-project-progress-message-center').empty();
$('#create-project-progress-message-right').empty(); $('#create-project-progress-message-right').empty();
$('#create-project-progress-timing').empty(); $('#create-project-progress-timing').empty();
@ -203,7 +203,7 @@ Refine.CreateProjectUI.prototype.pollImportJob = function(start, jobID, timerID,
onError(job); onError(job);
} else if (checkDone(job)) { } else if (checkDone(job)) {
$('#create-project-progress-message').text($.i18n._('core-index-create/done')); $('#create-project-progress-message').text($.i18n('core-index-create/done'));
window.clearInterval(timerID); window.clearInterval(timerID);
if (callback) { if (callback) {
@ -222,13 +222,13 @@ Refine.CreateProjectUI.prototype.pollImportJob = function(start, jobID, timerID,
if (secondsRemaining > 1) { if (secondsRemaining > 1) {
if (secondsRemaining > 60) { if (secondsRemaining > 60) {
$('#create-project-progress-timing').text( $('#create-project-progress-timing').text(
Math.ceil(secondsRemaining / 60) + " "+$.i18n._('core-index-create/min-remaining')); Math.ceil(secondsRemaining / 60) + " "+$.i18n('core-index-create/min-remaining'));
} else { } else {
$('#create-project-progress-timing').text( $('#create-project-progress-timing').text(
Math.ceil(secondsRemaining) + " "+$.i18n._('core-index-create/sec-remaining')); Math.ceil(secondsRemaining) + " "+$.i18n('core-index-create/sec-remaining'));
} }
} else { } else {
$('#create-project-progress-timing').text($.i18n._('core-index-create/almost-done')); $('#create-project-progress-timing').text($.i18n('core-index-create/almost-done'));
} }
} else { } else {
$('#create-project-progress-bar-body').addClass('indefinite'); $('#create-project-progress-bar-body').addClass('indefinite');
@ -237,7 +237,7 @@ Refine.CreateProjectUI.prototype.pollImportJob = function(start, jobID, timerID,
$('#create-project-progress-message').text(progress.message); $('#create-project-progress-message').text(progress.message);
if ('memory' in progress) { if ('memory' in progress) {
var percent = progress.memory * 100.0 / progress.maxmemory; var percent = progress.memory * 100.0 / progress.maxmemory;
$('#create-project-progress-memory').text($.i18n._('core-index-create/memory-usage')+" "+percent.toFixed()+'% ('+progress.memory+'/'+progress.maxmemory+"MB)"); $('#create-project-progress-memory').text($.i18n('core-index-create/memory-usage')+" "+percent.toFixed()+'% ('+progress.memory+'/'+progress.maxmemory+"MB)");
if (percent > 90) { if (percent > 90) {
$('#create-project-progress-memory').addClass('warning'); $('#create-project-progress-memory').addClass('warning');
} else { } else {
@ -254,7 +254,7 @@ Refine.CreateProjectUI.prototype.showImportJobError = function(message, stack) {
var self = this; var self = this;
$('#create-project-error-message').text(message); $('#create-project-error-message').text(message);
$('#create-project-error-stack').text(stack || $.i18n._('core-index-create/no-details')); $('#create-project-error-stack').text(stack || $.i18n('core-index-create/no-details'));
this.showCustomPanel(this._errorPanel); this.showCustomPanel(this._errorPanel);
$('#create-project-error-ok-button').unbind().click(function() { $('#create-project-error-ok-button').unbind().click(function() {

10
main/webapp/modules/core/scripts/index/default-importing-controller/controller.js
View File

@ -179,7 +179,7 @@ Refine.DefaultImportingController.prototype._prepareData = function() {
Refine.DefaultImportingController.prototype._ensureFormatParserUIHasInitializationData = function(format, onDone) { Refine.DefaultImportingController.prototype._ensureFormatParserUIHasInitializationData = function(format, onDone) {
if (!(format in this._parserOptions)) { if (!(format in this._parserOptions)) {
var self = this; var self = this;
var dismissBusy = DialogSystem.showBusy($.i18n._('core-index-import/inspecting')); var dismissBusy = DialogSystem.showBusy($.i18n('core-index-import/inspecting'));
$.post( $.post(
"command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "core/default-importing-controller", "controller": "core/default-importing-controller",
@ -200,7 +200,7 @@ Refine.DefaultImportingController.prototype._ensureFormatParserUIHasInitializati
) )
.fail(function() { .fail(function() {
dismissBusy(); dismissBusy();
alert($.i18n._('core-views/check-format')); alert($.i18n('core-views/check-format'));
}); });
} else { } else {
onDone(); onDone();
@ -273,7 +273,7 @@ Refine.DefaultImportingController.prototype._createProject = function() {
if ((this._formatParserUI) && this._formatParserUI.confirmReadyToCreateProject()) { if ((this._formatParserUI) && this._formatParserUI.confirmReadyToCreateProject()) {
var projectName = $.trim(this._parsingPanelElmts.projectNameInput[0].value); var projectName = $.trim(this._parsingPanelElmts.projectNameInput[0].value);
if (projectName.length === 0) { if (projectName.length === 0) {
window.alert($.i18n._('core-index-import/warning-name')); window.alert($.i18n('core-index-import/warning-name'));
this._parsingPanelElmts.projectNameInput.focus(); this._parsingPanelElmts.projectNameInput.focus();
return; return;
} }
@ -315,14 +315,14 @@ Refine.DefaultImportingController.prototype._createProject = function() {
document.location = "project?project=" + job.config.projectID; document.location = "project?project=" + job.config.projectID;
}, },
function(job) { function(job) {
alert($.i18n._('core-index-import/errors')+'\n' + Refine.CreateProjectUI.composeErrorMessage(job)); alert($.i18n('core-index-import/errors')+'\n' + Refine.CreateProjectUI.composeErrorMessage(job));
self._onImportJobReady(); self._onImportJobReady();
} }
); );
}, },
1000 1000
); );
self._createProjectUI.showImportProgressPanel($.i18n._('core-index-import/creating-proj'), function() { self._createProjectUI.showImportProgressPanel($.i18n('core-index-import/creating-proj'), function() {
// stop the timed polling // stop the timed polling
window.clearInterval(timerID); window.clearInterval(timerID);

32
main/webapp/modules/core/scripts/index/default-importing-controller/file-selection-panel.js
View File

@ -59,17 +59,17 @@ Refine.DefaultImportingController.prototype._prepareFileSelectionPanel = functio
this._fileSelectionPanelElmts = DOM.bind(this._fileSelectionPanel); this._fileSelectionPanelElmts = DOM.bind(this._fileSelectionPanel);
$('#or-import-select').text($.i18n._('core-index-import/select-file')); $('#or-import-select').text($.i18n('core-index-import/select-file'));
$('#or-import-severalFile').text($.i18n._('core-index-import/several-file')); $('#or-import-severalFile').text($.i18n('core-index-import/several-file'));
$('#or-import-selExt').text($.i18n._('core-index-import/sel-by-extension')); $('#or-import-selExt').text($.i18n('core-index-import/sel-by-extension'));
$('#or-import-regex').text($.i18n._('core-index-import/sel-by-regex')); $('#or-import-regex').text($.i18n('core-index-import/sel-by-regex'));
this._fileSelectionPanelElmts.startOverButton.html($.i18n._('core-buttons/startover')); this._fileSelectionPanelElmts.startOverButton.html($.i18n('core-buttons/startover'));
this._fileSelectionPanelElmts.nextButton.html($.i18n._('core-buttons/conf-pars-opt')); this._fileSelectionPanelElmts.nextButton.html($.i18n('core-buttons/conf-pars-opt'));
this._fileSelectionPanelElmts.selectAllButton.text($.i18n._('core-buttons/select-all')); this._fileSelectionPanelElmts.selectAllButton.text($.i18n('core-buttons/select-all'));
this._fileSelectionPanelElmts.unselectAllButton.text($.i18n._('core-buttons/unselect-all')); this._fileSelectionPanelElmts.unselectAllButton.text($.i18n('core-buttons/unselect-all'));
this._fileSelectionPanelElmts.selectRegexButton.text($.i18n._('core-buttons/select')); this._fileSelectionPanelElmts.selectRegexButton.text($.i18n('core-buttons/select'));
this._fileSelectionPanelElmts.unselectRegexButton.text($.i18n._('core-buttons/unselect')); this._fileSelectionPanelElmts.unselectRegexButton.text($.i18n('core-buttons/unselect'));
this._fileSelectionPanelElmts.startOverButton.click(function() { this._fileSelectionPanelElmts.startOverButton.click(function() {
self._startOver(); self._startOver();
@ -110,7 +110,7 @@ Refine.DefaultImportingController.prototype._renderFileSelectionPanelFileTable =
this._fileSelectionPanelElmts.filePanel.empty(); this._fileSelectionPanelElmts.filePanel.empty();
var fileTable = $('<table><tr><th>'+$.i18n._('core-index-import/import')+'</th><th>'+$.i18n._('core-index-import/name')+'</th><th>'+$.i18n._('core-index-import/mime-type')+'</th><th>'+$.i18n._('core-index-import/format')+'</th><th>'+$.i18n._('core-index-import/size')+'</th></tr></table>') var fileTable = $('<table><tr><th>'+$.i18n('core-index-import/import')+'</th><th>'+$.i18n('core-index-import/name')+'</th><th>'+$.i18n('core-index-import/mime-type')+'</th><th>'+$.i18n('core-index-import/format')+'</th><th>'+$.i18n('core-index-import/size')+'</th></tr></table>')
.appendTo(this._fileSelectionPanelElmts.filePanel)[0]; .appendTo(this._fileSelectionPanelElmts.filePanel)[0];
var round = function(n) { var round = function(n) {
@ -204,7 +204,7 @@ Refine.DefaultImportingController.prototype._renderFileSelectionPanelControlPane
$('<td>').text(extension.extension).appendTo(tr); $('<td>').text(extension.extension).appendTo(tr);
$('<td>').text(extension.count + (extension.count > 1 ? " files" : " file")).appendTo(tr); $('<td>').text(extension.count + (extension.count > 1 ? " files" : " file")).appendTo(tr);
$('<button>') $('<button>')
.text($.i18n._('core-buttons/select')) .text($.i18n('core-buttons/select'))
.addClass("button") .addClass("button")
.appendTo($('<td>').appendTo(tr)) .appendTo($('<td>').appendTo(tr))
.click(function() { .click(function() {
@ -222,7 +222,7 @@ Refine.DefaultImportingController.prototype._renderFileSelectionPanelControlPane
self._updateFileSelectionSummary(); self._updateFileSelectionSummary();
}); });
$('<button>') $('<button>')
.text($.i18n._('core-buttons/unselect')) .text($.i18n('core-buttons/unselect'))
.addClass("button") .addClass("button")
.appendTo($('<td>').appendTo(tr)) .appendTo($('<td>').appendTo(tr))
.click(function() { .click(function() {
@ -329,7 +329,7 @@ Refine.DefaultImportingController.prototype._commitFileSelection = function() {
} }
var self = this; var self = this;
var dismissBusy = DialogSystem.showBusy($.i18n._('core-index-import/inspecting-files')); var dismissBusy = DialogSystem.showBusy($.i18n('core-index-import/inspecting-files'));
$.post( $.post(
"command/core/importing-controller?" + $.param({ "command/core/importing-controller?" + $.param({
"controller": "core/default-importing-controller", "controller": "core/default-importing-controller",
@ -343,9 +343,9 @@ Refine.DefaultImportingController.prototype._commitFileSelection = function() {
dismissBusy(); dismissBusy();
if (!(data)) { if (!(data)) {
self._createProjectUI.showImportJobError($.i18n._('core-index-import/unknown-err')); self._createProjectUI.showImportJobError($.i18n('core-index-import/unknown-err'));
} else if (data.code == "error" || !("job" in data)) { } else if (data.code == "error" || !("job" in data)) {
self._createProjectUI.showImportJobError((data.message) ? ($.i18n._('core-index-import/error')+ ' ' + data.message) : $.i18n._('core-index-import/unknown-err')); self._createProjectUI.showImportJobError((data.message) ? ($.i18n('core-index-import/error')+ ' ' + data.message) : $.i18n('core-index-import/unknown-err'));
} else { } else {
// Different files might be selected. We start over again. // Different files might be selected. We start over again.
delete this._parserOptions; delete this._parserOptions;

14
main/webapp/modules/core/scripts/index/default-importing-controller/parsing-panel.js
View File

@ -92,13 +92,13 @@ Refine.DefaultImportingController.prototype._prepareParsingPanel = function() {
}); });
this._parsingPanelElmts.progressPanel.hide(); this._parsingPanelElmts.progressPanel.hide();
this._parsingPanelElmts.startOverButton.html($.i18n._('core-buttons/startover')); this._parsingPanelElmts.startOverButton.html($.i18n('core-buttons/startover'));
this._parsingPanelElmts.nextButton.html($.i18n._('core-buttons/create-project')); this._parsingPanelElmts.nextButton.html($.i18n('core-buttons/create-project'));
$('#or-import-parsopt').text($.i18n._('core-index-import/parsing-options')); $('#or-import-parsopt').text($.i18n('core-index-import/parsing-options'));
$('#or-import-projname').html($.i18n._('core-index-import/project-name')); $('#or-import-projname').html($.i18n('core-index-import/project-name'));
$('#or-import-projtags').html($.i18n._('core-index-import/project-tags')); $('#or-import-projtags').html($.i18n('core-index-import/project-tags'));
$('#or-import-updating').text($.i18n._('core-index-import/updating-preview')); $('#or-import-updating').text($.i18n('core-index-import/updating-preview'));
$('#or-import-parseas').text($.i18n._('core-index-import/parse-as')); $('#or-import-parseas').text($.i18n('core-index-import/parse-as'));
//tags dropdown //tags dropdown
$("#tagsInput").select2({ $("#tagsInput").select2({

42
main/webapp/modules/core/scripts/index/default-importing-sources/sources.js
View File

@ -35,7 +35,7 @@ function ThisComputerImportingSourceUI(controller) {
this._controller = controller; this._controller = controller;
} }
Refine.DefaultImportingController.sources.push({ Refine.DefaultImportingController.sources.push({
"label": $.i18n._('core-index-import/this-computer'), "label": $.i18n('core-index-import/this-computer'),
"id": "upload", "id": "upload",
"uiClass": ThisComputerImportingSourceUI "uiClass": ThisComputerImportingSourceUI
}); });
@ -47,14 +47,14 @@ ThisComputerImportingSourceUI.prototype.attachUI = function(bodyDiv) {
this._elmts = DOM.bind(bodyDiv); this._elmts = DOM.bind(bodyDiv);
$('#or-import-locate-files').text($.i18n._('core-index-import/locate-files')); $('#or-import-locate-files').text($.i18n('core-index-import/locate-files'));
this._elmts.nextButton.html($.i18n._('core-buttons/next')); this._elmts.nextButton.html($.i18n('core-buttons/next'));
this._elmts.nextButton.click(function(evt) { this._elmts.nextButton.click(function(evt) {
if (self._elmts.fileInput[0].files.length === 0) { if (self._elmts.fileInput[0].files.length === 0) {
window.alert($.i18n._('core-index-import/warning-data-file')); window.alert($.i18n('core-index-import/warning-data-file'));
} else { } else {
self._controller.startImportJob(self._elmts.form, $.i18n._('core-index-import/uploading-data')); self._controller.startImportJob(self._elmts.form, $.i18n('core-index-import/uploading-data'));
} }
}); });
}; };
@ -66,7 +66,7 @@ function UrlImportingSourceUI(controller) {
this._controller = controller; this._controller = controller;
} }
Refine.DefaultImportingController.sources.push({ Refine.DefaultImportingController.sources.push({
"label": $.i18n._('core-index-import/web-address'), "label": $.i18n('core-index-import/web-address'),
"id": "download", "id": "download",
"uiClass": UrlImportingSourceUI "uiClass": UrlImportingSourceUI
}); });
@ -78,15 +78,15 @@ UrlImportingSourceUI.prototype.attachUI = function(bodyDiv) {
this._elmts = DOM.bind(bodyDiv); this._elmts = DOM.bind(bodyDiv);
$('#or-import-enterurl').text($.i18n._('core-index-import/enter-url')); $('#or-import-enterurl').text($.i18n('core-index-import/enter-url'));
this._elmts.addButton.html($.i18n._('core-buttons/add-url')); this._elmts.addButton.html($.i18n('core-buttons/add-url'));
this._elmts.nextButton.html($.i18n._('core-buttons/next')); this._elmts.nextButton.html($.i18n('core-buttons/next'));
this._elmts.nextButton.click(function(evt) { this._elmts.nextButton.click(function(evt) {
if ($.trim(self._elmts.urlInput[0].value).length === 0) { if ($.trim(self._elmts.urlInput[0].value).length === 0) {
window.alert($.i18n._('core-index-import/warning-web-address')); window.alert($.i18n('core-index-import/warning-web-address'));
} else { } else {
self._controller.startImportJob(self._elmts.form, $.i18n._('core-index-import/downloading-data')); self._controller.startImportJob(self._elmts.form, $.i18n('core-index-import/downloading-data'));
} }
}); });
this._elmts.addButton.click(function(evt) { this._elmts.addButton.click(function(evt) {
@ -102,7 +102,7 @@ function ClipboardImportingSourceUI(controller) {
this._controller = controller; this._controller = controller;
} }
Refine.DefaultImportingController.sources.push({ Refine.DefaultImportingController.sources.push({
"label": $.i18n._('core-index-import/clipboard'), "label": $.i18n('core-index-import/clipboard'),
"id": "clipboard", "id": "clipboard",
"uiClass": ClipboardImportingSourceUI "uiClass": ClipboardImportingSourceUI
}); });
@ -114,14 +114,14 @@ ClipboardImportingSourceUI.prototype.attachUI = function(bodyDiv) {
this._elmts = DOM.bind(bodyDiv); this._elmts = DOM.bind(bodyDiv);
$('#or-import-clipboard').text($.i18n._('core-index-import/clipboard-label')); $('#or-import-clipboard').text($.i18n('core-index-import/clipboard-label'));
this._elmts.nextButton.html($.i18n._('core-buttons/next')); this._elmts.nextButton.html($.i18n('core-buttons/next'));
this._elmts.nextButton.click(function(evt) { this._elmts.nextButton.click(function(evt) {
if ($.trim(self._elmts.textInput[0].value).length === 0) { if ($.trim(self._elmts.textInput[0].value).length === 0) {
window.alert($.i18n._('core-index-import/warning-clipboard')); window.alert($.i18n('core-index-import/warning-clipboard'));
} else { } else {
self._controller.startImportJob(self._elmts.form, $.i18n._('core-index-import/uploading-pasted-data')); self._controller.startImportJob(self._elmts.form, $.i18n('core-index-import/uploading-pasted-data'));
} }
}); });
}; };
@ -135,7 +135,7 @@ function DataPackageImportingSourceUI(controller) {
this._controller = controller; this._controller = controller;
} }
Refine.DefaultImportingController.sources.push({ Refine.DefaultImportingController.sources.push({
"label": $.i18n._('core-index-import/data-package'), "label": $.i18n('core-index-import/data-package'),
"id": "data-package", "id": "data-package",
"uiClass": DataPackageImportingSourceUI "uiClass": DataPackageImportingSourceUI
}); });
@ -147,14 +147,14 @@ function DataPackageImportingSourceUI(controller) {
this._elmts = DOM.bind(bodyDiv); this._elmts = DOM.bind(bodyDiv);
$('#or-import-enterurl').text($.i18n._('core-index-import/enter-url')); $('#or-import-enterurl').text($.i18n('core-index-import/enter-url'));
this._elmts.nextButton.html($.i18n._('core-buttons/next')); this._elmts.nextButton.html($.i18n('core-buttons/next'));
this._elmts.nextButton.click(function(evt) { this._elmts.nextButton.click(function(evt) {
if ($.trim(self._elmts.urlInput[0].value).length === 0) { if ($.trim(self._elmts.urlInput[0].value).length === 0) {
window.alert($.i18n._('core-index-import/warning-web-address')); window.alert($.i18n('core-index-import/warning-web-address'));
} else { } else {
self._controller.startImportJob(self._elmts.form, $.i18n._('core-index-import/data-package')); self._controller.startImportJob(self._elmts.form, $.i18n('core-index-import/data-package'));
} }
}); });
}; };

16
main/webapp/modules/core/scripts/index/edit-metadata-dialog.js
View File

@ -14,17 +14,17 @@ function EditMetadataDialog(metaData, targetRowElem) {
var td0 = tr.insertCell(0); var td0 = tr.insertCell(0);
var td1 = tr.insertCell(1); var td1 = tr.insertCell(1);
var keyLable = $.i18n._('core-index')[key] || key; var keyLable = $.i18n('core-index')[key] || key;
$(td1).text(keyLable); $(td1).text(keyLable);
var td2 = tr.insertCell(2); var td2 = tr.insertCell(2);
$(td2).text((value !== null) ? value : ""); $(td2).text((value !== null) ? value : "");
if(key==="tags"){ if(key==="tags"){
$('<button class="button">').text($.i18n._('core-index/edit')).appendTo(td0).click(function() { $('<button class="button">').text($.i18n('core-index/edit')).appendTo(td0).click(function() {
var oldTags = $(td1).text().replace("[","").replace("]",""); var oldTags = $(td1).text().replace("[","").replace("]","");
oldTags = replaceAll(oldTags,"\"",""); oldTags = replaceAll(oldTags,"\"","");
var newTags = window.prompt($.i18n._('core-index/change-metadata-value')+" " + key, $(td2).text()); var newTags = window.prompt($.i18n('core-index/change-metadata-value')+" " + key, $(td2).text());
newTags = newTags.replace("[","").replace("]",""); newTags = newTags.replace("[","").replace("]","");
newTags = replaceAll(newTags,"\"",""); newTags = replaceAll(newTags,"\"","");
if (newTags !== null) { if (newTags !== null) {
@ -52,8 +52,8 @@ function EditMetadataDialog(metaData, targetRowElem) {
key !== "importOptionMetadata" && key !== "importOptionMetadata" &&
key !== "id" && key !== "id" &&
key !== "tags") { key !== "tags") {
$('<button class="button">').text($.i18n._('core-index/edit')).appendTo(td0).click(function() { $('<button class="button">').text($.i18n('core-index/edit')).appendTo(td0).click(function() {
var newValue = window.prompt($.i18n._('core-index/change-metadata-value')+" " + key, value); var newValue = window.prompt($.i18n('core-index/change-metadata-value')+" " + key, value);
if (newValue !== null) { if (newValue !== null) {
$(td2).text(newValue); $(td2).text(newValue);
metaData[key] = newValue; metaData[key] = newValue;
@ -88,17 +88,17 @@ EditMetadataDialog.prototype._createDialog = function() {
this._elmts = DOM.bind(frame); this._elmts = DOM.bind(frame);
this._level = DialogSystem.showDialog(frame); this._level = DialogSystem.showDialog(frame);
this._elmts.closeButton.html($.i18n._('core-buttons/close')); this._elmts.closeButton.html($.i18n('core-buttons/close'));
this._elmts.closeButton.click(function() { self._dismiss();Refine.OpenProjectUI.prototype._addTagFilter()}); this._elmts.closeButton.click(function() { self._dismiss();Refine.OpenProjectUI.prototype._addTagFilter()});
var body = $("#metadata-body"); var body = $("#metadata-body");
$('<h1>').text($.i18n._('core-index/metaDatas')).appendTo(body); $('<h1>').text($.i18n('core-index/metaDatas')).appendTo(body);
var metadataTable = $("<table>") var metadataTable = $("<table>")
.addClass("list-table") .addClass("list-table")
.addClass("preferences") .addClass("preferences")
.html('<tr><th></th><th>'+$.i18n._('core-index/key')+'</th><th>'+$.i18n._('core-index/value')+'</th><th></th></tr>') .html('<tr><th></th><th>'+$.i18n('core-index/key')+'</th><th>'+$.i18n('core-index/value')+'</th><th></th></tr>')
.appendTo(body)[0]; .appendTo(body)[0];
var flattenObject = function(ob, key) { var flattenObject = function(ob, key) {

10
main/webapp/modules/core/scripts/index/import-project-ui.js
View File

@ -37,15 +37,15 @@ Refine.ImportProjectUI = function(elmt) {
this._elmt = elmt; this._elmt = elmt;
this._elmts = DOM.bind(elmt); this._elmts = DOM.bind(elmt);
$('#or-import-locate').text($.i18n._('core-index-import/locate')); $('#or-import-locate').text($.i18n('core-index-import/locate'));
$('#or-import-file').text($.i18n._('core-index-import/file')); $('#or-import-file').text($.i18n('core-index-import/file'));
$('#or-import-rename').text($.i18n._('core-index-import/rename')); $('#or-import-rename').text($.i18n('core-index-import/rename'));
$('#import-project-button').attr("value",$.i18n._('core-buttons/import-proj')); $('#import-project-button').attr("value",$.i18n('core-buttons/import-proj'));
}; };
Refine.actionAreas.push({ Refine.actionAreas.push({
id: "import-project", id: "import-project",
label: $.i18n._('core-index-import/import-proj'), label: $.i18n('core-index-import/import-proj'),
uiClass: Refine.ImportProjectUI uiClass: Refine.ImportProjectUI
}); });

8
main/webapp/modules/core/scripts/index/lang-settings-ui.js
View File

@ -6,8 +6,8 @@ Refine.SetLanguageUI = function(elmt) {
this._elmt = elmt; this._elmt = elmt;
this._elmts = DOM.bind(elmt); this._elmts = DOM.bind(elmt);
this._elmts.or_lang_label.text($.i18n._('core-index-lang/label')+":"); this._elmts.or_lang_label.text($.i18n('core-index-lang/label')+":");
this._elmts.set_lan_btn.attr("value", $.i18n._('core-index-lang/send-req')); this._elmts.set_lan_btn.attr("value", $.i18n('core-index-lang/send-req'));
$.ajax({ $.ajax({
@ -37,7 +37,7 @@ Refine.SetLanguageUI = function(elmt) {
value : $("#langDD option:selected").val() value : $("#langDD option:selected").val()
}, },
success : function(data) { success : function(data) {
alert($.i18n._('core-index-lang/page-reload')); alert($.i18n('core-index-lang/page-reload'));
location.reload(true); location.reload(true);
} }
}); });
@ -49,6 +49,6 @@ Refine.SetLanguageUI.prototype.resize = function() {
Refine.actionAreas.push({ Refine.actionAreas.push({
id : "lang-settings", id : "lang-settings",
label : $.i18n._('core-index-lang/lang-settings'), label : $.i18n('core-index-lang/lang-settings'),
uiClass : Refine.SetLanguageUI uiClass : Refine.SetLanguageUI
}); });

32
main/webapp/modules/core/scripts/index/open-project-ui.js
View File

@ -57,7 +57,7 @@ Refine.OpenProjectUI = function(elmt) {
return self._onClickUploadFileButton(evt); return self._onClickUploadFileButton(evt);
}); });
$('#projects-workspace-open').text($.i18n._('core-index-open/browse')); $('#projects-workspace-open').text($.i18n('core-index-open/browse'));
$('#projects-workspace-open').click(function() { $('#projects-workspace-open').click(function() {
$.ajax({ $.ajax({
type: "POST", type: "POST",
@ -190,12 +190,12 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
'<table class="tablesorter-blue list-table"><thead><tr>' + '<table class="tablesorter-blue list-table"><thead><tr>' +
'<th></th>' + '<th></th>' +
'<th></th>' + '<th></th>' +
'<th>'+$.i18n._('core-index-open/last-mod')+'</th>' + '<th>'+$.i18n('core-index-open/last-mod')+'</th>' +
'<th>'+$.i18n._('core-index-open/name')+'</th>' + '<th>'+$.i18n('core-index-open/name')+'</th>' +
'<th>'+$.i18n._('core-index-open/tags')+'</th>' + '<th>'+$.i18n('core-index-open/tags')+'</th>' +
'<th>'+$.i18n._('core-index-open/subject')+'</th>' + '<th>'+$.i18n('core-index-open/subject')+'</th>' +
'<th>'+$.i18n._('core-index-open/description')+'</th>' + '<th>'+$.i18n('core-index-open/description')+'</th>' +
'<th>'+$.i18n._('core-index-open/row-count')+'</th>' + '<th>'+$.i18n('core-index-open/row-count')+'</th>' +
(function() { (function() {
var htmlDisplay = ""; var htmlDisplay = "";
for (var n in data.customMetadataColumns) { for (var n in data.customMetadataColumns) {
@ -215,11 +215,11 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
var deleteLink = $('<a></a>') var deleteLink = $('<a></a>')
.addClass("delete-project") .addClass("delete-project")
.attr("title",$.i18n._('core-index-open/del-title')) .attr("title",$.i18n('core-index-open/del-title'))
.attr("href","") .attr("href","")
.html("<img src='images/close.png' />") .html("<img src='images/close.png' />")
.click(function() { .click(function() {
if (window.confirm($.i18n._('core-index-open/del-body') + project.name + "\"?")) { if (window.confirm($.i18n('core-index-open/del-body') + project.name + "\"?")) {
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "command/core/delete-project", url: "command/core/delete-project",
@ -240,7 +240,7 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
var metadataCell = $(tr.insertCell(tr.cells.length)); var metadataCell = $(tr.insertCell(tr.cells.length));
var editMetadataLink = $('<a></a>') var editMetadataLink = $('<a></a>')
.text($.i18n._('core-index-open/edit-meta-data')) .text($.i18n('core-index-open/edit-meta-data'))
.addClass("secondary") .addClass("secondary")
.attr("href", "javascript:{}") .attr("href", "javascript:{}")
.click(function() { .click(function() {
@ -265,7 +265,7 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {
$("<span/>") $("<span/>")
.addClass("project-tag") .addClass("project-tag")
.text(tag) .text(tag)
.attr("title", $.i18n._('core-index-open/edit-tags')) .attr("title", $.i18n('core-index-open/edit-tags'))
.appendTo(tagsCell); .appendTo(tagsCell);
$(tr).addClass(tag); $(tr).addClass(tag);
}); });
@ -314,10 +314,10 @@ Refine.OpenProjectUI.prototype._onClickUploadFileButton = function(evt) {
var projectName = $("#project-name-input")[0].value; var projectName = $("#project-name-input")[0].value;
var dataURL = $.trim($("#project-url-input")[0].value); var dataURL = $.trim($("#project-url-input")[0].value);
if (! $.trim(projectName).length) { if (! $.trim(projectName).length) {
window.alert($.i18n._('core-index-open/warning-proj-name')); window.alert($.i18n('core-index-open/warning-proj-name'));
} else if ($("#project-file-input")[0].files.length === 0 && ! dataURL.length) { } else if ($("#project-file-input")[0].files.length === 0 && ! dataURL.length) {
window.alert($.i18n._('core-index-open/warning-data-file')); window.alert($.i18n('core-index-open/warning-data-file'));
} else { } else {
$("#file-upload-form").attr("action", $("#file-upload-form").attr("action",
@ -359,7 +359,7 @@ Refine.OpenProjectUI.refreshProject = function(tr, metaData, project) {
var tagsCell = $("<span/>") var tagsCell = $("<span/>")
.addClass("project-tag") .addClass("project-tag")
.text(tag) .text(tag)
.attr("title", $.i18n._('core-index-open/edit-tags')) .attr("title", $.i18n('core-index-open/edit-tags'))
.appendTo(tagCol); .appendTo(tagCol);
tagCol.parent().addClass(tag); tagCol.parent().addClass(tag);
}); });
@ -369,7 +369,7 @@ Refine.OpenProjectUI.refreshProject = function(tr, metaData, project) {
var tagsCell = $("<span/>") var tagsCell = $("<span/>")
.addClass("project-tag") .addClass("project-tag")
.text(tag) .text(tag)
.attr("title", $.i18n._('core-index-open/edit-tags')) .attr("title", $.i18n('core-index-open/edit-tags'))
.appendTo(tagCol); .appendTo(tagCol);
tagCol.parent().addClass(tag); tagCol.parent().addClass(tag);
}); });
@ -426,6 +426,6 @@ Refine.OpenProjectUI.refreshProject = function(tr, metaData, project) {
Refine.actionAreas.push({ Refine.actionAreas.push({
id: "open-project", id: "open-project",
label: $.i18n._('core-index-open/open-proj'), label: $.i18n('core-index-open/open-proj'),
uiClass: Refine.OpenProjectUI uiClass: Refine.OpenProjectUI
}); });

26
main/webapp/modules/core/scripts/index/parser-interfaces/excel-parser-ui.js
View File

@ -120,19 +120,19 @@ Refine.ExcelParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); });
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-worksheet').text($.i18n._('core-index-import/import-worksheet')); $('#or-import-worksheet').text($.i18n('core-index-import/import-worksheet'));
$('#or-import-ignore').text($.i18n._('core-index-parser/ignore-first')); $('#or-import-ignore').text($.i18n('core-index-parser/ignore-first'));
$('#or-import-lines').text($.i18n._('core-index-parser/lines-beg')); $('#or-import-lines').text($.i18n('core-index-parser/lines-beg'));
$('#or-import-parse').text($.i18n._('core-index-parser/parse-next')); $('#or-import-parse').text($.i18n('core-index-parser/parse-next'));
$('#or-import-header').text($.i18n._('core-index-parser/lines-header')); $('#or-import-header').text($.i18n('core-index-parser/lines-header'));
$('#or-import-discard').text($.i18n._('core-index-parser/discard-initial')); $('#or-import-discard').text($.i18n('core-index-parser/discard-initial'));
$('#or-import-rows').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows').text($.i18n('core-index-parser/rows-data'));
$('#or-import-load').text($.i18n._('core-index-parser/load-at-most')); $('#or-import-load').text($.i18n('core-index-parser/load-at-most'));
$('#or-import-rows2').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows2').text($.i18n('core-index-parser/rows-data'));
$('#or-import-blank').text($.i18n._('core-index-parser/store-blank')); $('#or-import-blank').text($.i18n('core-index-parser/store-blank'));
$('#or-import-null').text($.i18n._('core-index-parser/store-nulls')); $('#or-import-null').text($.i18n('core-index-parser/store-nulls'));
$('#or-import-source').html($.i18n._('core-index-parser/store-source')); $('#or-import-source').html($.i18n('core-index-parser/store-source'));
var sheetTable = this._optionContainerElmts.sheetRecordContainer[0]; var sheetTable = this._optionContainerElmts.sheetRecordContainer[0];
$.each(this._config.sheetRecords, function(i, v) { $.each(this._config.sheetRecords, function(i, v) {

36
main/webapp/modules/core/scripts/index/parser-interfaces/fixed-width-parser-ui.js
View File

@ -121,25 +121,25 @@ Refine.FixedWidthParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self.updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self.updatePreview(); });
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-encoding').html($.i18n._('core-index-import/char-encoding')); $('#or-import-encoding').html($.i18n('core-index-import/char-encoding'));
$('#or-import-columnWidth').text($.i18n._('core-index-import/column-widths')); $('#or-import-columnWidth').text($.i18n('core-index-import/column-widths'));
$('#or-import-columnNames').text($.i18n._('core-index-import/column-names')); $('#or-import-columnNames').text($.i18n('core-index-import/column-names'));
$('#or-import-comma').text($.i18n._('core-index-import/comma-separated')); $('#or-import-comma').text($.i18n('core-index-import/comma-separated'));
$('#or-import-optional').text($.i18n._('core-index-import/optional-separated')); $('#or-import-optional').text($.i18n('core-index-import/optional-separated'));
$('#or-import-ignore').text($.i18n._('core-index-parser/ignore-first')); $('#or-import-ignore').text($.i18n('core-index-parser/ignore-first'));
$('#or-import-lines').text($.i18n._('core-index-parser/lines-beg')); $('#or-import-lines').text($.i18n('core-index-parser/lines-beg'));
$('#or-import-parse').text($.i18n._('core-index-parser/parse-next')); $('#or-import-parse').text($.i18n('core-index-parser/parse-next'));
$('#or-import-header').text($.i18n._('core-index-parser/lines-header')); $('#or-import-header').text($.i18n('core-index-parser/lines-header'));
$('#or-import-discard').text($.i18n._('core-index-parser/discard-initial')); $('#or-import-discard').text($.i18n('core-index-parser/discard-initial'));
$('#or-import-rows').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows').text($.i18n('core-index-parser/rows-data'));
$('#or-import-load').text($.i18n._('core-index-parser/load-at-most')); $('#or-import-load').text($.i18n('core-index-parser/load-at-most'));
$('#or-import-rows2').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows2').text($.i18n('core-index-parser/rows-data'));
$('#or-import-parseCell').html($.i18n._('core-index-parser/parse-cell')); $('#or-import-parseCell').html($.i18n('core-index-parser/parse-cell'));
$('#or-import-blank').text($.i18n._('core-index-parser/store-blank')); $('#or-import-blank').text($.i18n('core-index-parser/store-blank'));
$('#or-import-null').text($.i18n._('core-index-parser/store-nulls')); $('#or-import-null').text($.i18n('core-index-parser/store-nulls'));
$('#or-import-source').html($.i18n._('core-index-parser/store-source')); $('#or-import-source').html($.i18n('core-index-parser/store-source'));
this._optionContainerElmts.encodingInput this._optionContainerElmts.encodingInput
.attr('value', this._config.encoding || '') .attr('value', this._config.encoding || '')

20
main/webapp/modules/core/scripts/index/parser-interfaces/json-parser-ui.js
View File

@ -61,7 +61,7 @@ Refine.JsonParserUI.prototype.confirmReadyToCreateProject = function() {
if ((this._config.recordPath) && this._config.recordPath.length > 0) { if ((this._config.recordPath) && this._config.recordPath.length > 0) {
return true; return true;
} else { } else {
window.alert($.i18n._('core-index-import/warning-record-path')); window.alert($.i18n('core-index-import/warning-record-path'));
} }
}; };
@ -107,15 +107,15 @@ Refine.JsonParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); });
this._optionContainerElmts.pickRecordElementsButton.text($.i18n._('core-index-import/warning-record-path')); this._optionContainerElmts.pickRecordElementsButton.text($.i18n('core-index-import/warning-record-path'));
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-load').text($.i18n._('core-index-parser/load-at-most')); $('#or-import-load').text($.i18n('core-index-parser/load-at-most'));
$('#or-import-rows').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows').text($.i18n('core-index-parser/rows-data'));
$('#or-import-preserve').text($.i18n._('core-index-parser/preserve-empty')); $('#or-import-preserve').text($.i18n('core-index-parser/preserve-empty'));
$('#or-import-trim').html($.i18n._('core-index-parser/trim')); $('#or-import-trim').html($.i18n('core-index-parser/trim'));
$('#or-import-parseCell').html($.i18n._('core-index-parser/parse-cell')); $('#or-import-parseCell').html($.i18n('core-index-parser/parse-cell'));
$('#or-import-source').html($.i18n._('core-index-parser/store-source')); $('#or-import-source').html($.i18n('core-index-parser/store-source'));
$('#or-import-jsonParser').text($.i18n._('core-index-parser/json-parser')); $('#or-import-jsonParser').text($.i18n('core-index-parser/json-parser'));
if (this._config.limit > 0) { if (this._config.limit > 0) {
this._optionContainerElmts.limitCheckbox.prop("checked", true); this._optionContainerElmts.limitCheckbox.prop("checked", true);

30
main/webapp/modules/core/scripts/index/parser-interfaces/line-based-parser-ui.js
View File

@ -110,21 +110,21 @@ Refine.LineBasedParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); });
$('#or-import-encoding').html($.i18n._('core-index-import/char-encoding')); $('#or-import-encoding').html($.i18n('core-index-import/char-encoding'));
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-parseEvery').html($.i18n._('core-index-parser/parse-every')); $('#or-import-parseEvery').html($.i18n('core-index-parser/parse-every'));
$('#or-impor-linesIntoRow').html($.i18n._('core-index-parser/lines-into-row')); $('#or-impor-linesIntoRow').html($.i18n('core-index-parser/lines-into-row'));
$('#or-import-blank').text($.i18n._('core-index-parser/store-blank')); $('#or-import-blank').text($.i18n('core-index-parser/store-blank'));
$('#or-import-null').text($.i18n._('core-index-parser/store-nulls')); $('#or-import-null').text($.i18n('core-index-parser/store-nulls'));
$('#or-import-source').html($.i18n._('core-index-parser/store-source')); $('#or-import-source').html($.i18n('core-index-parser/store-source'));
$('#or-import-ignore').text($.i18n._('core-index-parser/ignore-first')); $('#or-import-ignore').text($.i18n('core-index-parser/ignore-first'));
$('#or-import-lines').text($.i18n._('core-index-parser/lines-beg')); $('#or-import-lines').text($.i18n('core-index-parser/lines-beg'));
$('#or-import-parse').text($.i18n._('core-index-parser/parse-next')); $('#or-import-parse').text($.i18n('core-index-parser/parse-next'));
$('#or-import-header').text($.i18n._('core-index-parser/lines-header')); $('#or-import-header').text($.i18n('core-index-parser/lines-header'));
$('#or-import-discard').text($.i18n._('core-index-parser/discard-initial')); $('#or-import-discard').text($.i18n('core-index-parser/discard-initial'));
$('#or-import-rows').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows').text($.i18n('core-index-parser/rows-data'));
$('#or-import-load').text($.i18n._('core-index-parser/load-at-most')); $('#or-import-load').text($.i18n('core-index-parser/load-at-most'));
$('#or-import-rows2').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows2').text($.i18n('core-index-parser/rows-data'));
this._optionContainerElmts.encodingInput this._optionContainerElmts.encodingInput
.attr('value', this._config.encoding || '') .attr('value', this._config.encoding || '')

4
main/webapp/modules/core/scripts/index/parser-interfaces/rdf-triples-parser-ui.js
View File

@ -76,8 +76,8 @@ Refine.RdfTriplesParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); });
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-encoding').html($.i18n._('core-index-import/char-encoding')); $('#or-import-encoding').html($.i18n('core-index-import/char-encoding'));
this._optionContainerElmts.encodingInput this._optionContainerElmts.encodingInput
.attr('value', this._config.encoding || '') .attr('value', this._config.encoding || '')

46
main/webapp/modules/core/scripts/index/parser-interfaces/separator-based-parser-ui.js
View File

@ -136,32 +136,32 @@ Refine.SeparatorBasedParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); });
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-encoding').html($.i18n._('core-index-import/char-encoding')); $('#or-import-encoding').html($.i18n('core-index-import/char-encoding'));
$('#or-import-colsep').html($.i18n._('core-index-parser/col-separated-by')); $('#or-import-colsep').html($.i18n('core-index-parser/col-separated-by'));
$('#or-import-commas').html($.i18n._('core-index-parser/commas')); $('#or-import-commas').html($.i18n('core-index-parser/commas'));
$('#or-import-tabs').html($.i18n._('core-index-parser/tabs')); $('#or-import-tabs').html($.i18n('core-index-parser/tabs'));
$('#or-import-custom').html($.i18n._('core-index-parser/custom')); $('#or-import-custom').html($.i18n('core-index-parser/custom'));
$('#or-import-escape').html($.i18n._('core-index-parser/escape')); $('#or-import-escape').html($.i18n('core-index-parser/escape'));
$('#or-import-columnNames').html($.i18n._('core-index-parser/column-names-label') + ':'); $('#or-import-columnNames').html($.i18n('core-index-parser/column-names-label') + ':');
$('#or-import-optional').html($.i18n._('core-index-parser/column-names-optional')); $('#or-import-optional').html($.i18n('core-index-parser/column-names-optional'));
self._optionContainerElmts.columnNamesInput.prop('disabled', true); self._optionContainerElmts.columnNamesInput.prop('disabled', true);
$('#or-import-ignore').text($.i18n._('core-index-parser/ignore-first')); $('#or-import-ignore').text($.i18n('core-index-parser/ignore-first'));
$('#or-import-lines').text($.i18n._('core-index-parser/lines-beg')); $('#or-import-lines').text($.i18n('core-index-parser/lines-beg'));
$('#or-import-parse').text($.i18n._('core-index-parser/parse-next')); $('#or-import-parse').text($.i18n('core-index-parser/parse-next'));
$('#or-import-header').text($.i18n._('core-index-parser/lines-header')); $('#or-import-header').text($.i18n('core-index-parser/lines-header'));
$('#or-import-discard').text($.i18n._('core-index-parser/discard-initial')); $('#or-import-discard').text($.i18n('core-index-parser/discard-initial'));
$('#or-import-rows').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows').text($.i18n('core-index-parser/rows-data'));
$('#or-import-load').text($.i18n._('core-index-parser/load-at-most')); $('#or-import-load').text($.i18n('core-index-parser/load-at-most'));
$('#or-import-rows2').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows2').text($.i18n('core-index-parser/rows-data'));
$('#or-import-parseCell').html($.i18n._('core-index-parser/parse-cell')); $('#or-import-parseCell').html($.i18n('core-index-parser/parse-cell'));
$('#or-import-quote').html($.i18n._('core-index-parser/use-quote')); $('#or-import-quote').html($.i18n('core-index-parser/use-quote'));
$('#or-import-quote-character').html($.i18n._('core-index-parser/quote-delimits-cells')); $('#or-import-quote-character').html($.i18n('core-index-parser/quote-delimits-cells'));
$('#or-import-blank').text($.i18n._('core-index-parser/store-blank')); $('#or-import-blank').text($.i18n('core-index-parser/store-blank'));
$('#or-import-null').text($.i18n._('core-index-parser/store-nulls')); $('#or-import-null').text($.i18n('core-index-parser/store-nulls'));
$('#or-import-source').html($.i18n._('core-index-parser/store-source')); $('#or-import-source').html($.i18n('core-index-parser/store-source'));
this._optionContainerElmts.encodingInput this._optionContainerElmts.encodingInput
.attr('value', this._config.encoding || '') .attr('value', this._config.encoding || '')

28
main/webapp/modules/core/scripts/index/parser-interfaces/wikitext-parser-ui.js
View File

@ -114,20 +114,20 @@ Refine.WikitextParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); });
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-wiki-base-url').text($.i18n._('core-index-parser/wiki-base-url')); $('#or-import-wiki-base-url').text($.i18n('core-index-parser/wiki-base-url'));
$('#or-import-parse').text($.i18n._('core-index-parser/parse-next')); $('#or-import-parse').text($.i18n('core-index-parser/parse-next'));
$('#or-import-header').text($.i18n._('core-index-parser/lines-header')); $('#or-import-header').text($.i18n('core-index-parser/lines-header'));
$('#or-import-load').text($.i18n._('core-index-parser/load-at-most')); $('#or-import-load').text($.i18n('core-index-parser/load-at-most'));
$('#or-import-rows2').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows2').text($.i18n('core-index-parser/rows-data'));
$('#or-import-parseCell').html($.i18n._('core-index-parser/parse-cell')); $('#or-import-parseCell').html($.i18n('core-index-parser/parse-cell'));
$('#or-import-blankSpanningCells').text($.i18n._('core-index-parser/blank-spanning-cells')); $('#or-import-blankSpanningCells').text($.i18n('core-index-parser/blank-spanning-cells'));
$('#or-import-includeRawTemplates').text($.i18n._('core-index-parser/include-raw-templates')); $('#or-import-includeRawTemplates').text($.i18n('core-index-parser/include-raw-templates'));
$('#or-import-parseReferences').text($.i18n._('core-index-parser/parse-references')); $('#or-import-parseReferences').text($.i18n('core-index-parser/parse-references'));
$('#or-import-blank').text($.i18n._('core-index-parser/store-blank')); $('#or-import-blank').text($.i18n('core-index-parser/store-blank'));
$('#or-import-null').text($.i18n._('core-index-parser/store-nulls')); $('#or-import-null').text($.i18n('core-index-parser/store-nulls'));
$('#or-import-source').html($.i18n._('core-index-parser/store-source')); $('#or-import-source').html($.i18n('core-index-parser/store-source'));
/* /*
this._optionContainerElmts.encodingInput this._optionContainerElmts.encodingInput
@ -214,7 +214,7 @@ Refine.WikitextParserUI.prototype._updatePreview = function() {
var container = self._dataContainer.unbind().empty(); var container = self._dataContainer.unbind().empty();
if (projectData.rowModel.rows.length === 0) { if (projectData.rowModel.rows.length === 0) {
$('<div>').addClass("wikitext-parser-ui-message") $('<div>').addClass("wikitext-parser-ui-message")
.text($.i18n._('core-index-parser/invalid-wikitext')).appendTo(container); .text($.i18n('core-index-parser/invalid-wikitext')).appendTo(container);
} else { } else {
new Refine.PreviewTable(projectData, container); new Refine.PreviewTable(projectData, container);
} }

20
main/webapp/modules/core/scripts/index/parser-interfaces/xml-parser-ui.js
View File

@ -61,7 +61,7 @@ Refine.XmlParserUI.prototype.confirmReadyToCreateProject = function() {
if ((this._config.recordPath) && this._config.recordPath.length > 0) { if ((this._config.recordPath) && this._config.recordPath.length > 0) {
return true; return true;
} else { } else {
window.alert($.i18n._('core-index-import/warning-record-path')); window.alert($.i18n('core-index-import/warning-record-path'));
} }
}; };
@ -105,14 +105,14 @@ Refine.XmlParserUI.prototype._initialize = function() {
this._optionContainerElmts = DOM.bind(this._optionContainer); this._optionContainerElmts = DOM.bind(this._optionContainer);
this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); }); this._optionContainerElmts.previewButton.click(function() { self._updatePreview(); });
this._optionContainerElmts.pickRecordElementsButton.html($.i18n._('core-buttons/pick-record')); this._optionContainerElmts.pickRecordElementsButton.html($.i18n('core-buttons/pick-record'));
this._optionContainerElmts.previewButton.html($.i18n._('core-buttons/update-preview')); this._optionContainerElmts.previewButton.html($.i18n('core-buttons/update-preview'));
$('#or-import-rows').text($.i18n._('core-index-parser/rows-data')); $('#or-import-rows').text($.i18n('core-index-parser/rows-data'));
$('#or-import-load').text($.i18n._('core-index-parser/load-at-most')); $('#or-import-load').text($.i18n('core-index-parser/load-at-most'));
$('#or-import-preserve').text($.i18n._('core-index-parser/preserve-empty')); $('#or-import-preserve').text($.i18n('core-index-parser/preserve-empty'));
$('#or-import-trim').html($.i18n._('core-index-parser/trim')); $('#or-import-trim').html($.i18n('core-index-parser/trim'));
$('#or-import-parseCell').html($.i18n._('core-index-parser/parse-cell')); $('#or-import-parseCell').html($.i18n('core-index-parser/parse-cell'));
$('#or-import-store').html($.i18n._('core-index-parser/store-source')); $('#or-import-store').html($.i18n('core-index-parser/store-source'));
if (this._config.limit > 0) { if (this._config.limit > 0) {
this._optionContainerElmts.limitCheckbox.prop("checked", true); this._optionContainerElmts.limitCheckbox.prop("checked", true);
@ -147,7 +147,7 @@ Refine.XmlParserUI.prototype._showPickRecordElementsUI = function() {
this._dataContainer.unbind().empty().html( this._dataContainer.unbind().empty().html(
DOM.loadHTML("core", "scripts/index/parser-interfaces/xml-parser-select-ui.html")); DOM.loadHTML("core", "scripts/index/parser-interfaces/xml-parser-select-ui.html"));
$('#or-import-clickXML').text($.i18n._('core-index-parser/click-xml')); $('#or-import-clickXML').text($.i18n('core-index-parser/click-xml'));
var elmts = DOM.bind(this._dataContainer); var elmts = DOM.bind(this._dataContainer);

25
main/webapp/modules/core/scripts/preferences.js
View File

@ -44,10 +44,11 @@ module : "core",
//lang : lang //lang : lang
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
lang = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
//End internationalization //End internationalization
function deDupUserMetaData(arrObj) { function deDupUserMetaData(arrObj) {
@ -69,8 +70,8 @@ function PreferenceUI(tr, key, value) {
var td2 = tr.insertCell(2); var td2 = tr.insertCell(2);
$('<button class="button">').text($.i18n._('core-index/edit')).appendTo(td2).click(function() { $('<button class="button">').text($.i18n('core-index/edit')).appendTo(td2).click(function() {
var newValue = window.prompt($.i18n._('core-index/change-value')+" " + key, value); var newValue = window.prompt($.i18n('core-index/change-value')+" " + key, value);
if (newValue !== null) { if (newValue !== null) {
if (key === "userMetadata") { if (key === "userMetadata") {
newValue = deDupUserMetaData(newValue); newValue = deDupUserMetaData(newValue);
@ -93,8 +94,8 @@ function PreferenceUI(tr, key, value) {
} }
}); });
$('<button class="button">').text($.i18n._('core-index/delete')).appendTo(td2).click(function() { $('<button class="button">').text($.i18n('core-index/delete')).appendTo(td2).click(function() {
if (window.confirm($.i18n._('core-index/delete-key')+" " + key + "?")) { if (window.confirm($.i18n('core-index/delete-key')+" " + key + "?")) {
$.post( $.post(
"command/core/set-preference", "command/core/set-preference",
{ {
@ -123,13 +124,13 @@ function PreferenceUI(tr, key, value) {
function populatePreferences(prefs) { function populatePreferences(prefs) {
var body = $("#body-info").empty(); var body = $("#body-info").empty();
$("#or-proj-starting").text($.i18n._('core-project/starting')+"..."); $("#or-proj-starting").text($.i18n('core-project/starting')+"...");
$('<h1>').text($.i18n._('core-index/preferences')).appendTo(body); $('<h1>').text($.i18n('core-index/preferences')).appendTo(body);
var table = $('<table>') var table = $('<table>')
.addClass("list-table") .addClass("list-table")
.addClass("preferences") .addClass("preferences")
.html('<tr><th>'+$.i18n._('core-index/key')+'</th><th>'+$.i18n._('core-index/value')+'</th><th></th></tr>') .html('<tr><th>'+$.i18n('core-index/key')+'</th><th>'+$.i18n('core-index/value')+'</th><th></th></tr>')
.appendTo(body)[0]; .appendTo(body)[0];
for (var k in prefs) { for (var k in prefs) {
@ -141,10 +142,10 @@ function populatePreferences(prefs) {
var tdLast0 = trLast.insertCell(0); var tdLast0 = trLast.insertCell(0);
trLast.insertCell(1); trLast.insertCell(1);
trLast.insertCell(2); trLast.insertCell(2);
$('<button class="button">').text($.i18n._('core-index/add-pref')).appendTo(tdLast0).click(function() { $('<button class="button">').text($.i18n('core-index/add-pref')).appendTo(tdLast0).click(function() {
var key = window.prompt($.i18n._('core-index/add-pref')); var key = window.prompt($.i18n('core-index/add-pref'));
if (key) { if (key) {
var value = window.prompt($.i18n._('core-index/pref-key')); var value = window.prompt($.i18n('core-index/pref-key'));
if (value !== null) { if (value !== null) {
var tr = table.insertRow(table.rows.length - 1); var tr = table.insertRow(table.rows.length - 1);
preferenceUIs.push(new PreferenceUI(tr, key, value)); preferenceUIs.push(new PreferenceUI(tr, key, value));

28
main/webapp/modules/core/scripts/project.js
View File

@ -45,10 +45,12 @@ $.ajax({
// lang : lang // lang : lang
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data['dictionary'];
lang = data['lang'];
} }
}); });
$.i18n.setDictionary(dictionary); $.i18n().load(dictionary, lang);
$.i18n({ locale: lang });
// End internationalization // End internationalization
var Refine = { var Refine = {
@ -121,15 +123,15 @@ function initializeUI(uiState) {
$("#project-controls").show(); $("#project-controls").show();
$("#body").show(); $("#body").show();
$("#or-proj-open").text($.i18n._('core-project/open')+"..."); $("#or-proj-open").text($.i18n('core-project/open')+"...");
$("#project-permalink-button").text($.i18n._('core-project/permalink')); $("#project-permalink-button").text($.i18n('core-project/permalink'));
$("#project-name-button").attr("title",$.i18n._('core-project/proj-name')); $("#project-name-button").attr("title",$.i18n('core-project/proj-name'));
$("#or-proj-export").text($.i18n._('core-project/export')); $("#or-proj-export").text($.i18n('core-project/export'));
$("#or-proj-help").text($.i18n._('core-project/help')); $("#or-proj-help").text($.i18n('core-project/help'));
$("#or-proj-starting").text($.i18n._('core-project/starting')+"..."); $("#or-proj-starting").text($.i18n('core-project/starting')+"...");
$("#or-proj-facFil").text($.i18n._('core-project/facet-filter')); $("#or-proj-facFil").text($.i18n('core-project/facet-filter'));
$("#or-proj-undoRedo").text($.i18n._('core-project/undo-redo')); $("#or-proj-undoRedo").text($.i18n('core-project/undo-redo'));
$("#or-proj-ext").text($.i18n._('core-project/extensions')+":"); $("#or-proj-ext").text($.i18n('core-project/extensions')+":");
$('#project-name-button').click(Refine._renameProject); $('#project-name-button').click(Refine._renameProject);
$('#project-permalink-button').mouseenter(function() { $('#project-permalink-button').mouseenter(function() {
@ -204,7 +206,7 @@ Refine.reinitializeProjectData = function(f, fError) {
}; };
Refine._renameProject = function() { Refine._renameProject = function() {
var name = window.prompt($.i18n._('core-index/new-proj-name'), theProject.metadata.name); var name = window.prompt($.i18n('core-index/new-proj-name'), theProject.metadata.name);
if (name === null) { if (name === null) {
return; return;
} }
@ -224,7 +226,7 @@ Refine._renameProject = function() {
theProject.metadata.name = name; theProject.metadata.name = name;
Refine.setTitle(); Refine.setTitle();
} else { } else {
alert($.i18n._('core-index/error-rename')+" " + data.message); alert($.i18n('core-index/error-rename')+" " + data.message);
} }
} }
}); });

14
main/webapp/modules/core/scripts/project/browsing-engine.js
View File

@ -96,21 +96,21 @@ BrowsingEngine.prototype._initializeUI = function() {
this._div.html( this._div.html(
'<div class="browsing-panel-help" bind="help">' + '<div class="browsing-panel-help" bind="help">' +
'<h1>'+$.i18n._('core-project/use-facets')+'</h1>' + '<h1>'+$.i18n('core-project/use-facets')+'</h1>' +
'<p>'+$.i18n._('core-project/use-to-select')+'</p>' + '<p>'+$.i18n('core-project/use-to-select')+'</p>' +
'<p>'+$.i18n._('core-project/not-sure')+'<br /><a href="https://github.com/OpenRefine/OpenRefine/wiki/Screencasts" target="_blank"><b>'+$.i18n._('core-project/watch-cast')+'</b></a></p>' + '<p>'+$.i18n('core-project/not-sure')+'<br /><a href="https://github.com/OpenRefine/OpenRefine/wiki/Screencasts" target="_blank"><b>'+$.i18n('core-project/watch-cast')+'</b></a></p>' +
'</div>' + '</div>' +
'<div class="browsing-panel-header" bind="header">' + '<div class="browsing-panel-header" bind="header">' +
'<div class="browsing-panel-errors" bind="errors"></div>' + '<div class="browsing-panel-errors" bind="errors"></div>' +
'<div class="browsing-panel-indicator" bind="indicator">' + '<div class="browsing-panel-indicator" bind="indicator">' +
'<img src="images/small-spinner.gif" /> '+$.i18n._('core-project/refreshing-facet')+'' + '<img src="images/small-spinner.gif" /> '+$.i18n('core-project/refreshing-facet')+'' +
'</div>' + '</div>' +
'<div class="browsing-panel-controls" bind="controls">' + '<div class="browsing-panel-controls" bind="controls">' +
'<div class="browsing-panel-controls-refresh">' + '<div class="browsing-panel-controls-refresh">' +
'<a href="javascript:{}" bind="refreshLink" class="button" title="'+$.i18n._('core-project/update-facets')+'">'+$.i18n._('core-buttons/refresh')+'</a>' + '<a href="javascript:{}" bind="refreshLink" class="button" title="'+$.i18n('core-project/update-facets')+'">'+$.i18n('core-buttons/refresh')+'</a>' +
'</div>' + '</div>' +
'<a href="javascript:{}" bind="resetLink" class="button button-pill-left" title="'+$.i18n._('core-project/clear-selection')+'">'+$.i18n._('core-buttons/reset-all')+'</a>' + '<a href="javascript:{}" bind="resetLink" class="button button-pill-left" title="'+$.i18n('core-project/clear-selection')+'">'+$.i18n('core-buttons/reset-all')+'</a>' +
'<a href="javascript:{}" bind="removeLink" class="button button-pill-right" title="'+$.i18n._('core-project/remove-all')+'">'+$.i18n._('core-buttons/remove-all')+'</a>' + '<a href="javascript:{}" bind="removeLink" class="button button-pill-right" title="'+$.i18n('core-project/remove-all')+'">'+$.i18n('core-buttons/remove-all')+'</a>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'<ul bind="facets" class="facets-container"></ul>' '<ul bind="facets" class="facets-container"></ul>'

4
main/webapp/modules/core/scripts/project/edit-general-metadata-dialog.js
View File

@ -571,9 +571,9 @@ EditGeneralMetadataDialog.prototype._createDialog = function() {
var editor; var editor;
this._elmts.okButton.html($.i18n._('core-buttons/ok')); this._elmts.okButton.html($.i18n('core-buttons/ok'));
this._elmts.okButton.click(function() { self._submit(editor); }); this._elmts.okButton.click(function() { self._submit(editor); });
this._elmts.closeButton.html($.i18n._('core-buttons/close')); this._elmts.closeButton.html($.i18n('core-buttons/close'));
this._elmts.closeButton.click(function() { self._dismiss(); }); this._elmts.closeButton.click(function() { self._dismiss(); });
$.get( $.get(

40
main/webapp/modules/core/scripts/project/exporters.js
View File

@ -39,59 +39,59 @@ ExporterManager.handlers = {};
ExporterManager.MenuItems = [ ExporterManager.MenuItems = [
{ {
"id" : "core/export-project", "id" : "core/export-project",
"label": $.i18n._('core-project/export-project'), "label": $.i18n('core-project/export-project'),
"click": function() { ExporterManager.handlers.exportProject(); } "click": function() { ExporterManager.handlers.exportProject(); }
}, },
{ {
"id" : "core/project-data-package", "id" : "core/project-data-package",
"label": $.i18n._('core-project/project-data-package'), "label": $.i18n('core-project/project-data-package'),
"click": function() { ExporterManager.handlers.projectDataPackage(); } "click": function() { ExporterManager.handlers.projectDataPackage(); }
}, },
{}, {},
{ {
"id" : "core/export-tsv", "id" : "core/export-tsv",
"label": $.i18n._('core-project/tab-value'), "label": $.i18n('core-project/tab-value'),
"click": function() { ExporterManager.handlers.exportRows("tsv", "tsv"); } "click": function() { ExporterManager.handlers.exportRows("tsv", "tsv"); }
}, },
{ {
"id" : "core/export-csv", "id" : "core/export-csv",
"label": $.i18n._('core-project/comma-sep'), "label": $.i18n('core-project/comma-sep'),
"click": function() { ExporterManager.handlers.exportRows("csv", "csv"); } "click": function() { ExporterManager.handlers.exportRows("csv", "csv"); }
}, },
{ {
"id" : "core/export-html-table", "id" : "core/export-html-table",
"label": $.i18n._('core-project/html-table'), "label": $.i18n('core-project/html-table'),
"click": function() { ExporterManager.handlers.exportRows("html", "html"); } "click": function() { ExporterManager.handlers.exportRows("html", "html"); }
}, },
{ {
"id" : "core/export-excel", "id" : "core/export-excel",
"label": $.i18n._('core-project/excel'), "label": $.i18n('core-project/excel'),
"click": function() { ExporterManager.handlers.exportRows("xls", "xls"); } "click": function() { ExporterManager.handlers.exportRows("xls", "xls"); }
}, },
{ {
"id" : "core/export-excel-xml", "id" : "core/export-excel-xml",
"label": $.i18n._('core-project/excel-xml'), "label": $.i18n('core-project/excel-xml'),
"click": function() { ExporterManager.handlers.exportRows("xlsx", "xlsx"); } "click": function() { ExporterManager.handlers.exportRows("xlsx", "xlsx"); }
}, },
{ {
"id" : "core/export-ods", "id" : "core/export-ods",
"label": $.i18n._('core-project/odf'), "label": $.i18n('core-project/odf'),
"click": function() { ExporterManager.handlers.exportRows("ods", "ods"); } "click": function() { ExporterManager.handlers.exportRows("ods", "ods"); }
}, },
{}, {},
{ {
"id" : "core/export-custom-tabular", "id" : "core/export-custom-tabular",
"label": $.i18n._('core-project/custom-tabular'), "label": $.i18n('core-project/custom-tabular'),
"click": function() { new CustomTabularExporterDialog(); } "click": function() { new CustomTabularExporterDialog(); }
}, },
{ {
"id" : "core/export-sql", "id" : "core/export-sql",
"label": $.i18n._('core-project/sql-export'), "label": $.i18n('core-project/sql-export'),
"click": function() { new SqlExporterDialog(); } "click": function() { new SqlExporterDialog(); }
}, },
{ {
"id" : "core/export-templating", "id" : "core/export-templating",
"label": $.i18n._('core-project/templating'), "label": $.i18n('core-project/templating'),
"click": function() { new TemplatingExporterDialog(); } "click": function() { new TemplatingExporterDialog(); }
} }
]; ];
@ -116,7 +116,7 @@ ExporterManager.stripNonFileChars = function(name) {
ExporterManager.handlers.exportTripleloader = function(format) { ExporterManager.handlers.exportTripleloader = function(format) {
if (!theProject.overlayModels.freebaseProtograph) { if (!theProject.overlayModels.freebaseProtograph) {
alert($.i18n._('triple-loader/warning-align')); alert($.i18n('triple-loader/warning-align'));
} else { } else {
ExporterManager.handlers.exportRows(format, "txt"); ExporterManager.handlers.exportRows(format, "txt");
} }
@ -170,11 +170,11 @@ ExporterManager.handlers.exportProject = function() {
var dialog = $(DOM.loadHTML("core", "scripts/dialogs/export-project-dialog.html")); var dialog = $(DOM.loadHTML("core", "scripts/dialogs/export-project-dialog.html"));
var _elmts = DOM.bind(dialog); var _elmts = DOM.bind(dialog);
_elmts.dialogHeader.html($.i18n._('core-dialogs/choose-export-destination')); _elmts.dialogHeader.html($.i18n('core-dialogs/choose-export-destination'));
_elmts.toLocalRadio.html($.i18n._('core-dialogs/export-to-local')); _elmts.toLocalRadio.html($.i18n('core-dialogs/export-to-local'));
_elmts.toGoogleDriveRadio.html($.i18n._('core-dialogs/export-to-google-drive')); _elmts.toGoogleDriveRadio.html($.i18n('core-dialogs/export-to-google-drive'));
_elmts.exportButton.html($.i18n._('core-buttons/export')); _elmts.exportButton.html($.i18n('core-buttons/export'));
_elmts.cancelButton.html($.i18n._('core-buttons/cancel')); _elmts.cancelButton.html($.i18n('core-buttons/cancel'));
_elmts.exportButton.click(function() { _elmts.exportButton.click(function() {
if ($("input[name='export-destination']")[0].checked) { if ($("input[name='export-destination']")[0].checked) {
@ -194,7 +194,7 @@ ExporterManager.handlers.exportProject = function() {
var doExportToGoogleDrive = function() { var doExportToGoogleDrive = function() {
var name = window.prompt(prompt, theProject.metadata.name); var name = window.prompt(prompt, theProject.metadata.name);
if (name) { if (name) {
var dismiss = DialogSystem.showBusy($.i18n._('gdata-exporter/uploading')); var dismiss = DialogSystem.showBusy($.i18n('gdata-exporter/uploading'));
$.post( $.post(
"command/gdata/upload", "command/gdata/upload",
{ {
@ -206,9 +206,9 @@ ExporterManager.handlers.exportProject = function() {
dismiss(); dismiss();
if (o.url) { if (o.url) {
alert($.i18n._('gdata-exporter/upload-success') + o.url); alert($.i18n('gdata-exporter/upload-success') + o.url);
} else { } else {
alert($.i18n._('gdata-exporter/upload-error') + o.message) alert($.i18n('gdata-exporter/upload-error') + o.message)
} }
onDone(); onDone();
}, },

36
main/webapp/modules/core/scripts/project/history-panel.js
View File

@ -69,19 +69,19 @@ HistoryPanel.prototype.update = function(onDone) {
HistoryPanel.prototype._render = function() { HistoryPanel.prototype._render = function() {
var self = this; var self = this;
this._tabHeader.html($.i18n._('core-project/undo-redo')+' <span class="count">' + this._data.past.length + ' / ' + ( this._data.future.length + this._data.past.length ) + '</span>'); this._tabHeader.html($.i18n('core-project/undo-redo')+' <span class="count">' + this._data.past.length + ' / ' + ( this._data.future.length + this._data.past.length ) + '</span>');
this._div.empty().unbind().html(DOM.loadHTML("core", "scripts/project/history-panel.html")); this._div.empty().unbind().html(DOM.loadHTML("core", "scripts/project/history-panel.html"));
var elmts = DOM.bind(this._div); var elmts = DOM.bind(this._div);
elmts.or_proj_undo.html($.i18n._('core-project/undo-history')); elmts.or_proj_undo.html($.i18n('core-project/undo-history'));
elmts.or_proj_mistakes.html($.i18n._('core-project/mistakes')); elmts.or_proj_mistakes.html($.i18n('core-project/mistakes'));
elmts.or_proj_learnMore.html($.i18n._('core-project/learn-more')); elmts.or_proj_learnMore.html($.i18n('core-project/learn-more'));
elmts.applyLink.html($.i18n._('core-project/apply')); elmts.applyLink.html($.i18n('core-project/apply'));
elmts.extractLink.html($.i18n._('core-project/extract')); elmts.extractLink.html($.i18n('core-project/extract'));
elmts.or_proj_mistakes.html($.i18n._('core-project/mistakes')); elmts.or_proj_mistakes.html($.i18n('core-project/mistakes'));
elmts.or_proj_filter.html($.i18n._('core-project/filter')); elmts.or_proj_filter.html($.i18n('core-project/filter'));
var renderEntry = function(container, index, entry, lastDoneID, past) { var renderEntry = function(container, index, entry, lastDoneID, past) {
var a = $(DOM.loadHTML("core", "scripts/project/history-entry.html")).appendTo(container); var a = $(DOM.loadHTML("core", "scripts/project/history-entry.html")).appendTo(container);
@ -195,11 +195,11 @@ HistoryPanel.prototype._showExtractOperationsDialog = function(json) {
var frame = $(DOM.loadHTML("core", "scripts/project/history-extract-dialog.html")); var frame = $(DOM.loadHTML("core", "scripts/project/history-extract-dialog.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.html($.i18n._('core-project/extract-history')); elmts.dialogHeader.html($.i18n('core-project/extract-history'));
elmts.or_proj_extractSave.html($.i18n._('core-project/extract-save')); elmts.or_proj_extractSave.html($.i18n('core-project/extract-save'));
elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); elmts.selectAllButton.html($.i18n('core-buttons/select-all'));
elmts.unselectAllButton.html($.i18n._('core-buttons/unselect-all')); elmts.unselectAllButton.html($.i18n('core-buttons/unselect-all'));
elmts.closeButton.html($.i18n._('core-buttons/close')); elmts.closeButton.html($.i18n('core-buttons/close'));
var entryTable = elmts.entryTable[0]; var entryTable = elmts.entryTable[0];
var createEntry = function(entry) { var createEntry = function(entry) {
@ -265,11 +265,11 @@ HistoryPanel.prototype._showApplyOperationsDialog = function() {
var frame = $(DOM.loadHTML("core", "scripts/project/history-apply-dialog.html")); var frame = $(DOM.loadHTML("core", "scripts/project/history-apply-dialog.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.html($.i18n._('core-project/apply-operation')); elmts.dialogHeader.html($.i18n('core-project/apply-operation'));
elmts.or_proj_pasteJson.html($.i18n._('core-project/paste-json')); elmts.or_proj_pasteJson.html($.i18n('core-project/paste-json'));
elmts.applyButton.html($.i18n._('core-buttons/perform-op')); elmts.applyButton.html($.i18n('core-buttons/perform-op'));
elmts.cancelButton.html($.i18n._('core-buttons/cancel')); elmts.cancelButton.html($.i18n('core-buttons/cancel'));
var fixJson = function(json) { var fixJson = function(json) {
json = json.trim(); json = json.trim();
@ -291,7 +291,7 @@ HistoryPanel.prototype._showApplyOperationsDialog = function() {
json = fixJson(json); json = fixJson(json);
json = JSON.parse(json); json = JSON.parse(json);
} catch (e) { } catch (e) {
alert($.i18n._('core-project/json-invalid')+"."); alert($.i18n('core-project/json-invalid')+".");
return; return;
} }

18
main/webapp/modules/core/scripts/project/process-panel.js
View File

@ -43,7 +43,7 @@ function ProcessPanel(div) {
this._div.html(DOM.loadHTML("core", "scripts/project/progress-panel.html")); this._div.html(DOM.loadHTML("core", "scripts/project/progress-panel.html"));
this._elmts = DOM.bind(this._div); this._elmts = DOM.bind(this._div);
this._elmts.undoLink.html($.i18n._('core-project/undo')); this._elmts.undoLink.html($.i18n('core-project/undo'));
var self = this; var self = this;
$(window).keypress(function(evt) { $(window).keypress(function(evt) {
@ -153,9 +153,9 @@ ProcessPanel.prototype._render = function(newData) {
var process = processes[i]; var process = processes[i];
if (process.status != "pending") { if (process.status != "pending") {
// TODO: We should be using formatting, not string concatenation here // TODO: We should be using formatting, not string concatenation here
Refine.setTitle(process.progress + "% "+$.i18n._('core-project/complete')); Refine.setTitle(process.progress + "% "+$.i18n('core-project/complete'));
this._elmts.progressDescription.text(process.description); this._elmts.progressDescription.text(process.description);
this._elmts.progressSpan.text(process.progress + '% '+$.i18n._('core-project/complete')); this._elmts.progressSpan.text(process.progress + '% '+$.i18n('core-project/complete'));
} }
if ("onDone" in process) { if ("onDone" in process) {
newProcessMap[process.id] = process; newProcessMap[process.id] = process;
@ -164,16 +164,16 @@ ProcessPanel.prototype._render = function(newData) {
if (processes.length > 1) { if (processes.length > 1) {
var pending = processes.length - 1; var pending = processes.length - 1;
this._elmts.countSpan.text('(' + pending + (pending > 1 ? ' '+$.i18n._('core-project/other-processes')+')' : ' '+$.i18n._('core-project/other-process')+')')); this._elmts.countSpan.text('(' + pending + (pending > 1 ? ' '+$.i18n('core-project/other-processes')+')' : ' '+$.i18n('core-project/other-process')+')'));
} else { } else {
this._elmts.countSpan.empty(); this._elmts.countSpan.empty();
} }
this._elmts.cancelLink this._elmts.cancelLink
.unbind() .unbind()
.text(processes.length > 1 ? $.i18n._('core-project/cancel-all') : $.i18n._('core-project/cancel')) .text(processes.length > 1 ? $.i18n('core-project/cancel-all') : $.i18n('core-project/cancel'))
.click(function() { .click(function() {
self._cancelAll(); self._cancelAll();
$(this).text($.i18n._('core-project/canceling')).unbind(); $(this).text($.i18n('core-project/canceling')).unbind();
}); });
this._div.fadeIn(200); this._div.fadeIn(200);
@ -196,10 +196,10 @@ ProcessPanel.prototype._render = function(newData) {
}).join('\n'); }).join('\n');
if (this._data.processes.length == 0) { if (this._data.processes.length == 0) {
window.alert($.i18n._('core-project/last-op-er')+':\n' + messages); window.alert($.i18n('core-project/last-op-er')+':\n' + messages);
} else { } else {
if (window.confirm($.i18n._('core-project/last-op-er')+':\n' + messages + if (window.confirm($.i18n('core-project/last-op-er')+':\n' + messages +
'\n\n'+$.i18n._('core-project/continue-remaining')+'?')) { '\n\n'+$.i18n('core-project/continue-remaining')+'?')) {
$.post( $.post(
"command/core/apply-operations?" + $.param({ project: theProject.id }), "command/core/apply-operations?" + $.param({ project: theProject.id }),
{ operations: '[]' }, { operations: '[]' },

2
main/webapp/modules/core/scripts/project/summary-bar.js
View File

@ -42,7 +42,7 @@ SummaryBar.prototype._initializeUI = function() {
SummaryBar.prototype.updateResultCount = function() { SummaryBar.prototype.updateResultCount = function() {
var summaryText; var summaryText;
var units = theProject.rowModel.mode == "row-based" ? $.i18n._('core-views/rows') : $.i18n._('core-views/records'); var units = theProject.rowModel.mode == "row-based" ? $.i18n('core-views/rows') : $.i18n('core-views/records');
if (theProject.rowModel.filtered == theProject.rowModel.total) { if (theProject.rowModel.filtered == theProject.rowModel.total) {
summaryText = (theProject.rowModel.total) + ' ' + units; summaryText = (theProject.rowModel.total) + ' ' + units;
} else { } else {

20
main/webapp/modules/core/scripts/reconciliation/recon-dialog.js
View File

@ -44,13 +44,13 @@ ReconDialog.prototype._createDialog = function() {
var dialog = $(DOM.loadHTML("core", "scripts/reconciliation/recon-dialog.html")); var dialog = $(DOM.loadHTML("core", "scripts/reconciliation/recon-dialog.html"));
this._elmts = DOM.bind(dialog); this._elmts = DOM.bind(dialog);
this._elmts.dialogHeader.text($.i18n._('core-recon/recon-col')+' "' + this._column.name + '"'); this._elmts.dialogHeader.text($.i18n('core-recon/recon-col')+' "' + this._column.name + '"');
this._elmts.servicePanelMessage.html($.i18n._('core-recon/pick-service')); this._elmts.servicePanelMessage.html($.i18n('core-recon/pick-service'));
this._elmts.serviceListTitle.html($.i18n._('core-recon/service-title')); this._elmts.serviceListTitle.html($.i18n('core-recon/service-title'));
this._elmts.addStandardServiceButton.html($.i18n._('core-buttons/add-std-svc')+"..."); this._elmts.addStandardServiceButton.html($.i18n('core-buttons/add-std-svc')+"...");
this._elmts.reconcileButton.html($.i18n._('core-buttons/start-recon')); this._elmts.reconcileButton.html($.i18n('core-buttons/start-recon'));
this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));
this._elmts.addStandardServiceButton.click(function() { self._onAddStandardService(); }); this._elmts.addStandardServiceButton.click(function() { self._onAddStandardService(); });
@ -202,10 +202,10 @@ ReconDialog.prototype._onAddStandardService = function() {
var dialog = $(DOM.loadHTML("core", "scripts/reconciliation/add-standard-service-dialog.html")); var dialog = $(DOM.loadHTML("core", "scripts/reconciliation/add-standard-service-dialog.html"));
var elmts = DOM.bind(dialog); var elmts = DOM.bind(dialog);
elmts.dialogHeader.html($.i18n._('core-recon/add-std-srv')); elmts.dialogHeader.html($.i18n('core-recon/add-std-srv'));
elmts.or_recon_enterUrl.html($.i18n._('core-recon/enter-url')+":"); elmts.or_recon_enterUrl.html($.i18n('core-recon/enter-url')+":");
elmts.addButton.html($.i18n._('core-buttons/add-service')); elmts.addButton.html($.i18n('core-buttons/add-service'));
elmts.cancelButton.html($.i18n._('core-buttons/cancel')); elmts.cancelButton.html($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(dialog); var level = DialogSystem.showDialog(dialog);
var dismiss = function() { var dismiss = function() {

6
main/webapp/modules/core/scripts/reconciliation/recon-manager.js
View File

@ -63,7 +63,7 @@ ReconciliationManager.registerService = function(service) {
}; };
ReconciliationManager.registerStandardService = function(url, f) { ReconciliationManager.registerStandardService = function(url, f) {
var dismissBusy = DialogSystem.showBusy($.i18n._('core-recon/contact-service')+"..."); var dismissBusy = DialogSystem.showBusy($.i18n('core-recon/contact-service')+"...");
$.ajax( $.ajax(
url, url,
@ -91,7 +91,7 @@ ReconciliationManager.registerStandardService = function(url, f) {
}) })
.error(function(jqXHR, textStatus, errorThrown) { .error(function(jqXHR, textStatus, errorThrown) {
dismissBusy(); dismissBusy();
alert($.i18n._('core-recon/error-contact')+': ' + textStatus + ' : ' + errorThrown + ' - ' + url); alert($.i18n('core-recon/error-contact')+': ' + textStatus + ' : ' + errorThrown + ' - ' + url);
}); });
}; };
@ -141,7 +141,7 @@ ReconciliationManager.getOrRegisterServiceFromUrl = function(url, f) {
}; };
ReconciliationManager.ensureDefaultServicePresent = function() { ReconciliationManager.ensureDefaultServicePresent = function() {
var lang = $.i18n._('core-recon/wd-recon-lang'); var lang = $.i18n('core-recon/wd-recon-lang');
var url = "https://tools.wmflabs.org/openrefine-wikidata/"+lang+"/api"; var url = "https://tools.wmflabs.org/openrefine-wikidata/"+lang+"/api";
ReconciliationManager.getOrRegisterServiceFromUrl(url, function(service) { }); ReconciliationManager.getOrRegisterServiceFromUrl(url, function(service) { });
return url; return url;

20
main/webapp/modules/core/scripts/reconciliation/standard-service-panel.js
View File

@ -83,14 +83,14 @@ ReconStandardServicePanel.prototype._constructUI = function() {
this._panel = $(DOM.loadHTML("core", "scripts/reconciliation/standard-service-panel.html")).appendTo(this._container); this._panel = $(DOM.loadHTML("core", "scripts/reconciliation/standard-service-panel.html")).appendTo(this._container);
this._elmts = DOM.bind(this._panel); this._elmts = DOM.bind(this._panel);
this._elmts.or_proc_access.html("&raquo; "+$.i18n._('core-recon/access')); this._elmts.or_proc_access.html("&raquo; "+$.i18n('core-recon/access'));
this._elmts.rawServiceLink.html($.i18n._('core-recon/service-api')); this._elmts.rawServiceLink.html($.i18n('core-recon/service-api'));
this._elmts.or_proc_cellType.html($.i18n._('core-recon/cell-type')+":"); this._elmts.or_proc_cellType.html($.i18n('core-recon/cell-type')+":");
this._elmts.or_proc_colDetail.html($.i18n._('core-recon/col-detail')+":"); this._elmts.or_proc_colDetail.html($.i18n('core-recon/col-detail')+":");
this._elmts.or_proc_againstType.html($.i18n._('core-recon/against-type')+":"); this._elmts.or_proc_againstType.html($.i18n('core-recon/against-type')+":");
this._elmts.or_proc_noType.html($.i18n._('core-recon/no-type')); this._elmts.or_proc_noType.html($.i18n('core-recon/no-type'));
this._elmts.or_proc_autoMatch.html($.i18n._('core-recon/auto-match')); this._elmts.or_proc_autoMatch.html($.i18n('core-recon/auto-match'));
this._elmts.or_proc_max_candidates.html($.i18n._('core-recon/max-candidates')); this._elmts.or_proc_max_candidates.html($.i18n('core-recon/max-candidates'));
this._elmts.rawServiceLink.attr("href", this._service.url); this._elmts.rawServiceLink.attr("href", this._service.url);
@ -166,7 +166,7 @@ ReconStandardServicePanel.prototype._populatePanel = function() {
} else { } else {
$('<div>') $('<div>')
.addClass("recon-dialog-standard-service-panel-message") .addClass("recon-dialog-standard-service-panel-message")
.text($.i18n._('core-recon/warning-type-sugg')) .text($.i18n('core-recon/warning-type-sugg'))
.appendTo(this._elmts.typeContainer); .appendTo(this._elmts.typeContainer);
this._panel this._panel
@ -185,7 +185,7 @@ ReconStandardServicePanel.prototype._populatePanel = function() {
var detailTable = $( var detailTable = $(
'<table>' + '<table>' +
'<tr><th>'+$.i18n._('core-recon/column')+'</th><th>'+$.i18n._('core-recon/include')+'?</th><th>'+$.i18n._('core-recon/as-property')+'</th></tr>' + '<tr><th>'+$.i18n('core-recon/column')+'</th><th>'+$.i18n('core-recon/include')+'?</th><th>'+$.i18n('core-recon/as-property')+'</th></tr>' +
'</table>' '</table>'
).appendTo(detailTableContainer)[0]; ).appendTo(detailTableContainer)[0];

4
main/webapp/modules/core/scripts/util/date-time.js
View File

@ -96,7 +96,7 @@ DateTimeUtil.setIso8601Date = function(dateObject, string) {
var d = string.match(DateTimeUtil._dateRegexp); var d = string.match(DateTimeUtil._dateRegexp);
if(!d) { if(!d) {
throw new Error($.i18n._('core-util-enc/invalid-date')+": " + string); throw new Error($.i18n('core-util-enc/invalid-date')+": " + string);
} }
var sign = (d[1] == "-") ? -1 : 1; // BC or AD var sign = (d[1] == "-") ? -1 : 1; // BC or AD
@ -153,7 +153,7 @@ DateTimeUtil.setIso8601Time = function (dateObject, string) {
var d = string.match(DateTimeUtil._timeRegexp); var d = string.match(DateTimeUtil._timeRegexp);
if(!d) { if(!d) {
SimileAjax.Debug.warn($.i18n._('core-util-enc/invalid-date')+": " + string); SimileAjax.Debug.warn($.i18n('core-util-enc/invalid-date')+": " + string);
return false; return false;
} }
var hours = d[1]; var hours = d[1];

2
main/webapp/modules/core/scripts/util/dialog.js
View File

@ -103,7 +103,7 @@ DialogSystem.showBusy = function(message) {
var body = $('<div>').attr('id', 'loading-message').appendTo(frame); var body = $('<div>').attr('id', 'loading-message').appendTo(frame);
$('<img>').attr("src", "images/large-spinner.gif").appendTo(body); $('<img>').attr("src", "images/large-spinner.gif").appendTo(body);
$('<span>').html(" " + (message || $.i18n._('core-util-enc/working')+"...")).appendTo(body); $('<span>').html(" " + (message || $.i18n('core-util-enc/working')+"...")).appendTo(body);
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);

10
main/webapp/modules/core/scripts/util/encoding.js
View File

@ -41,10 +41,10 @@ Encoding.selectEncoding = function(input, onDone) {
$("#select-encodings-tabs").tabs({ selected: 0 }); $("#select-encodings-tabs").tabs({ selected: 0 });
elmts.dialogHeader.text($.i18n._('core-util-enc/select-enc')); elmts.dialogHeader.text($.i18n('core-util-enc/select-enc'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
$('#or-enc-common').text($.i18n._('core-util-enc/common')); $('#or-enc-common').text($.i18n('core-util-enc/common'));
$('#or-enc-all').text($.i18n._('core-util-enc/all')); $('#or-enc-all').text($.i18n('core-util-enc/all'));
var pickEncoding = function(encoding) { var pickEncoding = function(encoding) {
input[0].value = encoding.code; input[0].value = encoding.code;
@ -66,7 +66,7 @@ Encoding.selectEncoding = function(input, onDone) {
$(tr.insertCell(1)).text(encoding.aliases.join(', ')); $(tr.insertCell(1)).text(encoding.aliases.join(', '));
}; };
var generateEncodingList = function(container, filter) { var generateEncodingList = function(container, filter) {
var table = $('<table>').html('<tr><th>'+$.i18n._('core-util-enc/encoding')+'</th><th>'+$.i18n._('core-util-enc/aliases')+'</th></tr>').appendTo(container)[0]; var table = $('<table>').html('<tr><th>'+$.i18n('core-util-enc/encoding')+'</th><th>'+$.i18n('core-util-enc/aliases')+'</th></tr>').appendTo(container)[0];
$.each(Refine.encodings, function() { $.each(Refine.encodings, function() {
if (filter === null || this.code in filter) { if (filter === null || this.code in filter) {
renderEncoding(table, this); renderEncoding(table, this);

10
main/webapp/modules/core/scripts/util/misc.js
View File

@ -64,22 +64,22 @@ function formatRelativeDate(d) {
var tomorrow = Date.today().add({ days: 1 }); var tomorrow = Date.today().add({ days: 1 });
if (d.between(today, tomorrow)) { if (d.between(today, tomorrow)) {
return $.i18n._('core-util-enc/today')+" " + d.toString("h:mm tt"); return $.i18n('core-util-enc/today')+" " + d.toString("h:mm tt");
} else if (d.between(last_week, today)) { } else if (d.between(last_week, today)) {
var diff = Math.floor(today.getDayOfYear() - d.getDayOfYear()); var diff = Math.floor(today.getDayOfYear() - d.getDayOfYear());
return (diff <= 1) ? ($.i18n._('core-util-enc/yesterday')+" " + d.toString("h:mm tt")) : (diff + " "+$.i18n._('core-util-enc/days-ago')); return (diff <= 1) ? ($.i18n('core-util-enc/yesterday')+" " + d.toString("h:mm tt")) : (diff + " "+$.i18n('core-util-enc/days-ago'));
} else if (d.between(last_month, today)) { } else if (d.between(last_month, today)) {
var diff = Math.floor((today.getDayOfYear() - d.getDayOfYear()) / 7); var diff = Math.floor((today.getDayOfYear() - d.getDayOfYear()) / 7);
if (diff < 1) {diff += 52}; if (diff < 1) {diff += 52};
return (diff == 1) ? $.i18n._('core-util-enc/week-ago') : diff.toFixed(0) + " "+$.i18n._('core-util-enc/weeks-ago') ; return (diff == 1) ? $.i18n('core-util-enc/week-ago') : diff.toFixed(0) + " "+$.i18n('core-util-enc/weeks-ago') ;
} else if (d.between(almost_last_year, today)) { } else if (d.between(almost_last_year, today)) {
var diff = today.getMonth() - d.getMonth(); var diff = today.getMonth() - d.getMonth();
if (diff < 1) { if (diff < 1) {
diff += 12; diff += 12;
} }
return (diff == 1) ? $.i18n._('core-util-enc/month-ago') : diff + " "+ $.i18n._('core-util-enc/months-ago'); return (diff == 1) ? $.i18n('core-util-enc/month-ago') : diff + " "+ $.i18n('core-util-enc/months-ago');
} else { } else {
var diff = Math.floor(today.getYear() - d.getYear()); var diff = Math.floor(today.getYear() - d.getYear());
return (diff == 1) ? $.i18n._('core-util-enc/year-ago') : diff + " "+$.i18n._('core-util-enc/years-ago'); return (diff == 1) ? $.i18n('core-util-enc/year-ago') : diff + " "+$.i18n('core-util-enc/years-ago');
} }
} }

66
main/webapp/modules/core/scripts/views/data-table/cell-ui.js
View File

@ -50,7 +50,7 @@ DataTableCellUI.prototype._render = function() {
var editLink = $('<a href="javascript:{}">&nbsp;</a>') var editLink = $('<a href="javascript:{}">&nbsp;</a>')
.addClass("data-table-cell-edit") .addClass("data-table-cell-edit")
.attr("title", $.i18n._('core-views/edit-cell')) .attr("title", $.i18n('core-views/edit-cell'))
.appendTo(divContent) .appendTo(divContent)
.click(function() { self._startEdit(this); }); .click(function() { self._startEdit(this); });
@ -92,7 +92,7 @@ DataTableCellUI.prototype._render = function() {
$('<span>').addClass("data-table-recon-new").text("new").appendTo(divContent); $('<span>').addClass("data-table-recon-new").text("new").appendTo(divContent);
$('<a href="javascript:{}"></a>') $('<a href="javascript:{}"></a>')
.text($.i18n._('core-views/choose-match')) .text($.i18n('core-views/choose-match'))
.addClass("data-table-recon-action") .addClass("data-table-recon-action")
.appendTo(divContent).click(function(evt) { .appendTo(divContent).click(function(evt) {
self._doRematch(); self._doRematch();
@ -110,7 +110,7 @@ DataTableCellUI.prototype._render = function() {
$('<span> </span>').appendTo(divContent); $('<span> </span>').appendTo(divContent);
$('<a href="javascript:{}"></a>') $('<a href="javascript:{}"></a>')
.text($.i18n._('core-views/choose-match')) .text($.i18n('core-views/choose-match'))
.addClass("data-table-recon-action") .addClass("data-table-recon-action")
.appendTo(divContent) .appendTo(divContent)
.click(function(evt) { .click(function(evt) {
@ -128,14 +128,14 @@ DataTableCellUI.prototype._render = function() {
$('<a href="javascript:{}">&nbsp;</a>') $('<a href="javascript:{}">&nbsp;</a>')
.addClass("data-table-recon-match-similar") .addClass("data-table-recon-match-similar")
.attr("title", $.i18n._('core-views/match-all-cells')) .attr("title", $.i18n('core-views/match-all-cells'))
.appendTo(li).click(function(evt) { .appendTo(li).click(function(evt) {
self._doMatchTopicToSimilarCells(candidate); self._doMatchTopicToSimilarCells(candidate);
}); });
$('<a href="javascript:{}">&nbsp;</a>') $('<a href="javascript:{}">&nbsp;</a>')
.addClass("data-table-recon-match") .addClass("data-table-recon-match")
.attr("title", $.i18n._('core-views/match-this-cell') ) .attr("title", $.i18n('core-views/match-this-cell') )
.appendTo(li).click(function(evt) { .appendTo(li).click(function(evt) {
self._doMatchTopicToOneCell(candidate); self._doMatchTopicToOneCell(candidate);
}); });
@ -182,19 +182,19 @@ DataTableCellUI.prototype._render = function() {
var liNew = $('<div></div>').addClass("data-table-recon-candidate").appendTo(ul); var liNew = $('<div></div>').addClass("data-table-recon-candidate").appendTo(ul);
$('<a href="javascript:{}">&nbsp;</a>') $('<a href="javascript:{}">&nbsp;</a>')
.addClass("data-table-recon-match-similar") .addClass("data-table-recon-match-similar")
.attr("title", $.i18n._('core-views/create-topic-cells')) .attr("title", $.i18n('core-views/create-topic-cells'))
.appendTo(liNew).click(function(evt) { .appendTo(liNew).click(function(evt) {
self._doMatchNewTopicToSimilarCells(); self._doMatchNewTopicToSimilarCells();
}); });
$('<a href="javascript:{}">&nbsp;</a>') $('<a href="javascript:{}">&nbsp;</a>')
.addClass("data-table-recon-match") .addClass("data-table-recon-match")
.attr("title", $.i18n._('core-views/create-topic-cell')) .attr("title", $.i18n('core-views/create-topic-cell'))
.appendTo(liNew).click(function(evt) { .appendTo(liNew).click(function(evt) {
self._doMatchNewTopicToOneCell(); self._doMatchNewTopicToOneCell();
}); });
$('<span>').text($.i18n._('core-views/create-topic')).appendTo(liNew); $('<span>').text($.i18n('core-views/create-topic')).appendTo(liNew);
var suggestOptions; var suggestOptions;
var addSuggest = false; var addSuggest = false;
@ -210,7 +210,7 @@ DataTableCellUI.prototype._render = function() {
self._searchForMatch(suggestOptions); self._searchForMatch(suggestOptions);
return false; return false;
}) })
.text($.i18n._('core-views/search-match')) .text($.i18n('core-views/search-match'))
.appendTo(extraChoices); .appendTo(extraChoices);
} }
} }
@ -309,14 +309,14 @@ DataTableCellUI.prototype._searchForMatch = function(suggestOptions) {
var frame = $(DOM.loadHTML("core", "scripts/views/data-table/cell-recon-search-for-match.html")); var frame = $(DOM.loadHTML("core", "scripts/views/data-table/cell-recon-search-for-match.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.html($.i18n._('core-views/search-match')); elmts.dialogHeader.html($.i18n('core-views/search-match'));
elmts.or_views_searchFor.html($.i18n._('core-views/search-for')); elmts.or_views_searchFor.html($.i18n('core-views/search-for'));
elmts.or_views_matchOther.html($.i18n._('core-views/match-other')); elmts.or_views_matchOther.html($.i18n('core-views/match-other'));
elmts.or_views_matchThis.html($.i18n._('core-views/match-this')); elmts.or_views_matchThis.html($.i18n('core-views/match-this'));
elmts.okButton.html($.i18n._('core-buttons/match')); elmts.okButton.html($.i18n('core-buttons/match'));
elmts.newButton.html($.i18n._('core-buttons/new-topic')); elmts.newButton.html($.i18n('core-buttons/new-topic'));
elmts.clearButton.html($.i18n._('core-buttons/dont-reconcile')); elmts.clearButton.html($.i18n('core-buttons/dont-reconcile'));
elmts.cancelButton.html($.i18n._('core-buttons/cancel')); elmts.cancelButton.html($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { var dismiss = function() {
@ -470,9 +470,9 @@ DataTableCellUI.prototype._previewCandidateTopic = function(candidate, elmt, pre
var elmts = DOM.bind(fakeMenu); var elmts = DOM.bind(fakeMenu);
elmts.matchButton.html($.i18n._('core-views/match-cell')); elmts.matchButton.html($.i18n('core-views/match-cell'));
elmts.matchSimilarButton.html($.i18n._('core-views/match-identical')); elmts.matchSimilarButton.html($.i18n('core-views/match-identical'));
elmts.cancelButton.html($.i18n._('core-buttons/cancel')); elmts.cancelButton.html($.i18n('core-buttons/cancel'));
elmts.matchButton.click(function() { elmts.matchButton.click(function() {
self._doMatchTopicToOneCell(candidate); self._doMatchTopicToOneCell(candidate);
@ -496,17 +496,17 @@ DataTableCellUI.prototype._startEdit = function(elmt) {
menu.html(DOM.loadHTML("core", "scripts/views/data-table/cell-editor.html")); menu.html(DOM.loadHTML("core", "scripts/views/data-table/cell-editor.html"));
var elmts = DOM.bind(menu); var elmts = DOM.bind(menu);
elmts.or_views_dataType.html($.i18n._('core-views/data-type')); elmts.or_views_dataType.html($.i18n('core-views/data-type'));
elmts.or_views_text.html($.i18n._('core-views/text')); elmts.or_views_text.html($.i18n('core-views/text'));
elmts.or_views_number.html($.i18n._('core-views/number')); elmts.or_views_number.html($.i18n('core-views/number'));
elmts.or_views_boolean.html($.i18n._('core-views/boolean')); elmts.or_views_boolean.html($.i18n('core-views/boolean'));
elmts.or_views_date.html($.i18n._('core-views/date')); elmts.or_views_date.html($.i18n('core-views/date'));
elmts.okButton.html($.i18n._('core-buttons/apply')); elmts.okButton.html($.i18n('core-buttons/apply'));
elmts.or_views_enter.html($.i18n._('core-buttons/enter')); elmts.or_views_enter.html($.i18n('core-buttons/enter'));
elmts.okallButton.html($.i18n._('core-buttons/apply-to-all')); elmts.okallButton.html($.i18n('core-buttons/apply-to-all'));
elmts.or_views_ctrlEnter.html($.i18n._('core-views/ctrl-enter')); elmts.or_views_ctrlEnter.html($.i18n('core-views/ctrl-enter'));
elmts.cancelButton.html($.i18n._('core-buttons/cancel')); elmts.cancelButton.html($.i18n('core-buttons/cancel'));
elmts.or_views_esc.html($.i18n._('core-buttons/esc')); elmts.or_views_esc.html($.i18n('core-buttons/esc'));
MenuSystem.showMenu(menu, function(){}); MenuSystem.showMenu(menu, function(){});
MenuSystem.positionMenuLeftRight(menu, $(this._td)); MenuSystem.positionMenuLeftRight(menu, $(this._td));
@ -525,7 +525,7 @@ DataTableCellUI.prototype._startEdit = function(elmt) {
if (type == "number") { if (type == "number") {
value = parseFloat(text); value = parseFloat(text);
if (isNaN(value)) { if (isNaN(value)) {
alert($.i18n._('core-views/not-valid-number')); alert($.i18n('core-views/not-valid-number'));
return; return;
} }
} else if (type == "boolean") { } else if (type == "boolean") {
@ -536,7 +536,7 @@ DataTableCellUI.prototype._startEdit = function(elmt) {
value = DateTimeUtil.parseIso8601DateTime(text); value = DateTimeUtil.parseIso8601DateTime(text);
} }
if (!value) { if (!value) {
alert($.i18n._('core-views/not-valid-date')); alert($.i18n('core-views/not-valid-date'));
return; return;
} }
value = value.toString("yyyy-MM-ddTHH:mm:ssZ"); value = value.toString("yyyy-MM-ddTHH:mm:ssZ");

82
main/webapp/modules/core/scripts/views/data-table/column-header-ui.js
View File

@ -76,7 +76,7 @@ DataTableColumnHeaderUI.prototype._render = function() {
var newPercent = Math.ceil(100 * stats.newTopics / stats.nonBlanks); var newPercent = Math.ceil(100 * stats.newTopics / stats.nonBlanks);
var matchPercent = Math.ceil(100 * stats.matchedTopics / stats.nonBlanks); var matchPercent = Math.ceil(100 * stats.matchedTopics / stats.nonBlanks);
var unreconciledPercent = Math.ceil(100 * (stats.nonBlanks - stats.matchedTopics - stats.newTopics) / stats.nonBlanks); var unreconciledPercent = Math.ceil(100 * (stats.nonBlanks - stats.matchedTopics - stats.newTopics) / stats.nonBlanks);
var title = matchPercent + "% "+$.i18n._('core-views/matched')+", " + newPercent + "% "+$.i18n._('core-views/new')+", " + unreconciledPercent + "% "+$.i18n._('core-views/to-be-recon'); var title = matchPercent + "% "+$.i18n('core-views/matched')+", " + newPercent + "% "+$.i18n('core-views/new')+", " + unreconciledPercent + "% "+$.i18n('core-views/to-be-recon');
var whole = $('<div>') var whole = $('<div>')
.addClass("column-header-recon-stats-bar") .addClass("column-header-recon-stats-bar")
@ -101,25 +101,25 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {
var menu = [ var menu = [
{ {
id: "core/facet", id: "core/facet",
label: $.i18n._('core-views/facet'), label: $.i18n('core-views/facet'),
width: "170px", width: "170px",
submenu: [] submenu: []
}, },
{}, {},
{ {
id: "core/edit-cells", id: "core/edit-cells",
label: $.i18n._('core-views/edit-cells'), label: $.i18n('core-views/edit-cells'),
width: "170px", width: "170px",
submenu: [] submenu: []
}, },
{ {
id: "core/edit-column", id: "core/edit-column",
label: $.i18n._('core-views/edit-column'), label: $.i18n('core-views/edit-column'),
submenu: [] submenu: []
}, },
{ {
id: "core/transpose", id: "core/transpose",
label: $.i18n._('core-views/transpose'), label: $.i18n('core-views/transpose'),
submenu: [] submenu: []
}, },
{}, {},
@ -127,31 +127,31 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {
this._dataTableView._getSortingCriterionForColumn(this._column.name) === null ? this._dataTableView._getSortingCriterionForColumn(this._column.name) === null ?
{ {
id: "core/sort", id: "core/sort",
"label": $.i18n._('core-views/sort')+"...", "label": $.i18n('core-views/sort')+"...",
"click": function() { "click": function() {
self._showSortingCriterion(null, self._dataTableView._getSortingCriteriaCount() > 0); self._showSortingCriterion(null, self._dataTableView._getSortingCriteriaCount() > 0);
} }
} : } :
{ {
id: "core/sort", id: "core/sort",
label: $.i18n._('core-views/sort'), label: $.i18n('core-views/sort'),
submenu: this.createSortingMenu() submenu: this.createSortingMenu()
} }
), ),
{ {
id: "core/view", id: "core/view",
label: $.i18n._('core-views/view'), label: $.i18n('core-views/view'),
tooltip: $.i18n._('core-views/collapse-expand'), tooltip: $.i18n('core-views/collapse-expand'),
submenu: [ submenu: [
{ {
label: $.i18n._('core-views/collapse-this'), label: $.i18n('core-views/collapse-this'),
click: function() { click: function() {
self._dataTableView._collapsedColumnNames[self._column.name] = true; self._dataTableView._collapsedColumnNames[self._column.name] = true;
self._dataTableView.render(); self._dataTableView.render();
} }
}, },
{ {
label: $.i18n._('core-views/collapse-other'), label: $.i18n('core-views/collapse-other'),
click: function() { click: function() {
var collapsedColumnNames = {}; var collapsedColumnNames = {};
for (var i = 0; i < theProject.columnModel.columns.length; i++) { for (var i = 0; i < theProject.columnModel.columns.length; i++) {
@ -164,7 +164,7 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {
} }
}, },
{ {
label: $.i18n._('core-views/collapse-left'), label: $.i18n('core-views/collapse-left'),
click: function() { click: function() {
for (var i = 0; i < self._columnIndex; i++) { for (var i = 0; i < self._columnIndex; i++) {
self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name] = true; self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name] = true;
@ -173,7 +173,7 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {
} }
}, },
{ {
label: $.i18n._('core-views/collapse-right'), label: $.i18n('core-views/collapse-right'),
click: function() { click: function() {
for (var i = self._columnIndex + 1; i < theProject.columnModel.columns.length; i++) { for (var i = self._columnIndex + 1; i < theProject.columnModel.columns.length; i++) {
self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name] = true; self._dataTableView._collapsedColumnNames[theProject.columnModel.columns[i].name] = true;
@ -186,8 +186,8 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {
{}, {},
{ {
id: "core/reconcile", id: "core/reconcile",
label: $.i18n._('core-views/reconcile'), label: $.i18n('core-views/reconcile'),
tooltip: $.i18n._('core-views/reconcile-tooltip'), tooltip: $.i18n('core-views/reconcile-tooltip'),
width: "170px", width: "170px",
submenu: [] submenu: []
} }
@ -208,7 +208,7 @@ DataTableColumnHeaderUI.prototype.createSortingMenu = function() {
var items = [ var items = [
{ {
"label": $.i18n._('core-views/sort')+"...", "label": $.i18n('core-views/sort')+"...",
"click": function() { "click": function() {
self._showSortingCriterion(criterion, hasOtherCriteria); self._showSortingCriterion(criterion, hasOtherCriteria);
} }
@ -217,14 +217,14 @@ DataTableColumnHeaderUI.prototype.createSortingMenu = function() {
if (criterion !== null) { if (criterion !== null) {
items.push({ items.push({
"label": $.i18n._('core-views/reverse'), "label": $.i18n('core-views/reverse'),
"click": function() { "click": function() {
criterion.reverse = !criterion.reverse; criterion.reverse = !criterion.reverse;
self._dataTableView._addSortingCriterion(criterion); self._dataTableView._addSortingCriterion(criterion);
} }
}); });
items.push({ items.push({
"label": $.i18n._('core-views/remove-sort'), "label": $.i18n('core-views/remove-sort'),
"click": function() { "click": function() {
self._dataTableView._removeSortingCriterionOfColumn(criterion.column); self._dataTableView._removeSortingCriterionOfColumn(criterion.column);
} }
@ -247,22 +247,22 @@ DataTableColumnHeaderUI.prototype._showSortingCriterion = function(criterion, ha
var frame = $(DOM.loadHTML("core", "scripts/views/data-table/sorting-criterion-dialog.html")); var frame = $(DOM.loadHTML("core", "scripts/views/data-table/sorting-criterion-dialog.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/sort-by')+' ' + this._column.name); elmts.dialogHeader.text($.i18n('core-views/sort-by')+' ' + this._column.name);
elmts.or_views_sortAs.text($.i18n._('core-views/sort-cell')); elmts.or_views_sortAs.text($.i18n('core-views/sort-cell'));
elmts.or_views_positionBlank.text($.i18n._('core-views/pos-blank')); elmts.or_views_positionBlank.text($.i18n('core-views/pos-blank'));
elmts.or_views_text.text($.i18n._('core-views/text')); elmts.or_views_text.text($.i18n('core-views/text'));
elmts.or_views_caseSens.text($.i18n._('core-views/case-sensitive')); elmts.or_views_caseSens.text($.i18n('core-views/case-sensitive'));
elmts.or_views_numbers.text($.i18n._('core-views/numbers')); elmts.or_views_numbers.text($.i18n('core-views/numbers'));
elmts.or_views_dates.text($.i18n._('core-views/dates')); elmts.or_views_dates.text($.i18n('core-views/dates'));
elmts.or_views_booleans.text($.i18n._('core-views/booleans')); elmts.or_views_booleans.text($.i18n('core-views/booleans'));
elmts.or_views_dragDrop.text($.i18n._('core-views/drag-drop')); elmts.or_views_dragDrop.text($.i18n('core-views/drag-drop'));
elmts.directionForwardLabel.text($.i18n._('core-views/forward')); elmts.directionForwardLabel.text($.i18n('core-views/forward'));
elmts.directionReverseLabel.text($.i18n._('core-views/reverse')); elmts.directionReverseLabel.text($.i18n('core-views/reverse'));
elmts.or_views_sortByCol.text($.i18n._('core-views/sort-by-col')); elmts.or_views_sortByCol.text($.i18n('core-views/sort-by-col'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
elmts.valueTypeOptions elmts.valueTypeOptions
.find("input[type='radio'][value='" + criterion.valueType + "']") .find("input[type='radio'][value='" + criterion.valueType + "']")
@ -275,14 +275,14 @@ DataTableColumnHeaderUI.prototype._showSortingCriterion = function(criterion, ha
forward.html("a - z"); forward.html("a - z");
reverse.html("z - a"); reverse.html("z - a");
} else if (valueType == "number") { } else if (valueType == "number") {
forward.html($.i18n._('core-views/smallest-first')); forward.html($.i18n('core-views/smallest-first'));
reverse.html($.i18n._('core-views/largest-first')); reverse.html($.i18n('core-views/largest-first'));
} else if (valueType == "date") { } else if (valueType == "date") {
forward.html($.i18n._('core-views/earliest-first')); forward.html($.i18n('core-views/earliest-first'));
reverse.html($.i18n._('core-views/latest-first')); reverse.html($.i18n('core-views/latest-first'));
} else if (valueType == "boolean") { } else if (valueType == "boolean") {
forward.html($.i18n._('core-views/false-true')); forward.html($.i18n('core-views/false-true'));
reverse.html($.i18n._('core-views/true-false')); reverse.html($.i18n('core-views/true-false'));
} }
}; };
elmts.valueTypeOptions elmts.valueTypeOptions
@ -303,9 +303,9 @@ DataTableColumnHeaderUI.prototype._showSortingCriterion = function(criterion, ha
elmts.sortAloneContainer.show(); elmts.sortAloneContainer.show();
} }
var validValuesHtml = '<li kind="value">'+$.i18n._('core-views/valid-values')+'</li>'; var validValuesHtml = '<li kind="value">'+$.i18n('core-views/valid-values')+'</li>';
var blankValuesHtml = '<li kind="blank">'+$.i18n._('core-views/blanks')+'</li>'; var blankValuesHtml = '<li kind="blank">'+$.i18n('core-views/blanks')+'</li>';
var errorValuesHtml = '<li kind="error">'+$.i18n._('core-views/errors')+'</li>'; var errorValuesHtml = '<li kind="error">'+$.i18n('core-views/errors')+'</li>';
var positionsHtml; var positionsHtml;
if (criterion.blankPosition < 0) { if (criterion.blankPosition < 0) {
if (criterion.errorPosition > 0) { if (criterion.errorPosition > 0) {

80
main/webapp/modules/core/scripts/views/data-table/data-table-view.js
View File

@ -92,7 +92,7 @@ DataTableView.prototype.render = function() {
var html = $( var html = $(
'<div class="viewpanel-header">' + '<div class="viewpanel-header">' +
'<div class="viewpanel-rowrecord" bind="rowRecordControls">'+$.i18n._('core-views/show-as')+': ' + '<div class="viewpanel-rowrecord" bind="rowRecordControls">'+$.i18n('core-views/show-as')+': ' +
'<span bind="modeSelectors"></span>' + '<span bind="modeSelectors"></span>' +
'</div>' + '</div>' +
'<div class="viewpanel-pagesize" bind="pageSizeControls"></div>' + '<div class="viewpanel-pagesize" bind="pageSizeControls"></div>' +
@ -124,8 +124,8 @@ DataTableView.prototype.render = function() {
}); });
} }
}; };
renderBrowsingModeLink($.i18n._('core-views/rows'), "row-based"); renderBrowsingModeLink($.i18n('core-views/rows'), "row-based");
renderBrowsingModeLink($.i18n._('core-views/records'), "record-based"); renderBrowsingModeLink($.i18n('core-views/records'), "record-based");
this._renderPagingControls(elmts.pageSizeControls, elmts.pagingControls); this._renderPagingControls(elmts.pageSizeControls, elmts.pagingControls);
@ -163,8 +163,8 @@ DataTableView.prototype._renderPagingControls = function(pageSizeControls, pagin
var from = (theProject.rowModel.start + 1); var from = (theProject.rowModel.start + 1);
var to = Math.min(theProject.rowModel.filtered, theProject.rowModel.start + theProject.rowModel.limit); var to = Math.min(theProject.rowModel.filtered, theProject.rowModel.start + theProject.rowModel.limit);
var firstPage = $('<a href="javascript:{}">&laquo; '+$.i18n._('core-views/first')+'</a>').appendTo(pagingControls); var firstPage = $('<a href="javascript:{}">&laquo; '+$.i18n('core-views/first')+'</a>').appendTo(pagingControls);
var previousPage = $('<a href="javascript:{}">&lsaquo; '+$.i18n._('core-views/previous')+'</a>').appendTo(pagingControls); var previousPage = $('<a href="javascript:{}">&lsaquo; '+$.i18n('core-views/previous')+'</a>').appendTo(pagingControls);
if (theProject.rowModel.start > 0) { if (theProject.rowModel.start > 0) {
firstPage.addClass("action").click(function(evt) { self._onClickFirstPage(this, evt); }); firstPage.addClass("action").click(function(evt) { self._onClickFirstPage(this, evt); });
previousPage.addClass("action").click(function(evt) { self._onClickPreviousPage(this, evt); }); previousPage.addClass("action").click(function(evt) { self._onClickPreviousPage(this, evt); });
@ -175,8 +175,8 @@ DataTableView.prototype._renderPagingControls = function(pageSizeControls, pagin
$('<span>').addClass("viewpanel-pagingcount").html(" " + from + " - " + to + " ").appendTo(pagingControls); $('<span>').addClass("viewpanel-pagingcount").html(" " + from + " - " + to + " ").appendTo(pagingControls);
var nextPage = $('<a href="javascript:{}">'+$.i18n._('core-views/next')+' &rsaquo;</a>').appendTo(pagingControls); var nextPage = $('<a href="javascript:{}">'+$.i18n('core-views/next')+' &rsaquo;</a>').appendTo(pagingControls);
var lastPage = $('<a href="javascript:{}">'+$.i18n._('core-views/last')+' &raquo;</a>').appendTo(pagingControls); var lastPage = $('<a href="javascript:{}">'+$.i18n('core-views/last')+' &raquo;</a>').appendTo(pagingControls);
if (theProject.rowModel.start + theProject.rowModel.limit < theProject.rowModel.filtered) { if (theProject.rowModel.start + theProject.rowModel.limit < theProject.rowModel.filtered) {
nextPage.addClass("action").click(function(evt) { self._onClickNextPage(this, evt); }); nextPage.addClass("action").click(function(evt) { self._onClickNextPage(this, evt); });
lastPage.addClass("action").click(function(evt) { self._onClickLastPage(this, evt); }); lastPage.addClass("action").click(function(evt) { self._onClickLastPage(this, evt); });
@ -185,7 +185,7 @@ DataTableView.prototype._renderPagingControls = function(pageSizeControls, pagin
lastPage.addClass("inaction"); lastPage.addClass("inaction");
} }
$('<span>'+$.i18n._('core-views/show')+': </span>').appendTo(pageSizeControls); $('<span>'+$.i18n('core-views/show')+': </span>').appendTo(pageSizeControls);
var sizes = [ 5, 10, 25, 50 ]; var sizes = [ 5, 10, 25, 50 ];
var renderPageSize = function(index) { var renderPageSize = function(index) {
var pageSize = sizes[index]; var pageSize = sizes[index];
@ -206,7 +206,7 @@ DataTableView.prototype._renderPagingControls = function(pageSizeControls, pagin
} }
$('<span>') $('<span>')
.text(theProject.rowModel.mode == "record-based" ? ' '+$.i18n._('core-views/records') : ' '+$.i18n._('core-views/rows')) .text(theProject.rowModel.mode == "record-based" ? ' '+$.i18n('core-views/records') : ' '+$.i18n('core-views/rows'))
.appendTo(pageSizeControls); .appendTo(pageSizeControls);
}; };
@ -306,7 +306,7 @@ DataTableView.prototype._renderDataTables = function(table, headerTable) {
.addClass("column-header") .addClass("column-header")
.html( .html(
'<div class="column-header-title">' + '<div class="column-header-title">' +
'<a class="column-header-menu" bind="dropdownMenu"></a><span class="column-header-name">'+$.i18n._('core-views/all')+'</span>' + '<a class="column-header-menu" bind="dropdownMenu"></a><span class="column-header-name">'+$.i18n('core-views/all')+'</span>' +
'</div>' '</div>'
) )
).dropdownMenu.click(function() { ).dropdownMenu.click(function() {
@ -564,14 +564,14 @@ DataTableView.prototype._addSortingCriterion = function(criterion, alone) {
.replace("$EXPRESSION_PREVIEW_WIDGET$", ExpressionPreviewDialog.generateWidgetHtml())); .replace("$EXPRESSION_PREVIEW_WIDGET$", ExpressionPreviewDialog.generateWidgetHtml()));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.or_views_errorOn.text($.i18n._('core-views/on-error')); elmts.or_views_errorOn.text($.i18n('core-views/on-error'));
elmts.or_views_keepOr.text($.i18n._('core-views/keep-or')); elmts.or_views_keepOr.text($.i18n('core-views/keep-or'));
elmts.or_views_setBlank.text($.i18n._('core-views/set-blank')); elmts.or_views_setBlank.text($.i18n('core-views/set-blank'));
elmts.or_views_storeErr.text($.i18n._('core-views/store-err')); elmts.or_views_storeErr.text($.i18n('core-views/store-err'));
elmts.or_views_reTrans.text($.i18n._('core-views/re-trans')); elmts.or_views_reTrans.text($.i18n('core-views/re-trans'));
elmts.or_views_timesChang.text($.i18n._('core-views/times-chang')); elmts.or_views_timesChang.text($.i18n('core-views/times-chang'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { DialogSystem.dismissUntil(level - 1); }; var dismiss = function() { DialogSystem.dismissUntil(level - 1); };
@ -605,7 +605,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
var menu = [ var menu = [
/** /**
{ {
label: $.i18n._('core-views/table-schema-validate'), label: $.i18n('core-views/table-schema-validate'),
id: "core/facets", id: "core/facets",
width: "200px", width: "200px",
click: function() { click: function() {
@ -614,7 +614,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
}, },
*/ */
{ {
label: $.i18n._('core-views/transform'), label: $.i18n('core-views/transform'),
id: "core/facets", id: "core/facets",
width: "200px", width: "200px",
click: function() { click: function() {
@ -623,18 +623,18 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
}, },
{}, {},
{ {
label: $.i18n._('core-views/facet'), label: $.i18n('core-views/facet'),
id: "core/facets", id: "core/facets",
width: "200px", width: "200px",
submenu: [ submenu: [
{ {
label: $.i18n._('core-views/facet-star'), label: $.i18n('core-views/facet-star'),
id: "core/facet-by-star", id: "core/facet-by-star",
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
{ {
"name" : $.i18n._('core-views/starred-rows'), "name" : $.i18n('core-views/starred-rows'),
"columnName" : "", "columnName" : "",
"expression" : "row.starred" "expression" : "row.starred"
}, },
@ -645,13 +645,13 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
} }
}, },
{ {
label: $.i18n._('core-views/facet-flag'), label: $.i18n('core-views/facet-flag'),
id: "core/facet-by-flag", id: "core/facet-by-flag",
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
{ {
"name" : $.i18n._('core-views/flagged-rows'), "name" : $.i18n('core-views/flagged-rows'),
"columnName" : "", "columnName" : "",
"expression" : "row.flagged" "expression" : "row.flagged"
}, },
@ -665,19 +665,19 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
}, },
{}, {},
{ {
label: $.i18n._('core-views/edit-rows'), label: $.i18n('core-views/edit-rows'),
id: "core/edit-rows", id: "core/edit-rows",
width: "200px", width: "200px",
submenu: [ submenu: [
{ {
label: $.i18n._('core-views/star-rows'), label: $.i18n('core-views/star-rows'),
id: "core/star-rows", id: "core/star-rows",
click: function() { click: function() {
Refine.postCoreProcess("annotate-rows", { "starred" : "true" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "starred" : "true" }, null, { rowMetadataChanged: true });
} }
}, },
{ {
label: $.i18n._('core-views/unstar-rows'), label: $.i18n('core-views/unstar-rows'),
id: "core/unstar-rows", id: "core/unstar-rows",
click: function() { click: function() {
Refine.postCoreProcess("annotate-rows", { "starred" : "false" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "starred" : "false" }, null, { rowMetadataChanged: true });
@ -685,14 +685,14 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
}, },
{}, {},
{ {
label: $.i18n._('core-views/flag-rows'), label: $.i18n('core-views/flag-rows'),
id: "core/flag-rows", id: "core/flag-rows",
click: function() { click: function() {
Refine.postCoreProcess("annotate-rows", { "flagged" : "true" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "flagged" : "true" }, null, { rowMetadataChanged: true });
} }
}, },
{ {
label: $.i18n._('core-views/unflag-rows'), label: $.i18n('core-views/unflag-rows'),
id: "core/unflag-rows", id: "core/unflag-rows",
click: function() { click: function() {
Refine.postCoreProcess("annotate-rows", { "flagged" : "false" }, null, { rowMetadataChanged: true }); Refine.postCoreProcess("annotate-rows", { "flagged" : "false" }, null, { rowMetadataChanged: true });
@ -700,7 +700,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
}, },
{}, {},
{ {
label: $.i18n._('core-views/remove-matching'), label: $.i18n('core-views/remove-matching'),
id: "core/remove-rows", id: "core/remove-rows",
click: function() { click: function() {
Refine.postCoreProcess("remove-rows", {}, null, { rowMetadataChanged: true }); Refine.postCoreProcess("remove-rows", {}, null, { rowMetadataChanged: true });
@ -709,12 +709,12 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
] ]
}, },
{ {
label: $.i18n._('core-views/edit-col'), label: $.i18n('core-views/edit-col'),
id: "core/edit-columns", id: "core/edit-columns",
width: "200px", width: "200px",
submenu: [ submenu: [
{ {
label: $.i18n._('core-views/reorder-remove')+"...", label: $.i18n('core-views/reorder-remove')+"...",
id: "core/reorder-columns", id: "core/reorder-columns",
click: function() { click: function() {
new ColumnReorderingDialog(); new ColumnReorderingDialog();
@ -724,12 +724,12 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
}, },
{}, {},
{ {
label: $.i18n._('core-views/view'), label: $.i18n('core-views/view'),
id: "core/view", id: "core/view",
width: "200px", width: "200px",
submenu: [ submenu: [
{ {
label: $.i18n._('core-views/collapse-all'), label: $.i18n('core-views/collapse-all'),
id: "core/collapse-all-columns", id: "core/collapse-all-columns",
click: function() { click: function() {
for (var i = 0; i < theProject.columnModel.columns.length; i++) { for (var i = 0; i < theProject.columnModel.columns.length; i++) {
@ -739,7 +739,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
} }
}, },
{ {
label: $.i18n._('core-views/expand-all'), label: $.i18n('core-views/expand-all'),
id: "core/expand-all-columns", id: "core/expand-all-columns",
click: function() { click: function() {
self._collapsedColumnNames = []; self._collapsedColumnNames = [];
@ -747,7 +747,7 @@ DataTableView.prototype._createMenuForAllColumns = function(elmt) {
} }
}, },
{ {
label: $.i18n._('core-views/display-null'), label: $.i18n('core-views/display-null'),
id: "core/display-null", id: "core/display-null",
click: function() { click: function() {
$(".data-table-null").toggle(); $(".data-table-null").toggle();
@ -769,14 +769,14 @@ DataTableView.prototype._createSortingMenu = function(elmt) {
var self = this; var self = this;
var items = [ var items = [
{ {
"label" : $.i18n._('core-views/remove-sort'), "label" : $.i18n('core-views/remove-sort'),
"click" : function() { "click" : function() {
self._sorting.criteria = []; self._sorting.criteria = [];
self.update(); self.update();
} }
}, },
{ {
"label" : $.i18n._('core-views/reorder-perma'), "label" : $.i18n('core-views/reorder-perma'),
"click" : function() { "click" : function() {
Refine.postCoreProcess( Refine.postCoreProcess(
"reorder-rows", "reorder-rows",
@ -810,7 +810,7 @@ DataTableView.prototype._createSortingMenu = function(elmt) {
var columnHeaderUI = getColumnHeaderUI(criterion.column); var columnHeaderUI = getColumnHeaderUI(criterion.column);
if (columnHeaderUI !== null) { if (columnHeaderUI !== null) {
items.push({ items.push({
"label" : $.i18n._('core-views/by')+" " + criterion.column, "label" : $.i18n('core-views/by')+" " + criterion.column,
"submenu" : columnHeaderUI.createSortingMenu() "submenu" : columnHeaderUI.createSortingMenu()
}); });
} }

178
main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js
View File

@ -52,16 +52,16 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
.replace("$EXPRESSION_PREVIEW_WIDGET$", ExpressionPreviewDialog.generateWidgetHtml())); .replace("$EXPRESSION_PREVIEW_WIDGET$", ExpressionPreviewDialog.generateWidgetHtml()));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/custom-text-trans')+" " + column.name); elmts.dialogHeader.text($.i18n('core-views/custom-text-trans')+" " + column.name);
elmts.or_views_errorOn.text($.i18n._('core-views/on-error')); elmts.or_views_errorOn.text($.i18n('core-views/on-error'));
elmts.or_views_keepOr.text($.i18n._('core-views/keep-or')); elmts.or_views_keepOr.text($.i18n('core-views/keep-or'));
elmts.or_views_setBlank.text($.i18n._('core-views/set-blank')); elmts.or_views_setBlank.text($.i18n('core-views/set-blank'));
elmts.or_views_storeErr.text($.i18n._('core-views/store-err')); elmts.or_views_storeErr.text($.i18n('core-views/store-err'));
elmts.or_views_reTrans.text($.i18n._('core-views/re-trans')); elmts.or_views_reTrans.text($.i18n('core-views/re-trans'));
elmts.or_views_timesChang.text($.i18n._('core-views/times-chang')); elmts.or_views_timesChang.text($.i18n('core-views/times-chang'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { DialogSystem.dismissUntil(level - 1); }; var dismiss = function() { DialogSystem.dismissUntil(level - 1); };
@ -117,7 +117,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doJoinMultiValueCells = function() { var doJoinMultiValueCells = function() {
var separator = window.prompt($.i18n._('core-views/enter-separator'), ", "); var separator = window.prompt($.i18n('core-views/enter-separator'), ", ");
if (separator !== null) { if (separator !== null) {
Refine.postCoreProcess( Refine.postCoreProcess(
"join-multi-value-cells", "join-multi-value-cells",
@ -143,13 +143,13 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
// but javascript Regexp accepts it and auto escape it // but javascript Regexp accepts it and auto escape it
var pos = p.replace(/\\\//g,'').indexOf("/"); var pos = p.replace(/\\\//g,'').indexOf("/");
if (pos != -1) { if (pos != -1) {
alert($.i18n._('core-views/warning-regex') + " : " + p); alert($.i18n('core-views/warning-regex') + " : " + p);
return 0;} return 0;}
try { try {
var pattern = new RegExp(p); var pattern = new RegExp(p);
return 1; return 1;
} catch (e) { } catch (e) {
alert($.i18n._('core-views/warning-regex') + " : " + p); alert($.i18n('core-views/warning-regex') + " : " + p);
return 0;} return 0;}
} }
function escapeInputString(s) { function escapeInputString(s) {
@ -232,18 +232,18 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
} }
var frame = $(DOM.loadHTML("core", "scripts/views/data-table/replace-dialog.html")); var frame = $(DOM.loadHTML("core", "scripts/views/data-table/replace-dialog.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/replace')); elmts.dialogHeader.text($.i18n('core-views/replace'));
elmts.or_views_text_to_find.text($.i18n._('core-views/text-to-find')); elmts.or_views_text_to_find.text($.i18n('core-views/text-to-find'));
elmts.or_views_replacement.text($.i18n._('core-views/replacement-text')); elmts.or_views_replacement.text($.i18n('core-views/replacement-text'));
elmts.or_views_finding_info1.text($.i18n._('core-views/finding-info1')); elmts.or_views_finding_info1.text($.i18n('core-views/finding-info1'));
elmts.or_views_finding_info2.text($.i18n._('core-views/finding-info2')); elmts.or_views_finding_info2.text($.i18n('core-views/finding-info2'));
elmts.or_views_replacement_info.text($.i18n._('core-views/replacement-info')); elmts.or_views_replacement_info.text($.i18n('core-views/replacement-info'));
elmts.or_views_find_regExp.text($.i18n._('core-views/reg-exp')); elmts.or_views_find_regExp.text($.i18n('core-views/reg-exp'));
elmts.or_views_find_case_insensitive.text($.i18n._('core-views/case-insensitive')); elmts.or_views_find_case_insensitive.text($.i18n('core-views/case-insensitive'));
elmts.or_views_find_whole_word.text($.i18n._('core-views/whole-word')); elmts.or_views_find_whole_word.text($.i18n('core-views/whole-word'));
elmts.or_views_replace_dont_escape.text($.i18n._('core-views/replace-dont-escape')); elmts.or_views_replace_dont_escape.text($.i18n('core-views/replace-dont-escape'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { DialogSystem.dismissUntil(level - 1); }; var dismiss = function() { DialogSystem.dismissUntil(level - 1); };
elmts.cancelButton.click(dismiss); elmts.cancelButton.click(dismiss);
@ -284,18 +284,18 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var frame = $(DOM.loadHTML("core", "scripts/views/data-table/split-multi-valued-cells-dialog.html")); var frame = $(DOM.loadHTML("core", "scripts/views/data-table/split-multi-valued-cells-dialog.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/split-cells')); elmts.dialogHeader.text($.i18n('core-views/split-cells'));
elmts.or_views_howSplit.text($.i18n._('core-views/how-split-cells')); elmts.or_views_howSplit.text($.i18n('core-views/how-split-cells'));
elmts.or_views_bySep.text($.i18n._('core-views/by-sep')); elmts.or_views_bySep.text($.i18n('core-views/by-sep'));
elmts.or_views_separator.text($.i18n._('core-views/separator')); elmts.or_views_separator.text($.i18n('core-views/separator'));
elmts.or_views_regExp.text($.i18n._('core-views/reg-exp')); elmts.or_views_regExp.text($.i18n('core-views/reg-exp'));
elmts.or_views_fieldLen.text($.i18n._('core-views/field-len')); elmts.or_views_fieldLen.text($.i18n('core-views/field-len'));
elmts.or_views_listInt.text($.i18n._('core-views/list-int')); elmts.or_views_listInt.text($.i18n('core-views/list-int'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { DialogSystem.dismissUntil(level - 1); }; var dismiss = function() { DialogSystem.dismissUntil(level - 1); };
@ -311,7 +311,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
if (mode === "separator") { if (mode === "separator") {
config.separator = elmts.separatorInput[0].value; config.separator = elmts.separatorInput[0].value;
if (!(config.separator)) { if (!(config.separator)) {
alert($.i18n._('core-views/specify-sep')); alert($.i18n('core-views/specify-sep'));
return; return;
} }
@ -330,14 +330,14 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}); });
if (lengths.length === 0) { if (lengths.length === 0) {
alert($.i18n._('core-views/warning-no-length')); alert($.i18n('core-views/warning-no-length'));
return; return;
} }
config.fieldLengths = JSON.stringify(lengths); config.fieldLengths = JSON.stringify(lengths);
} catch (e) { } catch (e) {
alert($.i18n._('core-views/warning-format')); alert($.i18n('core-views/warning-format'));
return; return;
} }
} }
@ -356,70 +356,70 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
MenuSystem.appendTo(menu, [ "core/edit-cells" ], [ MenuSystem.appendTo(menu, [ "core/edit-cells" ], [
{ {
id: "core/text-transform", id: "core/text-transform",
label: $.i18n._('core-views/transform')+"...", label: $.i18n('core-views/transform')+"...",
click: function() { doTextTransformPrompt(); } click: function() { doTextTransformPrompt(); }
}, },
{ {
id: "core/common-transforms", id: "core/common-transforms",
label: $.i18n._('core-views/common-transform'), label: $.i18n('core-views/common-transform'),
submenu: [ submenu: [
{ {
id: "core/trim-whitespace", id: "core/trim-whitespace",
label: $.i18n._('core-views/trim-all'), label: $.i18n('core-views/trim-all'),
click: function() { doTextTransform("value.trim()", "keep-original", false, ""); } click: function() { doTextTransform("value.trim()", "keep-original", false, ""); }
}, },
{ {
id: "core/collapse-whitespace", id: "core/collapse-whitespace",
label: $.i18n._('core-views/collapse-white'), label: $.i18n('core-views/collapse-white'),
click: function() { doTextTransform("value.replace(/\\s+/,' ')", "keep-original", false, ""); } click: function() { doTextTransform("value.replace(/\\s+/,' ')", "keep-original", false, ""); }
}, },
{}, {},
{ {
id: "core/unescape-html-entities", id: "core/unescape-html-entities",
label: $.i18n._('core-views/unescape-html'), label: $.i18n('core-views/unescape-html'),
click: function() { doTextTransform("value.unescape('html')", "keep-original", true, 10); } click: function() { doTextTransform("value.unescape('html')", "keep-original", true, 10); }
}, },
{}, {},
{ {
id: "core/to-titlecase", id: "core/to-titlecase",
label: $.i18n._('core-views/titlecase'), label: $.i18n('core-views/titlecase'),
click: function() { doTextTransform("value.toTitlecase()", "keep-original", false, ""); } click: function() { doTextTransform("value.toTitlecase()", "keep-original", false, ""); }
}, },
{ {
id: "core/to-uppercase", id: "core/to-uppercase",
label: $.i18n._('core-views/uppercase'), label: $.i18n('core-views/uppercase'),
click: function() { doTextTransform("value.toUppercase()", "keep-original", false, ""); } click: function() { doTextTransform("value.toUppercase()", "keep-original", false, ""); }
}, },
{ {
id: "core/to-lowercase", id: "core/to-lowercase",
label: $.i18n._('core-views/lowercase'), label: $.i18n('core-views/lowercase'),
click: function() { doTextTransform("value.toLowercase()", "keep-original", false, ""); } click: function() { doTextTransform("value.toLowercase()", "keep-original", false, ""); }
}, },
{}, {},
{ {
id: "core/to-number", id: "core/to-number",
label: $.i18n._('core-views/to-number'), label: $.i18n('core-views/to-number'),
click: function() { doTextTransform("value.toNumber()", "keep-original", false, ""); } click: function() { doTextTransform("value.toNumber()", "keep-original", false, ""); }
}, },
{ {
id: "core/to-date", id: "core/to-date",
label: $.i18n._('core-views/to-date'), label: $.i18n('core-views/to-date'),
click: function() { doTextTransform("value.toDate()", "keep-original", false, ""); } click: function() { doTextTransform("value.toDate()", "keep-original", false, ""); }
}, },
{ {
id: "core/to-text", id: "core/to-text",
label: $.i18n._('core-views/to-text'), label: $.i18n('core-views/to-text'),
click: function() { doTextTransform("value.toString()", "keep-original", false, ""); } click: function() { doTextTransform("value.toString()", "keep-original", false, ""); }
}, },
{}, {},
{ {
id: "core/to-blank", id: "core/to-blank",
label: $.i18n._('core-views/blank-out'), label: $.i18n('core-views/blank-out'),
click: function() { doTextTransform("null", "keep-original", false, ""); } click: function() { doTextTransform("null", "keep-original", false, ""); }
}, },
{ {
id: "core/to-empty", id: "core/to-empty",
label: $.i18n._('core-views/blank-out-empty'), label: $.i18n('core-views/blank-out-empty'),
click: function() { doTextTransform("\"\"", "keep-original", false, ""); } click: function() { doTextTransform("\"\"", "keep-original", false, ""); }
} }
] ]
@ -427,35 +427,35 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/fill-down", id: "core/fill-down",
label: $.i18n._('core-views/fill-down'), label: $.i18n('core-views/fill-down'),
click: doFillDown click: doFillDown
}, },
{ {
id: "core/blank-down", id: "core/blank-down",
label: $.i18n._('core-views/blank-down'), label: $.i18n('core-views/blank-down'),
click: doBlankDown click: doBlankDown
}, },
{}, {},
{ {
id: "core/split-multi-valued-cells", id: "core/split-multi-valued-cells",
label: $.i18n._('core-views/split-cells')+"...", label: $.i18n('core-views/split-cells')+"...",
click: doSplitMultiValueCells click: doSplitMultiValueCells
}, },
{ {
id: "core/join-multi-valued-cells", id: "core/join-multi-valued-cells",
label: $.i18n._('core-views/join-cells')+"...", label: $.i18n('core-views/join-cells')+"...",
click: doJoinMultiValueCells click: doJoinMultiValueCells
}, },
{}, {},
{ {
id: "core/cluster", id: "core/cluster",
label: $.i18n._('core-views/cluster-edit')+"...", label: $.i18n('core-views/cluster-edit')+"...",
click: function() { new ClusteringDialog(column.name, "value"); } click: function() { new ClusteringDialog(column.name, "value"); }
}, },
{}, {},
{ {
id: "core/replace", id: "core/replace",
label: $.i18n._('core-views/replace'), label: $.i18n('core-views/replace'),
click: doReplace click: doReplace
} }
]); ]);
@ -466,23 +466,23 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var elmts = DOM.bind(dialog); var elmts = DOM.bind(dialog);
var level = DialogSystem.showDialog(dialog); var level = DialogSystem.showDialog(dialog);
elmts.dialogHeader.html($.i18n._('core-views/transp-cell')); elmts.dialogHeader.html($.i18n('core-views/transp-cell'));
elmts.or_views_fromCol.html($.i18n._('core-views/from-col')); elmts.or_views_fromCol.html($.i18n('core-views/from-col'));
elmts.or_views_toCol.html($.i18n._('core-views/to-col')); elmts.or_views_toCol.html($.i18n('core-views/to-col'));
elmts.or_views_transpose.html($.i18n._('core-views/transp-into')); elmts.or_views_transpose.html($.i18n('core-views/transp-into'));
elmts.or_views_twoCol.html($.i18n._('core-views/two-new-col')); elmts.or_views_twoCol.html($.i18n('core-views/two-new-col'));
elmts.or_views_keyCol.html($.i18n._('core-views/key-col')); elmts.or_views_keyCol.html($.i18n('core-views/key-col'));
elmts.or_views_containNames.html($.i18n._('core-views/contain-names')); elmts.or_views_containNames.html($.i18n('core-views/contain-names'));
elmts.or_views_valCol.html($.i18n._('core-views/val-col')); elmts.or_views_valCol.html($.i18n('core-views/val-col'));
elmts.or_views_containOrig.html($.i18n._('core-views/contain-val')); elmts.or_views_containOrig.html($.i18n('core-views/contain-val'));
elmts.or_views_oneCol.html($.i18n._('core-views/one-col')); elmts.or_views_oneCol.html($.i18n('core-views/one-col'));
elmts.or_views_prependName.html($.i18n._('core-views/prepend-name')); elmts.or_views_prependName.html($.i18n('core-views/prepend-name'));
elmts.or_views_followBy.html($.i18n._('core-views/follow-by')); elmts.or_views_followBy.html($.i18n('core-views/follow-by'));
elmts.or_views_beforeVal.html($.i18n._('core-views/before-val')); elmts.or_views_beforeVal.html($.i18n('core-views/before-val'));
elmts.or_views_ignoreBlank.html($.i18n._('core-views/ignore-blank')); elmts.or_views_ignoreBlank.html($.i18n('core-views/ignore-blank'));
elmts.or_views_fillOther.html($.i18n._('core-views/fill-other')); elmts.or_views_fillOther.html($.i18n('core-views/fill-other'));
elmts.okButton.html($.i18n._('core-buttons/transpose')); elmts.okButton.html($.i18n('core-buttons/transpose'));
elmts.cancelButton.html($.i18n._('core-buttons/cancel')); elmts.cancelButton.html($.i18n('core-buttons/cancel'));
var dismiss = function() { var dismiss = function() {
DialogSystem.dismissUntil(level - 1); DialogSystem.dismissUntil(level - 1);
@ -504,10 +504,10 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
config.keyColumnName = $.trim(elmts.keyColumnNameInput[0].value); config.keyColumnName = $.trim(elmts.keyColumnNameInput[0].value);
config.valueColumnName = $.trim(elmts.valueColumnNameInput[0].value); config.valueColumnName = $.trim(elmts.valueColumnNameInput[0].value);
if (config.keyColumnName == "") { if (config.keyColumnName == "") {
alert($.i18n._('core-views/spec-new-name')); alert($.i18n('core-views/spec-new-name'));
return; return;
} else if (config.valueColumnName == "") { } else if (config.valueColumnName == "") {
alert($.i18n._('core-views/spec-new-val')); alert($.i18n('core-views/spec-new-val'));
return; return;
} }
} else { } else {
@ -515,10 +515,10 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
config.prependColumnName = elmts.prependColumnNameCheckbox[0].checked; config.prependColumnName = elmts.prependColumnNameCheckbox[0].checked;
config.separator = elmts.separatorInput[0].value; config.separator = elmts.separatorInput[0].value;
if (config.combinedColumnName == "") { if (config.combinedColumnName == "") {
alert($.i18n._('core-views/spec-col-name')); alert($.i18n('core-views/spec-col-name'));
return; return;
} else if (config.prependColumnName && config.separator == "") { } else if (config.prependColumnName && config.separator == "") {
alert($.i18n._('core-views/spec-separator')); alert($.i18n('core-views/spec-separator'));
return; return;
} }
} }
@ -572,7 +572,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doTransposeRowsIntoColumns = function() { var doTransposeRowsIntoColumns = function() {
var rowCount = window.prompt($.i18n._('core-views/how-many-rows'), "2"); var rowCount = window.prompt($.i18n('core-views/how-many-rows'), "2");
if (rowCount !== null) { if (rowCount !== null) {
try { try {
rowCount = parseInt(rowCount,10); rowCount = parseInt(rowCount,10);
@ -581,7 +581,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
} }
if (isNaN(rowCount) || rowCount < 2) { if (isNaN(rowCount) || rowCount < 2) {
alert($.i18n._('core-views/expect-two')); alert($.i18n('core-views/expect-two'));
} else { } else {
var config = { var config = {
columnName: column.name, columnName: column.name,
@ -604,12 +604,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var elmts = DOM.bind(dialog); var elmts = DOM.bind(dialog);
var level = DialogSystem.showDialog(dialog); var level = DialogSystem.showDialog(dialog);
elmts.dialogHeader.html($.i18n._('core-views/columnize')); elmts.dialogHeader.html($.i18n('core-views/columnize'));
elmts.or_views_keyCol.html($.i18n._('core-views/key-col')); elmts.or_views_keyCol.html($.i18n('core-views/key-col'));
elmts.or_views_valCol.html($.i18n._('core-views/val-col')); elmts.or_views_valCol.html($.i18n('core-views/val-col'));
elmts.or_views_noteCol.html($.i18n._('core-views/note-col')); elmts.or_views_noteCol.html($.i18n('core-views/note-col'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.html($.i18n._('core-buttons/cancel')); elmts.cancelButton.html($.i18n('core-buttons/cancel'));
var dismiss = function() { var dismiss = function() {
DialogSystem.dismissUntil(level - 1); DialogSystem.dismissUntil(level - 1);
@ -627,7 +627,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
if (config.keyColumnName == null || if (config.keyColumnName == null ||
config.valueColumnName == null || config.valueColumnName == null ||
config.keyColumnName == config.valueColumnName) { config.keyColumnName == config.valueColumnName) {
alert($.i18n._('core-views/sel-col-val')); alert($.i18n('core-views/sel-col-val'));
return; return;
} }
@ -635,7 +635,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
if (noteColumnName != null) { if (noteColumnName != null) {
if (noteColumnName == config.keyColumnName || if (noteColumnName == config.keyColumnName ||
noteColumnName == config.valueColumnName) { noteColumnName == config.valueColumnName) {
alert($.i18n._('core-views/cannot-same')); alert($.i18n('core-views/cannot-same'));
return; return;
} }
config.noteColumnName = noteColumnName; config.noteColumnName = noteColumnName;
@ -672,18 +672,18 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
MenuSystem.appendTo(menu, [ "core/transpose" ], [ MenuSystem.appendTo(menu, [ "core/transpose" ], [
{ {
id: "core/transpose-columns-into-rows", id: "core/transpose-columns-into-rows",
label: $.i18n._('core-views/transp-cell-row')+"...", label: $.i18n('core-views/transp-cell-row')+"...",
click: doTransposeColumnsIntoRows click: doTransposeColumnsIntoRows
}, },
{ {
id: "core/transpose-rows-into-columns", id: "core/transpose-rows-into-columns",
label: $.i18n._('core-views/transp-cell-col')+"...", label: $.i18n('core-views/transp-cell-col')+"...",
click: doTransposeRowsIntoColumns click: doTransposeRowsIntoColumns
}, },
{}, {},
{ {
id: "core/key-value-columnize", id: "core/key-value-columnize",
label: $.i18n._('core-views/columnize-col')+"...", label: $.i18n('core-views/columnize-col')+"...",
click: doKeyValueColumnize click: doKeyValueColumnize
} }
] ]

106
main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js
View File

@ -39,15 +39,15 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
.replace("$EXPRESSION_PREVIEW_WIDGET$", ExpressionPreviewDialog.generateWidgetHtml())); .replace("$EXPRESSION_PREVIEW_WIDGET$", ExpressionPreviewDialog.generateWidgetHtml()));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/add-col-col')+" " + column.name); elmts.dialogHeader.text($.i18n('core-views/add-col-col')+" " + column.name);
elmts.or_views_newCol.text($.i18n._('core-views/new-col-name')); elmts.or_views_newCol.text($.i18n('core-views/new-col-name'));
elmts.or_views_onErr.text($.i18n._('core-views/addasdasd')); elmts.or_views_onErr.text($.i18n('core-views/addasdasd'));
elmts.or_views_setBlank.text($.i18n._('core-views/set-blank')); elmts.or_views_setBlank.text($.i18n('core-views/set-blank'));
elmts.or_views_storeErr.text($.i18n._('core-views/store-err')); elmts.or_views_storeErr.text($.i18n('core-views/store-err'));
elmts.or_views_copyVal.text($.i18n._('core-views/copy-val')); elmts.or_views_copyVal.text($.i18n('core-views/copy-val'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { DialogSystem.dismissUntil(level - 1); }; var dismiss = function() { DialogSystem.dismissUntil(level - 1); };
@ -65,7 +65,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
elmts.okButton.click(function() { elmts.okButton.click(function() {
var columnName = $.trim(elmts.columnNameInput[0].value); var columnName = $.trim(elmts.columnNameInput[0].value);
if (!columnName.length) { if (!columnName.length) {
alert($.i18n._('core-views/warning-col-name')); alert($.i18n('core-views/warning-col-name'));
return; return;
} }
@ -96,29 +96,29 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
); );
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/add-col-fetch')+" " + column.name); elmts.dialogHeader.text($.i18n('core-views/add-col-fetch')+" " + column.name);
elmts.or_views_newCol.text($.i18n._('core-views/new-col-name')); elmts.or_views_newCol.text($.i18n('core-views/new-col-name'));
elmts.or_views_throttle.text($.i18n._('core-views/throttle-delay')); elmts.or_views_throttle.text($.i18n('core-views/throttle-delay'));
elmts.or_views_milli.text($.i18n._('core-views/milli')); elmts.or_views_milli.text($.i18n('core-views/milli'));
elmts.or_views_onErr.text($.i18n._('core-views/on-error')); elmts.or_views_onErr.text($.i18n('core-views/on-error'));
elmts.or_views_setBlank.text($.i18n._('core-views/set-blank')); elmts.or_views_setBlank.text($.i18n('core-views/set-blank'));
elmts.or_views_storeErr.text($.i18n._('core-views/store-err')); elmts.or_views_storeErr.text($.i18n('core-views/store-err'));
elmts.or_views_cacheResponses.text($.i18n._('core-views/cache-responses')); elmts.or_views_cacheResponses.text($.i18n('core-views/cache-responses'));
elmts.or_views_httpHeaders.text($.i18n._('core-views/http-headers')); elmts.or_views_httpHeaders.text($.i18n('core-views/http-headers'));
elmts.or_views_httpHeadersShowHide.text($.i18n._('core-views/show')); elmts.or_views_httpHeadersShowHide.text($.i18n('core-views/show'));
elmts.or_views_httpHeadersShowHide.click(function() { elmts.or_views_httpHeadersShowHide.click(function() {
$( ".set-httpheaders-container" ).toggle( "slow", function() { $( ".set-httpheaders-container" ).toggle( "slow", function() {
if ($(this).is(':visible')) { if ($(this).is(':visible')) {
elmts.or_views_httpHeadersShowHide.text($.i18n._('core-views/hide')); elmts.or_views_httpHeadersShowHide.text($.i18n('core-views/hide'));
} else { } else {
elmts.or_views_httpHeadersShowHide.text($.i18n._('core-views/show')); elmts.or_views_httpHeadersShowHide.text($.i18n('core-views/show'));
} }
}); });
}); });
elmts.or_views_urlFetch.text($.i18n._('core-views/url-fetch')); elmts.or_views_urlFetch.text($.i18n('core-views/url-fetch'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { DialogSystem.dismissUntil(level - 1); }; var dismiss = function() { DialogSystem.dismissUntil(level - 1); };
@ -137,7 +137,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
elmts.okButton.click(function() { elmts.okButton.click(function() {
var columnName = $.trim(elmts.columnNameInput[0].value); var columnName = $.trim(elmts.columnNameInput[0].value);
if (!columnName.length) { if (!columnName.length) {
alert($.i18n._('core-views/warning-col-name')); alert($.i18n('core-views/warning-col-name'));
return; return;
} }
@ -199,7 +199,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}; };
var doRenameColumn = function() { var doRenameColumn = function() {
var newColumnName = window.prompt($.i18n._('core-views/enter-col-name'), column.name); var newColumnName = window.prompt($.i18n('core-views/enter-col-name'), column.name);
if (newColumnName !== null) { if (newColumnName !== null) {
Refine.postCoreProcess( Refine.postCoreProcess(
"rename-column", "rename-column",
@ -243,21 +243,21 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doSplitColumn = function() { var doSplitColumn = function() {
var frame = $(DOM.loadHTML("core", "scripts/views/data-table/split-column-dialog.html")); var frame = $(DOM.loadHTML("core", "scripts/views/data-table/split-column-dialog.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/split-col')+" " + column.name + " "+$.i18n._('core-views/several-col')); elmts.dialogHeader.text($.i18n('core-views/split-col')+" " + column.name + " "+$.i18n('core-views/several-col'));
elmts.or_views_howSplit.text($.i18n._('core-views/how-split')); elmts.or_views_howSplit.text($.i18n('core-views/how-split'));
elmts.or_views_bySep.text($.i18n._('core-views/by-sep')); elmts.or_views_bySep.text($.i18n('core-views/by-sep'));
elmts.or_views_separator.text($.i18n._('core-views/separator')); elmts.or_views_separator.text($.i18n('core-views/separator'));
elmts.or_views_regExp.text($.i18n._('core-views/reg-exp')); elmts.or_views_regExp.text($.i18n('core-views/reg-exp'));
elmts.or_views_splitInto.text($.i18n._('core-views/split-into')); elmts.or_views_splitInto.text($.i18n('core-views/split-into'));
elmts.or_views_colMost.text($.i18n._('core-views/col-at-most')); elmts.or_views_colMost.text($.i18n('core-views/col-at-most'));
elmts.or_views_fieldLen.text($.i18n._('core-views/field-len')); elmts.or_views_fieldLen.text($.i18n('core-views/field-len'));
elmts.or_views_listInt.text($.i18n._('core-views/list-int')); elmts.or_views_listInt.text($.i18n('core-views/list-int'));
elmts.or_views_afterSplit.text($.i18n._('core-views/after-split')); elmts.or_views_afterSplit.text($.i18n('core-views/after-split'));
elmts.or_views_guessType.text($.i18n._('core-views/guess-cell')); elmts.or_views_guessType.text($.i18n('core-views/guess-cell'));
elmts.or_views_removeCol.text($.i18n._('core-views/remove-col')); elmts.or_views_removeCol.text($.i18n('core-views/remove-col'));
elmts.okButton.html($.i18n._('core-buttons/ok')); elmts.okButton.html($.i18n('core-buttons/ok'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var level = DialogSystem.showDialog(frame); var level = DialogSystem.showDialog(frame);
var dismiss = function() { DialogSystem.dismissUntil(level - 1); }; var dismiss = function() { DialogSystem.dismissUntil(level - 1); };
@ -274,7 +274,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
if (mode == "separator") { if (mode == "separator") {
config.separator = elmts.separatorInput[0].value; config.separator = elmts.separatorInput[0].value;
if (!(config.separator)) { if (!(config.separator)) {
alert($.i18n._('core-views/specify-sep')); alert($.i18n('core-views/specify-sep'));
return; return;
} }
@ -300,14 +300,14 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}); });
if (lengths.length === 0) { if (lengths.length === 0) {
alert($.i18n._('core-views/warning-no-length')); alert($.i18n('core-views/warning-no-length'));
return; return;
} }
config.fieldLengths = JSON.stringify(lengths); config.fieldLengths = JSON.stringify(lengths);
} catch (e) { } catch (e) {
alert($.i18n._('core-views/warning-format')); alert($.i18n('core-views/warning-format'));
return; return;
} }
} }
@ -325,55 +325,55 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
MenuSystem.appendTo(menu, [ "core/edit-column" ], [ MenuSystem.appendTo(menu, [ "core/edit-column" ], [
{ {
id: "core/split-column", id: "core/split-column",
label: $.i18n._('core-views/split-into-col')+"...", label: $.i18n('core-views/split-into-col')+"...",
click: doSplitColumn click: doSplitColumn
}, },
{}, {},
{ {
id: "core/add-column", id: "core/add-column",
label: $.i18n._('core-views/add-based-col')+"...", label: $.i18n('core-views/add-based-col')+"...",
click: doAddColumn click: doAddColumn
}, },
{ {
id: "core/add-column-by-fetching-urls", id: "core/add-column-by-fetching-urls",
label: $.i18n._('core-views/add-by-urls')+"...", label: $.i18n('core-views/add-by-urls')+"...",
click: doAddColumnByFetchingURLs click: doAddColumnByFetchingURLs
}, },
{ {
id: "core/add-column-by-reconciliation", id: "core/add-column-by-reconciliation",
label: $.i18n._('core-views/add-col-recon-val')+"...", label: $.i18n('core-views/add-col-recon-val')+"...",
click: doAddColumnByReconciliation click: doAddColumnByReconciliation
}, },
{}, {},
{ {
id: "core/rename-column", id: "core/rename-column",
label: $.i18n._('core-views/rename-col'), label: $.i18n('core-views/rename-col'),
click: doRenameColumn click: doRenameColumn
}, },
{ {
id: "core/remove-column", id: "core/remove-column",
label: $.i18n._('core-views/remove-col'), label: $.i18n('core-views/remove-col'),
click: doRemoveColumn click: doRemoveColumn
}, },
{}, {},
{ {
id: "core/move-column-to-beginning", id: "core/move-column-to-beginning",
label: $.i18n._('core-views/move-to-beg'), label: $.i18n('core-views/move-to-beg'),
click: function() { doMoveColumnTo(0); } click: function() { doMoveColumnTo(0); }
}, },
{ {
id: "core/move-column-to-end", id: "core/move-column-to-end",
label: $.i18n._('core-views/move-to-end'), label: $.i18n('core-views/move-to-end'),
click: function() { doMoveColumnTo(theProject.columnModel.columns.length - 1); } click: function() { doMoveColumnTo(theProject.columnModel.columns.length - 1); }
}, },
{ {
id: "core/move-column-to-left", id: "core/move-column-to-left",
label: $.i18n._('core-views/move-to-left'), label: $.i18n('core-views/move-to-left'),
click: function() { doMoveColumnBy(-1); } click: function() { doMoveColumnBy(-1); }
}, },
{ {
id: "core/move-column-to-right", id: "core/move-column-to-right",
label: $.i18n._('core-views/move-to-right'), label: $.i18n('core-views/move-to-right'),
click: function() { doMoveColumnBy(1); } click: function() { doMoveColumnBy(1); }
} }
] ]

40
main/webapp/modules/core/scripts/views/data-table/menu-facets.js
View File

@ -35,7 +35,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doFilterByExpressionPrompt = function(expression, type) { var doFilterByExpressionPrompt = function(expression, type) {
DataTableView.promptExpressionOnVisibleRows( DataTableView.promptExpressionOnVisibleRows(
column, column,
(type == "list" ? $.i18n._('core-views/custom-facet') : $.i18n._('core-views/custom-numeric-label')) +" "+ column.name, (type == "list" ? $.i18n('core-views/custom-facet') : $.i18n('core-views/custom-numeric-label')) +" "+ column.name,
expression, expression,
function(expression) { function(expression) {
var config = { var config = {
@ -55,7 +55,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
MenuSystem.appendTo(menu, [ "core/facet" ], [ MenuSystem.appendTo(menu, [ "core/facet" ], [
{ {
id: "core/text-facet", id: "core/text-facet",
label: $.i18n._('core-views/text-facet'), label: $.i18n('core-views/text-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -69,7 +69,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/numeric-facet", id: "core/numeric-facet",
label: $.i18n._('core-views/numeric-facet'), label: $.i18n('core-views/numeric-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
@ -84,7 +84,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/time-facet", id: "core/time-facet",
label: $.i18n._('core-views/timeline-facet'), label: $.i18n('core-views/timeline-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"timerange", "timerange",
@ -99,7 +99,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/scatterplot-facet", id: "core/scatterplot-facet",
label: $.i18n._('core-views/scatterplot-facet'), label: $.i18n('core-views/scatterplot-facet'),
click: function() { click: function() {
new ScatterplotDialog(column.name); new ScatterplotDialog(column.name);
} }
@ -107,25 +107,25 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/custom-text-facet", id: "core/custom-text-facet",
label: $.i18n._('core-views/custom-text-facet')+'...', label: $.i18n('core-views/custom-text-facet')+'...',
click: function() { click: function() {
doFilterByExpressionPrompt(null, "list"); doFilterByExpressionPrompt(null, "list");
} }
}, },
{ {
id: "core/custom-numeric-facet", id: "core/custom-numeric-facet",
label: $.i18n._('core-views/custom-numeric')+'...', label: $.i18n('core-views/custom-numeric')+'...',
click: function() { click: function() {
doFilterByExpressionPrompt(null, "range"); doFilterByExpressionPrompt(null, "range");
} }
}, },
{ {
id: "core/customized-facets", id: "core/customized-facets",
label: $.i18n._('core-views/custom-facets'), label: $.i18n('core-views/custom-facets'),
submenu: [ submenu: [
{ {
id: "core/word-facet", id: "core/word-facet",
label: $.i18n._('core-views/word-facet'), label: $.i18n('core-views/word-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -140,7 +140,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/duplicates-facet", id: "core/duplicates-facet",
label: $.i18n._('core-views/duplicates-facet'), label: $.i18n('core-views/duplicates-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -156,7 +156,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/numeric-log-facet", id: "core/numeric-log-facet",
label: $.i18n._('core-views/numeric-log-facet'), label: $.i18n('core-views/numeric-log-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
@ -171,7 +171,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/bounded-numeric-log-facet", id: "core/bounded-numeric-log-facet",
label: $.i18n._('core-views/bounded-log-facet'), label: $.i18n('core-views/bounded-log-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
@ -187,7 +187,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/text-length-facet", id: "core/text-length-facet",
label: $.i18n._('core-views/text-length-facet'), label: $.i18n('core-views/text-length-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
@ -202,7 +202,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/log-text-length-facet", id: "core/log-text-length-facet",
label: $.i18n._('core-views/log-length-facet'), label: $.i18n('core-views/log-length-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
@ -217,7 +217,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/unicode-charcode-facet", id: "core/unicode-charcode-facet",
label: $.i18n._('core-views/unicode-facet'), label: $.i18n('core-views/unicode-facet'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
@ -233,7 +233,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/error-facet", id: "core/error-facet",
label: $.i18n._('core-views/facet-error'), label: $.i18n('core-views/facet-error'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -247,7 +247,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/null-facet", id: "core/null-facet",
label: $.i18n._('core-views/facet-null'), label: $.i18n('core-views/facet-null'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -261,7 +261,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/empty-string-facet", id: "core/empty-string-facet",
label: $.i18n._('core-views/facet-empty-string'), label: $.i18n('core-views/facet-empty-string'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -275,7 +275,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/blank-facet", id: "core/blank-facet",
label: $.i18n._('core-views/facet-blank'), label: $.i18n('core-views/facet-blank'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -293,7 +293,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
MenuSystem.insertAfter(menu, [ "core/facet" ], [ MenuSystem.insertAfter(menu, [ "core/facet" ], [
{ {
label: $.i18n._('core-views/text-filter'), label: $.i18n('core-views/text-filter'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"text", "text",

110
main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js
View File

@ -90,11 +90,11 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var frame = DialogSystem.createDialog(); var frame = DialogSystem.createDialog();
frame.width("400px"); frame.width("400px");
var header = $('<div></div>').addClass("dialog-header").text($.i18n._('core-views/search-match')).appendTo(frame); var header = $('<div></div>').addClass("dialog-header").text($.i18n('core-views/search-match')).appendTo(frame);
var body = $('<div></div>').addClass("dialog-body").appendTo(frame); var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame); var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
$('<p></p>').text($.i18n._('core-views/search-fb-topic')).appendTo(body); $('<p></p>').text($.i18n('core-views/search-fb-topic')).appendTo(body);
var input = $('<input />').appendTo($('<p></p>').appendTo(body)); var input = $('<input />').appendTo($('<p></p>').appendTo(body));
@ -118,7 +118,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
DialogSystem.dismissUntil(level - 1); DialogSystem.dismissUntil(level - 1);
}); });
$('<button class="button"></button>').text($.i18n._('core-buttons/cancel')).click(function() { $('<button class="button"></button>').text($.i18n('core-buttons/cancel')).click(function() {
DialogSystem.dismissUntil(level - 1); DialogSystem.dismissUntil(level - 1);
}).appendTo(footer); }).appendTo(footer);
@ -130,11 +130,11 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var frame = DialogSystem.createDialog(); var frame = DialogSystem.createDialog();
frame.width("400px"); frame.width("400px");
var header = $('<div></div>').addClass("dialog-header").text($.i18n._('core-views/use-values-as-identifiers')).appendTo(frame); var header = $('<div></div>').addClass("dialog-header").text($.i18n('core-views/use-values-as-identifiers')).appendTo(frame);
var body = $('<div></div>').addClass("dialog-body").appendTo(frame); var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame); var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
$('<p></p>').text($.i18n._('core-views/choose-reconciliation-service')).appendTo(body); $('<p></p>').text($.i18n('core-views/choose-reconciliation-service')).appendTo(body);
var select = $('<select></select>').appendTo(body); var select = $('<select></select>').appendTo(body);
var services = ReconciliationManager.getAllServices(); var services = ReconciliationManager.getAllServices();
for (var i = 0; i < services.length; i++) { for (var i = 0; i < services.length; i++) {
@ -144,10 +144,10 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
.appendTo(select); .appendTo(select);
} }
$('<button class="button"></button>').text($.i18n._('core-buttons/cancel')).click(function() { $('<button class="button"></button>').text($.i18n('core-buttons/cancel')).click(function() {
DialogSystem.dismissUntil(level - 1); DialogSystem.dismissUntil(level - 1);
}).appendTo(footer); }).appendTo(footer);
$('<button class="button"></button>').html($.i18n._('core-buttons/ok')).click(function() { $('<button class="button"></button>').html($.i18n('core-buttons/ok')).click(function() {
var service = select.val(); var service = select.val();
var identifierSpace = null; var identifierSpace = null;
@ -159,7 +159,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
} }
} }
if (identifierSpace === null) { if (identifierSpace === null) {
alert($.i18n._('core-views/choose-reconciliation-service-alert')); alert($.i18n('core-views/choose-reconciliation-service-alert'));
} else { } else {
Refine.postCoreProcess( Refine.postCoreProcess(
"recon-use-values-as-identifiers", "recon-use-values-as-identifiers",
@ -183,16 +183,16 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
var doCopyAcrossColumns = function() { var doCopyAcrossColumns = function() {
var frame = $(DOM.loadHTML("core", "scripts/views/data-table/copy-recon-across-columns-dialog.html")); var frame = $(DOM.loadHTML("core", "scripts/views/data-table/copy-recon-across-columns-dialog.html"));
var elmts = DOM.bind(frame); var elmts = DOM.bind(frame);
elmts.dialogHeader.text($.i18n._('core-views/copy-recon-judg')+" " + column.name); elmts.dialogHeader.text($.i18n('core-views/copy-recon-judg')+" " + column.name);
elmts.or_views_copyToCol.text($.i18n._('core-views/copy-to-col')); elmts.or_views_copyToCol.text($.i18n('core-views/copy-to-col'));
elmts.or_views_copyOpt.text($.i18n._('core-views/copy-opt')); elmts.or_views_copyOpt.text($.i18n('core-views/copy-opt'));
elmts.or_views_applyToCell.text($.i18n._('core-views/apply-to-cell')); elmts.or_views_applyToCell.text($.i18n('core-views/apply-to-cell'));
elmts.or_views_whatToCopy.text($.i18n._('core-views/what-to-copy')); elmts.or_views_whatToCopy.text($.i18n('core-views/what-to-copy'));
elmts.or_views_newRecon.text($.i18n._('core-views/new-recon')); elmts.or_views_newRecon.text($.i18n('core-views/new-recon'));
elmts.or_views_matchRecon.text($.i18n._('core-views/match-recon')); elmts.or_views_matchRecon.text($.i18n('core-views/match-recon'));
elmts.okButton.text($.i18n._('core-buttons/copy')); elmts.okButton.text($.i18n('core-buttons/copy'));
elmts.cancelButton.text($.i18n._('core-buttons/cancel')); elmts.cancelButton.text($.i18n('core-buttons/cancel'));
var columns = theProject.columnModel.columns; var columns = theProject.columnModel.columns;
for (var i = 0; i < columns.length; i++) { for (var i = 0; i < columns.length; i++) {
@ -227,9 +227,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}); });
if (config.toColumnName.length === 0) { if (config.toColumnName.length === 0) {
alert($.i18n._('core-views/warning-other-col')); alert($.i18n('core-views/warning-other-col'));
} else if (config.judgment.length === 0) { } else if (config.judgment.length === 0) {
alert($.i18n._('core-views/warning-sel-judg')); alert($.i18n('core-views/warning-sel-judg'));
} else { } else {
Refine.postCoreProcess( Refine.postCoreProcess(
"recon-copy-across-columns", "recon-copy-across-columns",
@ -245,18 +245,18 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
MenuSystem.appendTo(menu, [ "core/reconcile" ], [ MenuSystem.appendTo(menu, [ "core/reconcile" ], [
{ {
id: "core/reconcile", id: "core/reconcile",
label: $.i18n._('core-views/start-recon')+'...', label: $.i18n('core-views/start-recon')+'...',
tooltip: $.i18n._('core-views/recon-text-fb'), tooltip: $.i18n('core-views/recon-text-fb'),
click: doReconcile click: doReconcile
}, },
{}, {},
{ {
id: "core/facets", id: "core/facets",
label: $.i18n._('core-views/facets'), label: $.i18n('core-views/facets'),
submenu: [ submenu: [
{ {
id: "core/by-judgment", id: "core/by-judgment",
label: $.i18n._('core-views/by-judg'), label: $.i18n('core-views/by-judg'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -273,12 +273,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/by-judgment-actions", id: "core/by-judgment-actions",
label: $.i18n._('core-views/judg-actions'), label: $.i18n('core-views/judg-actions'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
{ {
"name" : column.name + " "+$.i18n._('core-views/judg-actions2'), "name" : column.name + " "+$.i18n('core-views/judg-actions2'),
"columnName" : column.name, "columnName" : column.name,
"expression" : "cell.recon.judgmentAction" "expression" : "cell.recon.judgmentAction"
} }
@ -287,12 +287,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/by-judgment-history-entries", id: "core/by-judgment-history-entries",
label: $.i18n._('core-views/judg-hist'), label: $.i18n('core-views/judg-hist'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
{ {
"name" : column.name + " "+$.i18n._('core-views/hist-entries'), "name" : column.name + " "+$.i18n('core-views/hist-entries'),
"columnName" : column.name, "columnName" : column.name,
"expression" : "cell.recon.judgmentHistoryEntry" "expression" : "cell.recon.judgmentHistoryEntry"
} }
@ -302,12 +302,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/by-best-candidates-score", id: "core/by-best-candidates-score",
label: $.i18n._('core-views/best-score'), label: $.i18n('core-views/best-score'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
{ {
"name" : column.name + ": "+$.i18n._('core-views/best-cand-score'), "name" : column.name + ": "+$.i18n('core-views/best-cand-score'),
"columnName" : column.name, "columnName" : column.name,
"expression" : "cell.recon.best.score", "expression" : "cell.recon.best.score",
"mode" : "range" "mode" : "range"
@ -319,12 +319,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/by-best-candidates-type-match", id: "core/by-best-candidates-type-match",
label: $.i18n._('core-views/best-type-match'), label: $.i18n('core-views/best-type-match'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
{ {
"name" : column.name + ": "+$.i18n._('core-views/best-cand-type-match'), "name" : column.name + ": "+$.i18n('core-views/best-cand-type-match'),
"columnName" : column.name, "columnName" : column.name,
"expression" : 'forNonBlank(cell.recon.features.typeMatch, v, v, if(isNonBlank(value), if(cell.recon != null, "(no type)", "(unreconciled)"), "(blank)"))' "expression" : 'forNonBlank(cell.recon.features.typeMatch, v, v, if(isNonBlank(value), if(cell.recon != null, "(no type)", "(unreconciled)"), "(blank)"))'
}, },
@ -336,12 +336,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/by-best-candidates-name-match", id: "core/by-best-candidates-name-match",
label: $.i18n._('core-views/best-name'), label: $.i18n('core-views/best-name'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
{ {
"name" : column.name + ": "+ $.i18n._('core-views/best-cand-name'), "name" : column.name + ": "+ $.i18n('core-views/best-cand-name'),
"columnName" : column.name, "columnName" : column.name,
"expression" : 'forNonBlank(cell.recon.features.nameMatch, v, v, if(isNonBlank(value), "(unreconciled)", "(blank)"))' "expression" : 'forNonBlank(cell.recon.features.nameMatch, v, v, if(isNonBlank(value), "(unreconciled)", "(blank)"))'
}, },
@ -354,12 +354,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/by-best-candidates-name-edit-distance", id: "core/by-best-candidates-name-edit-distance",
label: $.i18n._('core-views/best-edit-dist'), label: $.i18n('core-views/best-edit-dist'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
{ {
"name" : column.name + ": "+$.i18n._('core-views/best-cand-edit-dist'), "name" : column.name + ": "+$.i18n('core-views/best-cand-edit-dist'),
"columnName" : column.name, "columnName" : column.name,
"expression" : "cell.recon.features.nameLevenshtein", "expression" : "cell.recon.features.nameLevenshtein",
"mode" : "range" "mode" : "range"
@ -371,12 +371,12 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/by-best-candidates-name-word-similarity", id: "core/by-best-candidates-name-word-similarity",
label: $.i18n._('core-views/best-word-sim'), label: $.i18n('core-views/best-word-sim'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"range", "range",
{ {
"name" : column.name + ": "+$.i18n._('core-views/best-cand-word-sim'), "name" : column.name + ": "+$.i18n('core-views/best-cand-word-sim'),
"columnName" : column.name, "columnName" : column.name,
"expression" : "cell.recon.features.nameWordDistance", "expression" : "cell.recon.features.nameWordDistance",
"mode" : "range" "mode" : "range"
@ -389,7 +389,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/by-best-candidates-types", id: "core/by-best-candidates-types",
label: $.i18n._('core-views/best-type'), label: $.i18n('core-views/best-type'),
click: function() { click: function() {
ui.browsingEngine.addFacet( ui.browsingEngine.addFacet(
"list", "list",
@ -405,47 +405,47 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
}, },
{ {
id: "core/actions", id: "core/actions",
label: $.i18n._('core-views/actions'), label: $.i18n('core-views/actions'),
submenu: [ submenu: [
{ {
id: "core/match-to-best-candidate", id: "core/match-to-best-candidate",
label: $.i18n._('core-views/best-cand'), label: $.i18n('core-views/best-cand'),
tooltip: $.i18n._('core-views/best-cand2'), tooltip: $.i18n('core-views/best-cand2'),
click: doReconMatchBestCandidates click: doReconMatchBestCandidates
}, },
{ {
id: "core/match-to-new-topic", id: "core/match-to-new-topic",
label: $.i18n._('core-views/new-topic'), label: $.i18n('core-views/new-topic'),
tooltip: $.i18n._('core-views/new-topic2'), tooltip: $.i18n('core-views/new-topic2'),
click: function() { click: function() {
doReconMarkNewTopics(false); doReconMarkNewTopics(false);
} }
}, },
{ {
id: "core/match-similar-to-new-topic", id: "core/match-similar-to-new-topic",
label: $.i18n._('core-views/one-topic'), label: $.i18n('core-views/one-topic'),
tooltip: $.i18n._('core-views/one-topic2'), tooltip: $.i18n('core-views/one-topic2'),
click: function() { click: function() {
doReconMarkNewTopics(true); doReconMarkNewTopics(true);
} }
}, },
{ {
id: "core/match-to-specific", id: "core/match-to-specific",
label: $.i18n._('core-views/filtered-cell'), label: $.i18n('core-views/filtered-cell'),
tooltip: $.i18n._('core-views/filtered-cell2'), tooltip: $.i18n('core-views/filtered-cell2'),
click: doSearchToMatch click: doSearchToMatch
}, },
{}, {},
{ {
id: "core/discard-judgments", id: "core/discard-judgments",
label: $.i18n._('core-views/discard-judg'), label: $.i18n('core-views/discard-judg'),
tooltip: $.i18n._('core-views/discard-judg2'), tooltip: $.i18n('core-views/discard-judg2'),
click: doReconDiscardJudgments click: doReconDiscardJudgments
}, },
{ {
id: "core/clear-recon-data", id: "core/clear-recon-data",
label: $.i18n._('core-views/clear-recon'), label: $.i18n('core-views/clear-recon'),
tooltip: $.i18n._('core-views/clear-recon2'), tooltip: $.i18n('core-views/clear-recon2'),
click: doClearReconData click: doClearReconData
} }
] ]
@ -453,14 +453,14 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/copy-across-columns", id: "core/copy-across-columns",
label: $.i18n._('core-views/copy-recon'), label: $.i18n('core-views/copy-recon'),
tooltip: $.i18n._('core-views/copy-recon2'), tooltip: $.i18n('core-views/copy-recon2'),
click: doCopyAcrossColumns click: doCopyAcrossColumns
}, },
{ {
id: "core/use-values-as-identifiers", id: "core/use-values-as-identifiers",
label: $.i18n._('core-views/use-values-as-identifiers'), label: $.i18n('core-views/use-values-as-identifiers'),
tooltip: $.i18n._('core-views/use-values-as-identifiers2'), tooltip: $.i18n('core-views/use-values-as-identifiers2'),
click: doUseValuesAsIdentifiers click: doUseValuesAsIdentifiers
} }
]); ]);