From 9bf0bb2154b632049eca15da62cdc12a2ffff931 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Wed, 21 Nov 2018 15:24:57 +0000 Subject: [PATCH] Merge JS i18n strings with slash --- .../index/database-import-controller.js | 30 +-- .../scripts/index/database-source-ui.js | 44 ++--- .../module/scripts/index/gdata-source-ui.js | 30 +-- .../scripts/index/importing-controller.js | 44 ++--- .../gdata/module/scripts/project/exporters.js | 12 +- .../scripts/dialogs/import-schema-dialog.js | 14 +- .../scripts/dialogs/manage-account-dialog.js | 28 +-- .../scripts/dialogs/perform-edits-dialog.js | 16 +- .../dialogs/schema-alignment-dialog.js | 82 ++++---- .../module/scripts/menu-bar-extension.js | 20 +- .../module/scripts/previewrenderer.js | 6 +- .../module/scripts/warningsrenderer.js | 2 +- .../core/scripts/dialogs/clustering-dialog.js | 82 ++++---- .../dialogs/column-reordering-dialog.js | 10 +- .../dialogs/custom-tabular-exporter-dialog.js | 92 ++++----- .../dialogs/expression-column-dialog.js | 14 +- .../dialogs/expression-preview-dialog.js | 42 ++--- .../dialogs/extend-data-preview-dialog.js | 26 +-- .../scripts/dialogs/scatterplot-dialog.js | 26 +-- .../scripts/dialogs/sql-exporter-dialog.js | 28 +-- .../dialogs/templating-exporter-dialog.js | 20 +- .../modules/core/scripts/facets/list-facet.js | 50 ++--- .../core/scripts/facets/range-facet.js | 20 +- .../core/scripts/facets/scatterplot-facet.js | 26 +-- .../core/scripts/facets/text-search-facet.js | 10 +- .../core/scripts/facets/timerange-facet.js | 26 +-- main/webapp/modules/core/scripts/index.js | 20 +- .../core/scripts/index/create-project-ui.js | 26 +-- .../controller.js | 10 +- .../file-selection-panel.js | 32 ++-- .../parsing-panel.js | 14 +- .../default-importing-sources/sources.js | 42 ++--- .../scripts/index/edit-metadata-dialog.js | 12 +- .../core/scripts/index/import-project-ui.js | 10 +- .../core/scripts/index/lang-settings-ui.js | 8 +- .../core/scripts/index/open-project-ui.js | 32 ++-- .../parser-interfaces/excel-parser-ui.js | 26 +-- .../fixed-width-parser-ui.js | 36 ++-- .../index/parser-interfaces/json-parser-ui.js | 20 +- .../parser-interfaces/line-based-parser-ui.js | 30 +-- .../rdf-triples-parser-ui.js | 4 +- .../separator-based-parser-ui.js | 46 ++--- .../parser-interfaces/wikitext-parser-ui.js | 28 +-- .../index/parser-interfaces/xml-parser-ui.js | 20 +- .../modules/core/scripts/preferences.js | 20 +- main/webapp/modules/core/scripts/project.js | 22 +-- .../core/scripts/project/browsing-engine.js | 14 +- .../project/edit-general-metadata-dialog.js | 4 +- .../modules/core/scripts/project/exporters.js | 40 ++-- .../core/scripts/project/history-panel.js | 36 ++-- .../core/scripts/project/process-panel.js | 18 +- .../core/scripts/project/summary-bar.js | 2 +- .../scripts/reconciliation/recon-dialog.js | 20 +- .../scripts/reconciliation/recon-manager.js | 6 +- .../reconciliation/standard-service-panel.js | 20 +- .../modules/core/scripts/util/date-time.js | 4 +- .../modules/core/scripts/util/dialog.js | 2 +- .../modules/core/scripts/util/encoding.js | 10 +- main/webapp/modules/core/scripts/util/misc.js | 10 +- .../core/scripts/views/data-table/cell-ui.js | 66 +++---- .../views/data-table/column-header-ui.js | 82 ++++---- .../views/data-table/data-table-view.js | 80 ++++---- .../views/data-table/menu-edit-cells.js | 178 +++++++++--------- .../views/data-table/menu-edit-column.js | 106 +++++------ .../scripts/views/data-table/menu-facets.js | 40 ++-- .../views/data-table/menu-reconcile.js | 110 +++++------ 66 files changed, 1053 insertions(+), 1053 deletions(-) diff --git a/extensions/database/module/scripts/index/database-import-controller.js b/extensions/database/module/scripts/index/database-import-controller.js index e76dfe845..a35facaa0 100644 --- a/extensions/database/module/scripts/index/database-import-controller.js +++ b/extensions/database/module/scripts/index/database-import-controller.js @@ -60,7 +60,7 @@ Refine.DatabaseImportController = function(createProjectUI) { Refine.CreateProjectUI.controllers.push(Refine.DatabaseImportController); 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); var self = this; @@ -138,19 +138,19 @@ Refine.DatabaseImportController.prototype._showParsingPanel = function() { this._parsingPanelElmts = DOM.bind(this._parsingPanel); - this._parsingPanelElmts.startOverButton.html($.i18n._('database-parsing')["start-over"]); - this._parsingPanelElmts.database_conf_pars.html($.i18n._('database-parsing')["conf-pars"]); - this._parsingPanelElmts.database_proj_name.html($.i18n._('database-parsing')["proj-name"]); - this._parsingPanelElmts.createProjectButton.html($.i18n._('database-parsing')["create-proj"]); - this._parsingPanelElmts.database_options.html($.i18n._('database-parsing')["option"]); - this._parsingPanelElmts.previewButton.html($.i18n._('database-parsing')["preview-button"]); - 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.html($.i18n._('database-parsing')["discard"]); - this._parsingPanelElmts.database_limit_next.html($.i18n._('database-parsing')["limit-next"]); - this._parsingPanelElmts.database_limit.html($.i18n._('database-parsing')["limit"]); - this._parsingPanelElmts.database_store_row.html($.i18n._('database-parsing')["store-row"]); - this._parsingPanelElmts.database_store_cell.html($.i18n._('database-parsing')["store-cell"]); + this._parsingPanelElmts.startOverButton.html($.i18n._('database-parsing/start-over')); + this._parsingPanelElmts.database_conf_pars.html($.i18n._('database-parsing/conf-pars')); + this._parsingPanelElmts.database_proj_name.html($.i18n._('database-parsing/proj-name')); + this._parsingPanelElmts.createProjectButton.html($.i18n._('database-parsing/create-proj')); + this._parsingPanelElmts.database_options.html($.i18n._('database-parsing/option')); + this._parsingPanelElmts.previewButton.html($.i18n._('database-parsing/preview-button')); + 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.html($.i18n._('database-parsing/discard')); + this._parsingPanelElmts.database_limit_next.html($.i18n._('database-parsing/limit-next')); + this._parsingPanelElmts.database_limit.html($.i18n._('database-parsing/limit')); + this._parsingPanelElmts.database_store_row.html($.i18n._('database-parsing/store-row')); + this._parsingPanelElmts.database_store_cell.html($.i18n._('database-parsing/store-cell')); if (this._parsingPanelResizer) { $(window).unbind('resize', this._parsingPanelResizer); @@ -362,7 +362,7 @@ Refine.DatabaseImportController.prototype._createProject = function() { }, 1000 ); - self._createProjectUI.showImportProgressPanel($.i18n._('database-import')["creating"], function() { + self._createProjectUI.showImportProgressPanel($.i18n._('database-import/creating'), function() { // stop the timed polling window.clearInterval(timerID); diff --git a/extensions/database/module/scripts/index/database-source-ui.js b/extensions/database/module/scripts/index/database-source-ui.js index f93ad77ad..65bec257b 100644 --- a/extensions/database/module/scripts/index/database-source-ui.js +++ b/extensions/database/module/scripts/index/database-source-ui.js @@ -64,7 +64,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) { this._elmts = DOM.bind(this._body); var self = this; - $('#database-title').text($.i18n._("database-import")["title"]); + $('#database-title').text($.i18n._('database-import/title')); $('#connectionNameLabel').html($.i18n._("database-source")["connectionNameLabel"]); $('#databaseTypeLabel').html($.i18n._("database-source")["databaseTypeLabel"]); $('#databaseHostLabel').text($.i18n._("database-source")["databaseHostLabel"]); @@ -129,7 +129,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) { if(self._validateNewConnectionForm() == true){ var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value); if (connectionNameInput.length === 0) { - window.alert($.i18n._('database-source')["alert-connection-name"]); + window.alert($.i18n._('database-source/alert-connection-name')); } else{ self._saveConnection(self._getConnectionInfo()); } @@ -152,7 +152,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) { // if(jdbcQueryInfo.query && jdbcQueryInfo.query.length > 0 ) { // self._executeQuery(jdbcQueryInfo); // }else{ -// window.alert($.i18n._('database-source')["alert-query"]); +// window.alert($.i18n._('database-source/alert-query')); // } if(self.validateQuery(jdbcQueryInfo.query)) { @@ -171,7 +171,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) { if(self._validateNewConnectionForm() == true){ var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value); if (connectionNameInput.length === 0) { - window.alert($.i18n._('database-source')["alert-connection-name"]); + window.alert($.i18n._('database-source/alert-connection-name')); } else{ self._editConnection(self._getConnectionInfo()); } @@ -198,38 +198,38 @@ Refine.DatabaseSourceUI.prototype.focus = function() { Refine.DatabaseSourceUI.prototype.validateQuery = function(query) { //alert("query::" + query); if(!query || query.length <= 0 ) { - window.alert($.i18n._('database-source')["alert-query"]); + window.alert($.i18n._('database-source/alert-query')); return false; } var allCapsQuery = query.toUpperCase(); 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; }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; }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; }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; }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; }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; }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; }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; }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; } @@ -238,12 +238,12 @@ Refine.DatabaseSourceUI.prototype.validateQuery = function(query) { // || (allCapsQuery.indexOf('SHUTDOWN') > -1) || (allCapsQuery.indexOf('INSERT') > -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; // } if(!allCapsQuery.startsWith('SELECT')) { - window.alert($.i18n._('database-source')["alert-invalid-query-select"]); + window.alert($.i18n._('database-source/alert-invalid-query-select')); return false; } @@ -273,7 +273,7 @@ Refine.DatabaseSourceUI.prototype._editConnection = function(connectionInfo) { }) $( "#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 ){ @@ -286,7 +286,7 @@ Refine.DatabaseSourceUI.prototype._executeQuery = function(jdbcQueryInfo) { var self = this; //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'); $.post( @@ -467,16 +467,16 @@ Refine.DatabaseSourceUI.prototype._validateNewConnectionForm = function() { var initialSchemaInput = $.trim(self._elmts.initialSchemaInput[0].value); if (databaseHostInput.length === 0) { - window.alert($.i18n._('database-source')["alert-server"]); + window.alert($.i18n._('database-source/alert-server')); return false; }else if(databasePortInput.length === 0){ - window.alert($.i18n._('database-source')["alert-port"]); + window.alert($.i18n._('database-source/alert-port')); return false; }else if(databaseUserInput.length === 0){ - window.alert($.i18n._('database-source')["alert-user"]); + window.alert($.i18n._('database-source/alert-user')); return false; }else if(initialDatabaseInput.length === 0){ - window.alert($.i18n._('database-source')["alert-initial-database"]); + window.alert($.i18n._('database-source/alert-initial-database')); return false; } else{ diff --git a/extensions/gdata/module/scripts/index/gdata-source-ui.js b/extensions/gdata/module/scripts/index/gdata-source-ui.js index 9a430877e..07bd7cabb 100644 --- a/extensions/gdata/module/scripts/index/gdata-source-ui.js +++ b/extensions/gdata/module/scripts/index/gdata-source-ui.js @@ -41,17 +41,17 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) { this._body.html(DOM.loadHTML("gdata", "scripts/index/import-from-gdata-form.html")); this._elmts = DOM.bind(this._body); - $('#gdata-title').text($.i18n._("gdata-import")["title"]); - $('#gdata-import').html($.i18n._("gdata-import")["import-by-url"]); + $('#gdata-title').text($.i18n._('gdata-import/title')); + $('#gdata-import').html($.i18n._('gdata-import/import-by-url')); $('#gdata-next').html($.i18n._("gdata-import")["next->"]); - $('#gdata-auth-doc').text($.i18n._("gdata-import")["auth-doc"]); - $('#gdata-please').text($.i18n._("gdata-import")["please"]); - $('#gdata-signin-btn').text($.i18n._("gdata-import")["sign-in"]); - $('#gdata-access-data').text($.i18n._("gdata-import")["access-data"]); - $('#gdata-retrieving').text($.i18n._("gdata-import")["retrieving"]); - $('#gdata-signout').text($.i18n._("gdata-import")["sign-out"]); - $('#gdata-resignin').text($.i18n._("gdata-import")["re-sign-in"]); - $('#gdata-another-account').text($.i18n._("gdata-import")["another-account"]); + $('#gdata-auth-doc').text($.i18n._('gdata-import/auth-doc')); + $('#gdata-please').text($.i18n._('gdata-import/please')); + $('#gdata-signin-btn').text($.i18n._('gdata-import/sign-in')); + $('#gdata-access-data').text($.i18n._('gdata-import/access-data')); + $('#gdata-retrieving').text($.i18n._('gdata-import/retrieving')); + $('#gdata-signout').text($.i18n._('gdata-import/sign-out')); + $('#gdata-resignin').text($.i18n._('gdata-import/re-sign-in')); + $('#gdata-another-account').text($.i18n._('gdata-import/another-account')); var self = this; this._body.find('.gdata-signin.button').click(function() { @@ -74,7 +74,7 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) { this._elmts.urlNextButton.click(function(evt) { var url = $.trim(self._elmts.urlInput[0].value); if (url.length === 0) { - window.alert($.i18n._('gdata-source')["alert-url"]); + window.alert($.i18n._('gdata-source/alert-url')); } else { var doc = {}; doc.docSelfLink = url; @@ -130,10 +130,10 @@ Refine.GDataSourceUI.prototype._renderDocuments = function(o) { var table = $( '' + '' + // starred - '' + - '' + - '' + - '' + + '' + + '' + + '' + + '' + '
'+$.i18n._('gdata-source')["type"]+''+$.i18n._('gdata-source')["title"]+''+$.i18n._('gdata-source')["authors"]+''+$.i18n._('gdata-source')["updated"]+''+$.i18n._('gdata-source/type')+''+$.i18n._('gdata-source/title')+''+$.i18n._('gdata-source/authors')+''+$.i18n._('gdata-source/updated')+'
' ).appendTo(this._elmts.listingContainer)[0]; diff --git a/extensions/gdata/module/scripts/index/importing-controller.js b/extensions/gdata/module/scripts/index/importing-controller.js index 886764385..e03a662f1 100644 --- a/extensions/gdata/module/scripts/index/importing-controller.js +++ b/extensions/gdata/module/scripts/index/importing-controller.js @@ -61,13 +61,13 @@ Refine.GDataImportingController = function(createProjectUI) { ui: new Refine.GDataSourceUI(this) }); - $('#gdata-authorize').text($.i18n._('gdata-auth')["authorize-label"]); - $('#gdata-authorized').text($.i18n._('gdata-auth')["authorized-label"]); + $('#gdata-authorize').text($.i18n._('gdata-auth/authorize-label')); + $('#gdata-authorized').text($.i18n._('gdata-auth/authorized-label')); }; Refine.CreateProjectUI.controllers.push(Refine.GDataImportingController); 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; $.post( @@ -166,25 +166,25 @@ Refine.GDataImportingController.prototype._showParsingPanel = function() { this._parsingPanelElmts = DOM.bind(this._parsingPanel); if(this._doc.type != 'table'){ - this._parsingPanelElmts.gdata_worksheet.html($.i18n._('gdata-parsing')["worksheet"]); - this._parsingPanelElmts.gdata_ignore_first.html($.i18n._('gdata-parsing')["ignore-first"]); - this._parsingPanelElmts.gdata_ignore.html($.i18n._('gdata-parsing')["ignore"]); - this._parsingPanelElmts.gdata_parse_next.html($.i18n._('gdata-parsing')["parse-next"]); - this._parsingPanelElmts.gdata_parse.html($.i18n._('gdata-parsing')["parse"]); + this._parsingPanelElmts.gdata_worksheet.html($.i18n._('gdata-parsing/worksheet')); + this._parsingPanelElmts.gdata_ignore_first.html($.i18n._('gdata-parsing/ignore-first')); + this._parsingPanelElmts.gdata_ignore.html($.i18n._('gdata-parsing/ignore')); + this._parsingPanelElmts.gdata_parse_next.html($.i18n._('gdata-parsing/parse-next')); + this._parsingPanelElmts.gdata_parse.html($.i18n._('gdata-parsing/parse')); } - this._parsingPanelElmts.startOverButton.html($.i18n._('gdata-parsing')["start-over"]); - this._parsingPanelElmts.gdata_conf_pars.html($.i18n._('gdata-parsing')["conf-pars"]); - this._parsingPanelElmts.gdata_proj_name.html($.i18n._('gdata-parsing')["proj-name"]); - this._parsingPanelElmts.createProjectButton.html($.i18n._('gdata-parsing')["create-proj"]); - this._parsingPanelElmts.gdata_options.html($.i18n._('gdata-parsing')["option"]); - this._parsingPanelElmts.previewButton.html($.i18n._('gdata-parsing')["preview-button"]); - 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.html($.i18n._('gdata-parsing')["discard"]); - this._parsingPanelElmts.gdata_limit_next.html($.i18n._('gdata-parsing')["limit-next"]); - this._parsingPanelElmts.gdata_limit.html($.i18n._('gdata-parsing')["limit"]); - this._parsingPanelElmts.gdata_store_row.html($.i18n._('gdata-parsing')["store-row"]); - this._parsingPanelElmts.gdata_store_cell.html($.i18n._('gdata-parsing')["store-cell"]); + this._parsingPanelElmts.startOverButton.html($.i18n._('gdata-parsing/start-over')); + this._parsingPanelElmts.gdata_conf_pars.html($.i18n._('gdata-parsing/conf-pars')); + this._parsingPanelElmts.gdata_proj_name.html($.i18n._('gdata-parsing/proj-name')); + this._parsingPanelElmts.createProjectButton.html($.i18n._('gdata-parsing/create-proj')); + this._parsingPanelElmts.gdata_options.html($.i18n._('gdata-parsing/option')); + this._parsingPanelElmts.previewButton.html($.i18n._('gdata-parsing/preview-button')); + 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.html($.i18n._('gdata-parsing/discard')); + this._parsingPanelElmts.gdata_limit_next.html($.i18n._('gdata-parsing/limit-next')); + this._parsingPanelElmts.gdata_limit.html($.i18n._('gdata-parsing/limit')); + this._parsingPanelElmts.gdata_store_row.html($.i18n._('gdata-parsing/store-row')); + this._parsingPanelElmts.gdata_store_cell.html($.i18n._('gdata-parsing/store-cell')); if (this._parsingPanelResizer) { $(window).unbind('resize', this._parsingPanelResizer); @@ -419,7 +419,7 @@ Refine.GDataImportingController.prototype._createProject = function() { }, 1000 ); - self._createProjectUI.showImportProgressPanel($.i18n._('gdata-import')["creating"], function() { + self._createProjectUI.showImportProgressPanel($.i18n._('gdata-import/creating'), function() { // stop the timed polling window.clearInterval(timerID); diff --git a/extensions/gdata/module/scripts/project/exporters.js b/extensions/gdata/module/scripts/project/exporters.js index b4368e9b6..cf8774ad7 100644 --- a/extensions/gdata/module/scripts/project/exporters.js +++ b/extensions/gdata/module/scripts/project/exporters.js @@ -52,7 +52,7 @@ $.i18n.setDictionary(dictionary); var doUpload = function() { var name = window.prompt(prompt, theProject.metadata.name); if (name) { - var dismiss = DialogSystem.showBusy($.i18n._('gdata-exporter')["uploading"]); + var dismiss = DialogSystem.showBusy($.i18n._('gdata-exporter/uploading')); $.post( "command/gdata/upload", { @@ -68,7 +68,7 @@ $.i18n.setDictionary(dictionary); if (o.url) { window.open(o.url, '_blank'); } else { - alert($.i18n._('gdata-exporter')["upload-error"] + o.message) + alert($.i18n._('gdata-exporter/upload-error') + o.message) } onDone(); }, @@ -86,16 +86,16 @@ $.i18n.setDictionary(dictionary); CustomTabularExporterDialog.uploadTargets.push({ id: 'gdata/google-spreadsheet', - label: $.i18n._('gdata-exporter')["new-spreadsheet"], + label: $.i18n._('gdata-exporter/new-spreadsheet'), 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({ id: 'gdata/fusion-table', - label: $.i18n._('gdata-exporter')["new-fusion"], + label: $.i18n._('gdata-exporter/new-fusion'), handler: function(options, exportAllRows, onDone) { - handleUpload(options, exportAllRows, onDone, $.i18n._('gdata-exporter')["enter-fusion"]); + handleUpload(options, exportAllRows, onDone, $.i18n._('gdata-exporter/enter-fusion')); } }); })(); diff --git a/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js b/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js index 5cb0572f7..dca9315a5 100644 --- a/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js +++ b/extensions/wikidata/module/scripts/dialogs/import-schema-dialog.js @@ -5,11 +5,11 @@ ImportSchemaDialog.launch = function() { var frame = $(DOM.loadHTML("wikidata", "scripts/dialogs/import-schema-dialog.html")); var elmts = this._elmts = DOM.bind(frame); - this._elmts.dialogHeader.text($.i18n._('import-wikibase-schema')["dialog-header"]); - this._elmts.fileLabel.html($.i18n._('import-wikibase-schema')["file-label"]); - this._elmts.schemaLabel.text($.i18n._('import-wikibase-schema')["schema-label"]); - this._elmts.cancelButton.text($.i18n._('core-project')["cancel"]); - this._elmts.importButton.text($.i18n._('import-wikibase-schema')["import"]); + this._elmts.dialogHeader.text($.i18n._('import-wikibase-schema/dialog-header')); + this._elmts.fileLabel.html($.i18n._('import-wikibase-schema/file-label')); + this._elmts.schemaLabel.text($.i18n._('import-wikibase-schema/schema-label')); + this._elmts.cancelButton.text($.i18n._('core-project/cancel')); + this._elmts.importButton.text($.i18n._('import-wikibase-schema/import')); this._level = DialogSystem.showDialog(frame); @@ -38,7 +38,7 @@ ImportSchemaDialog.launch = function() { try { schema = JSON.parse(elmts.schemaTextarea.val()); } catch(e) { - elmts.invalidSchema.text($.i18n._('import-wikibase-schema')["invalid-schema"]); + elmts.invalidSchema.text($.i18n._('import-wikibase-schema/invalid-schema')); return; } @@ -55,7 +55,7 @@ ImportSchemaDialog.launch = function() { dismiss(); }, onError: function(e) { - elmts.invalidSchema.text($.i18n._('import-wikibase-schema')["invalid-schema"]); + elmts.invalidSchema.text($.i18n._('import-wikibase-schema/invalid-schema')); }, } ); diff --git a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js index f319f1158..1d50bb647 100644 --- a/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js +++ b/extensions/wikidata/module/scripts/dialogs/manage-account-dialog.js @@ -19,19 +19,19 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca var elmts = this._elmts = DOM.bind(frame); ManageAccountDialog.firstLaunch = false; - this._elmts.dialogHeader.text($.i18n._('wikidata-account')["dialog-header"]); - this._elmts.explainLogIn.html($.i18n._('wikidata-account')["explain-log-in"]); - this._elmts.usernameLabel.text($.i18n._('wikidata-account')["username-label"]); - this._elmts.usernameInput.attr("placeholder", $.i18n._('wikidata-account')["username-placeholder"]); - this._elmts.passwordLabel.text($.i18n._('wikidata-account')["password-label"]); - this._elmts.passwordInput.attr("placeholder", $.i18n._('wikidata-account')["password-placeholder"]); - this._elmts.rememberCredentialsLabel.text($.i18n._('wikidata-account')["remember-credentials-label"]); - this._elmts.dialogHeader.text($.i18n._('wikidata-account')["dialog-header"]); - this._elmts.cancelButton1.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.logoutButton.text($.i18n._('wikidata-account')["log-out"]); - this._elmts.loginButton.text($.i18n._('wikidata-account')["log-in"]); + this._elmts.dialogHeader.text($.i18n._('wikidata-account/dialog-header')); + this._elmts.explainLogIn.html($.i18n._('wikidata-account/explain-log-in')); + this._elmts.usernameLabel.text($.i18n._('wikidata-account/username-label')); + this._elmts.usernameInput.attr("placeholder", $.i18n._('wikidata-account/username-placeholder')); + this._elmts.passwordLabel.text($.i18n._('wikidata-account/password-label')); + this._elmts.passwordInput.attr("placeholder", $.i18n._('wikidata-account/password-placeholder')); + this._elmts.rememberCredentialsLabel.text($.i18n._('wikidata-account/remember-credentials-label')); + this._elmts.dialogHeader.text($.i18n._('wikidata-account/dialog-header')); + this._elmts.cancelButton1.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.logoutButton.text($.i18n._('wikidata-account/log-out')); + this._elmts.loginButton.text($.i18n._('wikidata-account/log-in')); this._level = DialogSystem.showDialog(frame); @@ -86,7 +86,7 @@ ManageAccountDialog.display = function(logged_in_username, saved_credentials, ca ManageAccountDialog.isLoggedIn = function(callback) { var discardWaiter = function() { }; if(ManageAccountDialog.firstLogin) { - discardWaiter = DialogSystem.showBusy($.i18n._('wikidata-account')["connecting-to-wikidata"]); + discardWaiter = DialogSystem.showBusy($.i18n._('wikidata-account/connecting-to-wikidata')); } $.get( "command/wikidata/login", diff --git a/extensions/wikidata/module/scripts/dialogs/perform-edits-dialog.js b/extensions/wikidata/module/scripts/dialogs/perform-edits-dialog.js index 15569aded..9134845c6 100644 --- a/extensions/wikidata/module/scripts/dialogs/perform-edits-dialog.js +++ b/extensions/wikidata/module/scripts/dialogs/perform-edits-dialog.js @@ -11,12 +11,12 @@ PerformEditsDialog.launch = function(logged_in_username, max_severity) { this._level = DialogSystem.showDialog(frame); - this._elmts.dialogHeader.text($.i18n._('perform-wikidata-edits')["dialog-header"]); - this._elmts.loggedInAs.text($.i18n._('perform-wikidata-edits')["logged-in-as"]); - 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.performEditsButton.text($.i18n._('perform-wikidata-edits')["perform-edits"]); - this._elmts.cancelButton.text($.i18n._('perform-wikidata-edits')["cancel"]); + this._elmts.dialogHeader.text($.i18n._('perform-wikidata-edits/dialog-header')); + this._elmts.loggedInAs.text($.i18n._('perform-wikidata-edits/logged-in-as')); + 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.performEditsButton.text($.i18n._('perform-wikidata-edits/perform-edits')); + this._elmts.cancelButton.text($.i18n._('perform-wikidata-edits/cancel')); var dismiss = function() { DialogSystem.dismissUntil(self._level - 1); @@ -65,7 +65,7 @@ PerformEditsDialog.launch = function(logged_in_username, max_severity) { PerformEditsDialog.updateEditCount = function(edit_count) { this._elmts.reviewYourEdits.html( - $.i18n._('perform-wikidata-edits')["review-your-edits"] + $.i18n._('perform-wikidata-edits/review-your-edits') .replace('{nb_edits}', edit_count)); } @@ -93,7 +93,7 @@ PerformEditsDialog.checkAndLaunch = function () { var onSaved = function() { ManageAccountDialog.ensureLoggedIn(function(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( "command/wikidata/preview-wikibase-schema?" + $.param({ project: theProject.id }), { engine: JSON.stringify(ui.browsingEngine.getJSON()) }, diff --git a/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js b/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js index bb5a72989..f9776b432 100644 --- a/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js +++ b/extensions/wikidata/module/scripts/dialogs/schema-alignment-dialog.js @@ -66,12 +66,12 @@ SchemaAlignmentDialog.setUpTabs = function() { var schemaButton = $('
') .addClass('main-view-panel-tab-header') .attr('href', '#wikidata-schema-panel') - .text($.i18n._('wikidata-schema')["schema-tab-header"]) + .text($.i18n._('wikidata-schema/schema-tab-header')) .appendTo(this._toolPanel); var issuesButton = $('
') .addClass('main-view-panel-tab-header') .attr('href', '#wikidata-issues-panel') - .text($.i18n._('wikidata-schema')["warnings-tab-header"]+' ') + .text($.i18n._('wikidata-schema/warnings-tab-header')+' ') .appendTo(this._toolPanel); this.issuesTabCount = $('') .addClass('schema-alignment-total-warning-count') @@ -84,7 +84,7 @@ SchemaAlignmentDialog.setUpTabs = function() { var previewButton = $('
') .addClass('main-view-panel-tab-header') .attr('href', '#wikidata-preview-panel') - .text($.i18n._('wikidata-schema')["edits-preview-tab-header"]) + .text($.i18n._('wikidata-schema/edits-preview-tab-header')) .appendTo(this._toolPanel); this.previewSpinner = $('') .attr('src', 'images/large-spinner.gif') @@ -93,7 +93,7 @@ SchemaAlignmentDialog.setUpTabs = function() { this._unsavedIndicator = $('') .html(' *') - .attr('title', $.i18n._('wikidata-schema')["unsaved-changes-alt"]) + .attr('title', $.i18n._('wikidata-schema/unsaved-changes-alt')) .hide() .appendTo(schemaButton); @@ -108,22 +108,22 @@ SchemaAlignmentDialog.setUpTabs = function() { */ var schemaTab = $(DOM.loadHTML("wikidata", "scripts/schema-alignment-tab.html")).appendTo(this._schemaPanel); var schemaElmts = this._schemaElmts = DOM.bind(schemaTab); - schemaElmts.dialogExplanation.text($.i18n._('wikidata-schema')["dialog-explanation"]); - this._plusButton($.i18n._('wikidata-schema')["add-item-button"], schemaElmts.addItemButton); + schemaElmts.dialogExplanation.text($.i18n._('wikidata-schema/dialog-explanation')); + this._plusButton($.i18n._('wikidata-schema/add-item-button'), schemaElmts.addItemButton); schemaElmts.addItemButton.click(function(e) { self._addItem(); SchemaAlignmentDialog._hasChanged(); e.preventDefault(); }); schemaElmts.saveButton - .text($.i18n._('wikidata-schema')["save-button"]) - .attr('title', $.i18n._('wikidata-schema')["save-schema-alt"]) + .text($.i18n._('wikidata-schema/save-button')) + .attr('title', $.i18n._('wikidata-schema/save-schema-alt')) .prop('disabled', true) .addClass('disabled') .click(function() { SchemaAlignmentDialog._save(); }); schemaElmts.discardButton - .text($.i18n._('wikidata-schema')["discard-button"]) - .attr('title', $.i18n._('wikidata-schema')["discard-schema-changes-alt"]) + .text($.i18n._('wikidata-schema/discard-button')) + .attr('title', $.i18n._('wikidata-schema/discard-schema-changes-alt')) .prop('disabled', true) .addClass('disabled') .click(function() { SchemaAlignmentDialog._discardChanges(); }); @@ -141,7 +141,7 @@ SchemaAlignmentDialog.setUpTabs = function() { */ var issuesTab = $(DOM.loadHTML("wikidata", "scripts/issues-tab.html")).appendTo(this._issuesPanel); 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 @@ -149,7 +149,7 @@ SchemaAlignmentDialog.setUpTabs = function() { var previewTab = $(DOM.loadHTML("wikidata", "scripts/preview-tab.html")).appendTo(this._previewPanel); var previewElmts = this._previewElmts = DOM.bind(previewTab); 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"); @@ -223,7 +223,7 @@ SchemaAlignmentDialog.launch = function(onDone) { var beforeUnload = function(e) { 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(); }, 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) { button.append( - $('').text($.i18n._('wikidata-schema')["remove"])); + $('').text($.i18n._('wikidata-schema/remove'))); } return button; } @@ -347,9 +347,9 @@ SchemaAlignmentDialog._addItem = function(json) { // Terms $('').addClass('wbs-namedesc-header') - .text($.i18n._('wikidata-schema')["terms-header"]).appendTo(right); + .text($.i18n._('wikidata-schema/terms-header')).appendTo(right); $('
').addClass('wbs-namedesc-container') - .attr('data-emptyplaceholder', $.i18n._('wikidata-schema')['empty-terms']) + .attr('data-emptyplaceholder', $.i18n._('wikidata-schema/empty-terms')) .appendTo(right); var termToolbar = $('
').addClass('wbs-toolbar').appendTo(right); var addNamedescButton = $('').addClass('wbs-add-namedesc') @@ -358,16 +358,16 @@ SchemaAlignmentDialog._addItem = function(json) { e.preventDefault(); }).appendTo(termToolbar); SchemaAlignmentDialog._plusButton( - $.i18n._('wikidata-schema')["add-term"], addNamedescButton); + $.i18n._('wikidata-schema/add-term'), addNamedescButton); // Clear the float $('
').attr('style', 'clear: right').appendTo(right); // Statements $('
').addClass('wbs-statements-header') - .text($.i18n._('wikidata-schema')['statements-header']).appendTo(right); + .text($.i18n._('wikidata-schema/statements-header')).appendTo(right); $('
').addClass('wbs-statement-group-container') - .attr('data-emptyplaceholder', $.i18n._('wikidata-schema')['empty-statements']) + .attr('data-emptyplaceholder', $.i18n._('wikidata-schema/empty-statements')) .appendTo(right); var statementToolbar = $('
').addClass('wbs-toolbar').appendTo(right); var addStatementButton = $('').addClass('wbs-add-statement-group') @@ -377,7 +377,7 @@ SchemaAlignmentDialog._addItem = function(json) { }).appendTo(statementToolbar); SchemaAlignmentDialog._plusButton( - $.i18n._('wikidata-schema')["add-statement"], addStatementButton); + $.i18n._('wikidata-schema/add-statement'), addStatementButton); if (statementGroups) { for(var i = 0; i != statementGroups.length; i++) { @@ -425,15 +425,15 @@ SchemaAlignmentDialog._addNameDesc = function(item, json) { var type_input = $('').appendTo(type_container); $('') .attr('value', 'LABEL') - .text($.i18n._('wikidata-schema')["label"]) + .text($.i18n._('wikidata-schema/label')) .appendTo(type_input); $('') .attr('value', 'DESCRIPTION') - .text($.i18n._('wikidata-schema')["description"]) + .text($.i18n._('wikidata-schema/description')) .appendTo(type_input); $('') .attr('value', 'ALIAS') - .text($.i18n._('wikidata-schema')["alias"]) + .text($.i18n._('wikidata-schema/alias')) .appendTo(type_input); type_input.val(type); type_input.on('change', function(e) { @@ -488,7 +488,7 @@ SchemaAlignmentDialog._addStatementGroup = function(item, json) { SchemaAlignmentDialog._addStatement(statementContainer, datatype, null); e.preventDefault(); }).appendTo(toolbar).hide(); - SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema')["add-value"], addValueButton); + SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-value'), addValueButton); var removeButton = SchemaAlignmentDialog._makeDeleteButton() .addClass('wbs-remove-statement-group') .appendTo(toolbar) @@ -561,7 +561,7 @@ SchemaAlignmentDialog._addStatement = function(container, datatype, json) { SchemaAlignmentDialog._addQualifier(qualifierContainer, null); e.preventDefault(); }).appendTo(toolbar2); - SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema')["add-qualifier"], addQualifierButton); + SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-qualifier'), addQualifierButton); if (qualifiers) { for (var i = 0; i != qualifiers.length; i++) { @@ -592,7 +592,7 @@ SchemaAlignmentDialog._addStatement = function(container, datatype, json) { SchemaAlignmentDialog._updateReferencesNumber(referenceContainer); e.preventDefault(); }).appendTo(toolbar3); - SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema')["add-reference"], addReferenceButton); + SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-reference'), addReferenceButton); if (references) { for (var i = 0; i != references.length; i++) { SchemaAlignmentDialog._addReference(referenceContainer, references[i]); @@ -688,7 +688,7 @@ SchemaAlignmentDialog._addReference = function(container, json) { SchemaAlignmentDialog._addQualifier(qualifierContainer, null); e.preventDefault(); }).appendTo(toolbar2); - SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema')['add-reference-snak'], addSnakButton); + SchemaAlignmentDialog._plusButton($.i18n._('wikidata-schema/add-reference-snak'), addSnakButton); if (snaks) { for (var i = 0; i != snaks.length; i++) { @@ -712,7 +712,7 @@ SchemaAlignmentDialog._updateReferencesNumber = function(container) { var childrenCount = container.children().length; var statement = container.parents('.wbs-statement'); 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) { var input = $('').appendTo(inputContainer); - input.attr("placeholder", $.i18n._('wikidata-schema')["property-placeholder"]); + input.attr("placeholder", $.i18n._('wikidata-schema/property-placeholder')); if (this._reconService !== null) { 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 (mode === "wikibase-item") { - input.attr("placeholder", $.i18n._('wikidata-schema')["item-or-reconciled-column"]); + input.attr("placeholder", $.i18n._('wikidata-schema/item-or-reconciled-column')); } else { - input.attr("placeholder", $.i18n._('wikidata-schema')["unit"]); + input.attr("placeholder", $.i18n._('wikidata-schema/unit')); } var endpoint = null; endpoint = this._reconService.suggest.entity; @@ -951,20 +951,20 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue, changedCallback(); }); if (mode === "amount") { - input.attr("placeholder", $.i18n._('wikidata-schema')["amount"]); + input.attr("placeholder", $.i18n._('wikidata-schema/amount')); SchemaAlignmentDialog.setupStringInputValidation(input, /^[\-+]?\d+(\.\d*)?(E[\-+]\d+)?$/); } else if (mode === "url") { - input.attr("placeholder", $.i18n._('wikidata-schema')["full-url"]); + input.attr("placeholder", $.i18n._('wikidata-schema/full-url')); SchemaAlignmentDialog.setupStringInputValidation(input, /^https?:\/\/.+$/); } 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:.+$/); } else if (mode === "commonsMedia") { - input.attr("placeholder", $.i18n._('wikidata-schema')["commons-media"]); + input.attr("placeholder", $.i18n._('wikidata-schema/commons-media')); } 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") { - input.attr("placeholder", $.i18n._('wikidata-schema')["geoshape-with-prefix"]); + input.attr("placeholder", $.i18n._('wikidata-schema/geoshape-with-prefix')); SchemaAlignmentDialog.setupStringInputValidation(input, /^Data:.+$/); } else { SchemaAlignmentDialog.setupStringInputValidation(input, /^.+$/); @@ -977,7 +977,7 @@ SchemaAlignmentDialog._initField = function(inputContainer, mode, initialValue, mode !== "commonsMedia" && mode !== "geo-shape" && 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.append($('
').addClass('wbs-restricted-column-name').text(origText)); 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) { columnDiv.remove(); input.show(); @@ -1118,7 +1118,7 @@ SchemaAlignmentDialog._hasChanged = function() { SchemaAlignmentDialog.updateNbEdits = function(nb_edits) { 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() { diff --git a/extensions/wikidata/module/scripts/menu-bar-extension.js b/extensions/wikidata/module/scripts/menu-bar-extension.js index 3ed14fb63..04f457fc6 100644 --- a/extensions/wikidata/module/scripts/menu-bar-extension.js +++ b/extensions/wikidata/module/scripts/menu-bar-extension.js @@ -20,19 +20,19 @@ ExporterManager.MenuItems.push({}); ExporterManager.MenuItems.push( { id:"performWikibaseEdits", - label: $.i18n._('wikidata-extension')["perform-edits-on-wikidata"], + label: $.i18n._('wikidata-extension/perform-edits-on-wikidata'), click: function() { PerformEditsDialog.checkAndLaunch(); } }); ExporterManager.MenuItems.push( { id:"exportQuickStatements", - label: $.i18n._('wikidata-extension')["export-to-qs"], + label: $.i18n._('wikidata-extension/export-to-qs'), click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("quickstatements"); } }); ExporterManager.MenuItems.push( { id:"exportWikibaseSchema", - label: $.i18n._('wikidata-extension')["export-schema"], + label: $.i18n._('wikidata-extension/export-schema'), click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("wikibase-schema"); } } ); @@ -91,38 +91,38 @@ $(function(){ ExtensionBar.MenuItems.push( { "id":"reconcile", - "label": $.i18n._('wikidata-extension')["menu-label"], + "label": $.i18n._('wikidata-extension/menu-label'), "submenu" : [ { id: "wikidata/edit-schema", - label: $.i18n._('wikidata-extension')["edit-wikidata-schema"], + label: $.i18n._('wikidata-extension/edit-wikidata-schema'), click: function() { SchemaAlignmentDialog.launch(false); } }, { id:"wikidata/manage-account", - label: $.i18n._('wikidata-extension')["manage-wikidata-account"], + label: $.i18n._('wikidata-extension/manage-wikidata-account'), click: function() { ManageAccountDialog.checkAndLaunch(); } }, {}, { id: "wikidata/import-schema", - label: $.i18n._('wikidata-extension')["import-wikidata-schema"], + label: $.i18n._('wikidata-extension/import-wikidata-schema'), click: function() { ImportSchemaDialog.launch(); } }, { id:"wikidata/export-schema", - label: $.i18n._('wikidata-extension')["export-schema"], + label: $.i18n._('wikidata-extension/export-schema'), click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("wikibase-schema"); } }, {}, { id:"wikidata/perform-edits", - label: $.i18n._('wikidata-extension')["perform-edits-on-wikidata"], + label: $.i18n._('wikidata-extension/perform-edits-on-wikidata'), click: function() { PerformEditsDialog.checkAndLaunch(); } }, { id:"wikidata/export-qs", - label: $.i18n._('wikidata-extension')["export-to-qs"], + label: $.i18n._('wikidata-extension/export-to-qs'), click: function() { WikibaseExporterMenuBar.checkSchemaAndExport("quickstatements"); } }, diff --git a/extensions/wikidata/module/scripts/previewrenderer.js b/extensions/wikidata/module/scripts/previewrenderer.js index 70c502b77..474611b7f 100644 --- a/extensions/wikidata/module/scripts/previewrenderer.js +++ b/extensions/wikidata/module/scripts/previewrenderer.js @@ -53,7 +53,7 @@ EditRenderer._renderItem = function(json, container) { // Statements if (json.addedStatementGroups && json.addedStatementGroups.length) { // $('
').addClass('wbs-statements-header') - // .text($.i18n._('wikidata-schema')['statements-header']).appendTo(right); + // .text($.i18n._('wikidata-schema/statements-header')).appendTo(right); var statementsGroupContainer = $('
').addClass('wbs-statement-group-container') .appendTo(right); for(var i = 0; i != json.addedStatementGroups.length; i++) { @@ -202,7 +202,7 @@ EditRenderer._updateReferencesNumber = function(container) { var childrenCount = container.children().length; var statement = container.parents('.wbs-statement'); 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', generate: 'text/html', datavalue: jsonValue, - options: '{"lang":"'+$.i18n._('core-recon')["wd-recon-lang"]+'"}', + options: '{"lang":"'+$.i18n._('core-recon/wd-recon-lang')+'"}', format: 'json' }; if ('property' in json) { diff --git a/extensions/wikidata/module/scripts/warningsrenderer.js b/extensions/wikidata/module/scripts/warningsrenderer.js index bab750a76..7629a4a85 100644 --- a/extensions/wikidata/module/scripts/warningsrenderer.js +++ b/extensions/wikidata/module/scripts/warningsrenderer.js @@ -8,7 +8,7 @@ WarningsRenderer._renderEntity = function(entity) { var id = entity.id; var is_new = entity.siteIri == "http://localhost/entity/"; if (is_new) { - id = $.i18n._('wikidata-preview')['new-id']; + id = $.i18n._('wikidata-preview/new-id'); } var fullLabel = id; if (entity.label) { diff --git a/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js b/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js index 2376f0751..31fc8183a 100644 --- a/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/clustering-dialog.js @@ -49,39 +49,39 @@ ClusteringDialog.prototype._createDialog = function() { var dialog = $(DOM.loadHTML("core", "scripts/dialogs/clustering-dialog.html")); 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_findMore.html($.i18n._('core-dialogs')["find-more"]); - 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_neighbor.html($.i18n._('core-dialogs')["nearest-neighbor"]); - 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_ngram.html($.i18n._('core-dialogs')["ngram"]); - this._elmts.or_dialog_metaphone.html($.i18n._('core-dialogs')["metaphone"]); - 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_leven.html($.i18n._('core-dialogs')["leven"]); - 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_radius.html($.i18n._('core-dialogs')["ngram-radius"]); - this._elmts.or_dialog_blockChars.html($.i18n._('core-dialogs')["block-chars"]); - this._elmts.selectAllButton.html($.i18n._('core-buttons')["select-all"]); - this._elmts.deselectAllButton.html($.i18n._('core-buttons')["unselect-all"]); - this._elmts.exportClusterButton.html($.i18n._('core-buttons')["export-cluster"]); - this._elmts.applyReClusterButton.html($.i18n._('core-buttons')["merge-cluster"]); - this._elmts.applyCloseButton.html($.i18n._('core-buttons')["merge-close"]); - this._elmts.closeButton.html($.i18n._('core-buttons')["close"]); + 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_method.html($.i18n._('core-dialogs/method')); + 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_keying.html($.i18n._('core-dialogs/keying-function')); + this._elmts.or_dialog_fingerprint.html($.i18n._('core-dialogs/fingerprint')); + this._elmts.or_dialog_ngram.html($.i18n._('core-dialogs/ngram')); + this._elmts.or_dialog_metaphone.html($.i18n._('core-dialogs/metaphone')); + 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_leven.html($.i18n._('core-dialogs/leven')); + 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_radius.html($.i18n._('core-dialogs/ngram-radius')); + this._elmts.or_dialog_blockChars.html($.i18n._('core-dialogs/block-chars')); + this._elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); + this._elmts.deselectAllButton.html($.i18n._('core-buttons/unselect-all')); + this._elmts.exportClusterButton.html($.i18n._('core-buttons/export-cluster')); + this._elmts.applyReClusterButton.html($.i18n._('core-buttons/merge-cluster')); + this._elmts.applyCloseButton.html($.i18n._('core-buttons/merge-close')); + this._elmts.closeButton.html($.i18n._('core-buttons/close')); this._elmts.methodSelector.change(function() { 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(".knn-controls").hide(); self._method = "binning"; 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(".knn-controls").show(); self._method = "knn"; @@ -140,11 +140,11 @@ ClusteringDialog.prototype._renderTable = function(clusters) { var trHead = table.insertRow(table.rows.length); trHead.className = "header"; - $(trHead.insertCell(0)).text($.i18n._('core-dialogs')["cluster-size"]); - $(trHead.insertCell(1)).text($.i18n._('core-dialogs')["row-count"]); - $(trHead.insertCell(2)).text($.i18n._('core-dialogs')["cluster-values"]); - $(trHead.insertCell(3)).text($.i18n._('core-dialogs')["merge"]); - $(trHead.insertCell(4)).text($.i18n._('core-dialogs')["new-cell-val"]); + $(trHead.insertCell(0)).text($.i18n._('core-dialogs/cluster-size')); + $(trHead.insertCell(1)).text($.i18n._('core-dialogs/row-count')); + $(trHead.insertCell(2)).text($.i18n._('core-dialogs/cluster-values')); + $(trHead.insertCell(3)).text($.i18n._('core-dialogs/merge')); + $(trHead.insertCell(4)).text($.i18n._('core-dialogs/new-cell-val')); var renderCluster = function(cluster) { var tr = table.insertRow(table.rows.length); @@ -184,7 +184,7 @@ ClusteringDialog.prototype._renderTable = function(clusters) { for (var c = 0; c < choices.length; c++) { var choice = choices[c]; var li = $('
  • '); - $('').text(choice.v).click(onClick).appendTo(li); + $('').text(choice.v).click(onClick).appendTo(li); $('').text("(" + choice.c + " rows)").addClass("clustering-dialog-entry-count").appendTo(li); rowCount += choice.c; facet.s[c] = { @@ -206,7 +206,7 @@ ClusteringDialog.prototype._renderTable = function(clusters) { var div = $('
    ').addClass("clustering-dialog-value-focus"); - var browseLink = $(''+$.i18n._('core-dialogs')["browse-this-cluster"]+'') + var browseLink = $(''+$.i18n._('core-dialogs/browse-this-cluster')+'') .addClass("clustering-dialog-browse-focus") .attr("href",url) .css("visibility","hidden") @@ -242,13 +242,13 @@ ClusteringDialog.prototype._renderTable = function(clusters) { this._elmts.resultSummary.html( (clusters.length === this._clusters.length) ? - ("" + this._clusters.length + " cluster" + ((this._clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs')["found"]) : - ("" + clusters.length + " cluster" + ((clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs')["filtered-from"]+ this._clusters.length +$.i18n._('core-dialogs')["from-total"] ) + ("" + this._clusters.length + " cluster" + ((this._clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs/found')) : + ("" + clusters.length + " cluster" + ((clusters.length != 1) ? "s" : "") + " "+$.i18n._('core-dialogs/filtered-from')+ this._clusters.length +$.i18n._('core-dialogs/from-total') ) ); } else { container.html( - '
    '+$.i18n._('core-dialogs')["no-cluster-found"]+'
    '+$.i18n._('core-dialogs')["try-another-method"]+'
    ' + '
    '+$.i18n._('core-dialogs/no-cluster-found')+'
    '+$.i18n._('core-dialogs/try-another-method')+'
    ' ); } }; @@ -257,7 +257,7 @@ ClusteringDialog.prototype._cluster = function() { var self = this; var container = this._elmts.tableContainer.html( - '
    '+$.i18n._('core-dialogs')["clustering"]+'
    ' + '
    '+$.i18n._('core-dialogs/clustering')+'
    ' ); this._elmts.resultSummary.empty(); @@ -376,7 +376,7 @@ ClusteringDialog.prototype._apply = function(onDone) { } ); } 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._createFacet($.i18n._('core-dialogs')["choices-in-cluster"], "size"); - this._createFacet($.i18n._('core-dialogs')["rows-in-cluster"], "rowCount"); - this._createFacet($.i18n._('core-dialogs')["choice-avg-length"], "avg"); - this._createFacet($.i18n._('core-dialogs')["choice-var-length"], "variance"); + this._createFacet($.i18n._('core-dialogs/choices-in-cluster'), "size"); + this._createFacet($.i18n._('core-dialogs/rows-in-cluster'), "rowCount"); + this._createFacet($.i18n._('core-dialogs/choice-avg-length'), "avg"); + this._createFacet($.i18n._('core-dialogs/choice-var-length'), "variance"); }; ClusteringDialog.prototype._createFacet = function(title, property) { diff --git a/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js b/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js index 58f29ca3c..1e23b5251 100644 --- a/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js @@ -43,11 +43,11 @@ ColumnReorderingDialog.prototype._createDialog = function() { this._elmts.cancelButton.click(function() { self._dismiss(); }); this._elmts.okButton.click(function() { self._commit(); }); - this._elmts.dialogHeader.html($.i18n._('core-dialogs')["reorder-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.okButton.html($.i18n._('core-buttons')["ok"]); - this._elmts.cancelButton.html($.i18n._('core-buttons')["cancel"]); + this._elmts.dialogHeader.html($.i18n._('core-dialogs/reorder-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.okButton.html($.i18n._('core-buttons/ok')); + this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._level = DialogSystem.showDialog(dialog); diff --git a/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js b/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js index 8bef753dc..f17296329 100644 --- a/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/custom-tabular-exporter-dialog.js @@ -82,50 +82,50 @@ CustomTabularExporterDialog.prototype._createDialog = function(options) { this._elmts.uploadTabBody.remove(); } - this._elmts.dialogHeader.html($.i18n._('core-dialogs')["custom-tab-exp"]); - this._elmts.or_dialog_content.html($.i18n._('core-dialogs')["content"]); - this._elmts.or_dialog_download.html($.i18n._('core-dialogs')["download"]); - 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_selAndOrd.html($.i18n._('core-dialogs')["sel-and-ord"]); - 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_matchedName.html($.i18n._('core-dialogs')["match-ent-name"]); - 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_linkMatch.html($.i18n._('core-dialogs')["link-match"]); - 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_shortFormat.html($.i18n._('core-dialogs')["short-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_fullFormat.html($.i18n._('core-dialogs')["full-format"]); - this._elmts.or_dialog_custom.html($.i18n._('core-dialogs')["custom"]); - 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_omitTime.html($.i18n._('core-dialogs')["omit-time"]); - this._elmts.selectAllButton.html($.i18n._('core-buttons')["select-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_outEmptyRow.html($.i18n._('core-dialogs')["out-empty-row"]); - 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_otherFormat.html($.i18n._('core-dialogs')["other-format"]); - this._elmts.or_dialog_tsv.html($.i18n._('core-dialogs')["tsv"]); - 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_excel.html($.i18n._('core-dialogs')["excel"]); - 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_lineSep.html($.i18n._('core-dialogs')["line-sep"]); - this._elmts.or_dialog_charEnc.html($.i18n._('core-dialogs')["char-enc"]); - this._elmts.downloadPreviewButton.html($.i18n._('core-buttons')["preview"]); - this._elmts.downloadButton.html($.i18n._('core-buttons')["download"]); - this._elmts.or_dialog_uploadTo.html($.i18n._('core-dialogs')["upload-to"]); - this._elmts.uploadButton.html($.i18n._('core-buttons')["upload"]); - this._elmts.or_dialog_jsonText.html($.i18n._('core-dialogs')["json-text"]); - this._elmts.applyOptionCodeButton.html($.i18n._('core-buttons')["apply"]); - this._elmts.cancelButton.html($.i18n._('core-buttons')["cancel"]); + this._elmts.dialogHeader.html($.i18n._('core-dialogs/custom-tab-exp')); + this._elmts.or_dialog_content.html($.i18n._('core-dialogs/content')); + this._elmts.or_dialog_download.html($.i18n._('core-dialogs/download')); + 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_selAndOrd.html($.i18n._('core-dialogs/sel-and-ord')); + 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_matchedName.html($.i18n._('core-dialogs/match-ent-name')); + 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_linkMatch.html($.i18n._('core-dialogs/link-match')); + 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_shortFormat.html($.i18n._('core-dialogs/short-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_fullFormat.html($.i18n._('core-dialogs/full-format')); + this._elmts.or_dialog_custom.html($.i18n._('core-dialogs/custom')); + 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_omitTime.html($.i18n._('core-dialogs/omit-time')); + this._elmts.selectAllButton.html($.i18n._('core-buttons/select-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_outEmptyRow.html($.i18n._('core-dialogs/out-empty-row')); + 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_otherFormat.html($.i18n._('core-dialogs/other-format')); + this._elmts.or_dialog_tsv.html($.i18n._('core-dialogs/tsv')); + 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_excel.html($.i18n._('core-dialogs/excel')); + 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_lineSep.html($.i18n._('core-dialogs/line-sep')); + this._elmts.or_dialog_charEnc.html($.i18n._('core-dialogs/char-enc')); + this._elmts.downloadPreviewButton.html($.i18n._('core-buttons/preview')); + this._elmts.downloadButton.html($.i18n._('core-buttons/download')); + this._elmts.or_dialog_uploadTo.html($.i18n._('core-dialogs/upload-to')); + this._elmts.uploadButton.html($.i18n._('core-buttons/upload')); + this._elmts.or_dialog_jsonText.html($.i18n._('core-dialogs/json-text')); + this._elmts.applyOptionCodeButton.html($.i18n._('core-buttons/apply')); + this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); $("#custom-tabular-exporter-tabs-content").css("display", ""); $("#custom-tabular-exporter-tabs-download").css("display", ""); @@ -371,9 +371,9 @@ CustomTabularExporterDialog.prototype._applyOptionCode = function() { var json = JSON.parse(s); this._configureUIFromOptionCode(json); - alert($.i18n._('core-dialogs')["opt-code-applied"]); + alert($.i18n._('core-dialogs/opt-code-applied')); } catch (e) { - alert($.i18n._('core-dialogs')["error-apply-code"]+': ' + e); + alert($.i18n._('core-dialogs/error-apply-code')+': ' + e); } }; diff --git a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js index 2ba833950..c5e60c2ba 100644 --- a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js @@ -31,13 +31,13 @@ ExpressionColumnDialog.prototype._createDialog = function() { this._level = DialogSystem.showDialog(this._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_selAndOrd.html($.i18n._('core-dialogs')["sel-and-ord"]); - this._elmts.selectAllButton.html($.i18n._('core-buttons')["select-all"]); - this._elmts.deselectAllButton.html($.i18n._('core-buttons')["deselect-all"]); - this._elmts.okButton.html($.i18n._('core-buttons')["ok"]); - this._elmts.cancelButton.html($.i18n._('core-buttons')["cancel"]); + this._elmts.dialogHeader.html($.i18n._('core-dialogs/select-columns-dialog')); + this._elmts.or_dialog_content.html($.i18n._('core-dialogs/content')); + this._elmts.or_dialog_selAndOrd.html($.i18n._('core-dialogs/sel-and-ord')); + this._elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); + this._elmts.deselectAllButton.html($.i18n._('core-buttons/deselect-all')); + this._elmts.okButton.html($.i18n._('core-buttons/ok')); + this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); /* diff --git a/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js b/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js index 566493f30..0bc521104 100644 --- a/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js @@ -45,12 +45,12 @@ function ExpressionPreviewDialog(title, cellIndex, rowIndices, values, expressio this._elmts = DOM.bind(html); - $('').html($.i18n._('core-buttons')["ok"]).click(function() { + $('').html($.i18n._('core-buttons/ok')).click(function() { DialogSystem.dismissUntil(self._level - 1); self._onDone(self._previewWidget.getExpression(true)); }).appendTo(footer); - $('').text($.i18n._('core-buttons')["cancel"]).click(function() { + $('').text($.i18n._('core-buttons/cancel')).click(function() { DialogSystem.dismissUntil(self._level - 1); }).appendTo(footer); @@ -136,12 +136,12 @@ ExpressionPreviewDialog.Widget = function( this._tabContentWidth = this._elmts.expressionPreviewPreviewContainer.width() + "px"; - this._elmts.or_dialog_expr.html($.i18n._('core-dialogs')["expression"]); - this._elmts.or_dialog_lang.html($.i18n._('core-dialogs')["language"]); - this._elmts.or_dialog_preview.html($.i18n._('core-dialogs')["preview"]); - this._elmts.or_dialog_history.html($.i18n._('core-dialogs')["history"]); - this._elmts.or_dialog_starred.html($.i18n._('core-dialogs')["starred"]); - this._elmts.or_dialog_help.html($.i18n._('core-dialogs')["help"]); + this._elmts.or_dialog_expr.html($.i18n._('core-dialogs/expression')); + this._elmts.or_dialog_lang.html($.i18n._('core-dialogs/language')); + this._elmts.or_dialog_preview.html($.i18n._('core-dialogs/preview')); + this._elmts.or_dialog_history.html($.i18n._('core-dialogs/history')); + this._elmts.or_dialog_starred.html($.i18n._('core-dialogs/starred')); + this._elmts.or_dialog_help.html($.i18n._('core-dialogs/help')); this.update(); this._renderExpressionHistoryTab(); @@ -192,19 +192,19 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) { var varTable = $('
    ').appendTo(elmt)[0]; var vars = [ { name: "cell", - description: $.i18n._('core-dialogs')["cell-fields"] + description: $.i18n._('core-dialogs/cell-fields') }, { name: "value", - description: $.i18n._('core-dialogs')["cell-value"] + description: $.i18n._('core-dialogs/cell-value') }, { name: "row", - description: $.i18n._('core-dialogs')["row-fields"] + description: $.i18n._('core-dialogs/row-fields') }, { name: "cells", - description: $.i18n._('core-dialogs')["cells-of-row"] + description: $.i18n._('core-dialogs/cells-of-row') }, { name: "rowIndex", - description: $.i18n._('core-dialogs')["row-index"] + description: $.i18n._('core-dialogs/row-index') } ]; 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 + ")"); $(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(1)).addClass("expression-preview-doc-item-desc").text(entry.description); @@ -270,7 +270,7 @@ ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(dat var table = $( '' + - '' + + '' + '
    '+$.i18n._('core-dialogs')["from"]+''+$.i18n._('core-dialogs')["expression"]+'
    '+$.i18n._('core-dialogs/from')+''+$.i18n._('core-dialogs/expression')+'
    ' ).appendTo($('
    ').addClass("expression-preview-table-wrapper").appendTo(elmt))[0]; @@ -293,7 +293,7 @@ ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(dat ); }); - $(''+$.i18n._('core-dialogs')["reuse"]+'').appendTo(tr.insertCell(1)).click(function() { + $(''+$.i18n._('core-dialogs/reuse')+'').appendTo(tr.insertCell(1)).click(function() { self._elmts.expressionPreviewTextarea[0].value = o.expression; self._elmts.expressionPreviewLanguageSelect[0].value = o.language; @@ -336,7 +336,7 @@ ExpressionPreviewDialog.Widget.prototype._renderStarredExpressions = function(da var table = $( '' + - '' + + '' + '
    '+$.i18n._('core-dialogs')["expression"]+'
    '+$.i18n._('core-dialogs/expression')+'
    ' ).appendTo($('
    ').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 o = Scripting.parse(entry.code); - $(''+$.i18n._('core-dialogs')["remove"]+'').appendTo(tr.insertCell(0)).click(function() { + $(''+$.i18n._('core-dialogs/remove')+'').appendTo(tr.insertCell(0)).click(function() { $.post( "command/core/toggle-starred-expression", { expression: entry.code, returnList: true }, @@ -431,7 +431,7 @@ ExpressionPreviewDialog.Widget.prototype._renderPreview = function(expression, d var renderValue = function(td, v) { if (v !== null && v !== undefined) { if ($.isPlainObject(v)) { - $('').addClass("expression-preview-special-value").text($.i18n._('core-dialogs')["error"]+": " + v.message).appendTo(td); + $('').addClass("expression-preview-special-value").text($.i18n._('core-dialogs/error')+": " + v.message).appendTo(td); } else { td.text(v); } @@ -441,9 +441,9 @@ ExpressionPreviewDialog.Widget.prototype._renderPreview = function(expression, d }; 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 { - 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); } diff --git a/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js b/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js index 3ca99e62b..8ff15ea69 100644 --- a/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/extend-data-preview-dialog.js @@ -41,7 +41,7 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo var self = this; this._dialog = $(DOM.loadHTML("core", "scripts/views/data-table/extend-data-preview-dialog.html")); 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() { self._extension.properties = []; self._update(); @@ -49,7 +49,7 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo this._elmts.okButton.click(function() { if (self._extension.properties.length === 0) { - alert($.i18n._('core-views')["warning-no-property"]); + alert($.i18n._('core-views/warning-no-property')); } else { DialogSystem.dismissUntil(self._level - 1); self._onDone(self._extension, @@ -83,9 +83,9 @@ function ExtendReconciledDataPreviewDialog(column, columnIndex, rowIndices, onDo } if (this._serviceMetadata === null) { - alert($.i18n._('core-views')["extend-not-reconciled"]); + alert($.i18n._('core-views/extend-not-reconciled')); } else if(extend === null) { - alert($.i18n._('core-views')["extend-not-supported"]); + alert($.i18n._('core-views/extend-not-supported')); } else { var dismissBusy = DialogSystem.showBusy(); ExtendReconciledDataPreviewDialog.getAllProperties(this._proposePropertiesUrl, type, function(properties) { @@ -196,7 +196,7 @@ ExtendReconciledDataPreviewDialog.prototype._update = function() { }, "json" ).fail(function(data) { - alert($.i18n._("core-views")["internal-err"]); + alert($.i18n._('core-views/internal-err')); }); } }; @@ -255,17 +255,17 @@ ExtendReconciledDataPreviewDialog.prototype._renderPreview = function(data) { $('
    ').appendTo(th); $('') - .text($.i18n._("core-views")["remove-prop"]) + .text($.i18n._('core-views/remove-prop')) .addClass("action") - .attr("title", $.i18n._("core-views")["remove-col"]) + .attr("title", $.i18n._('core-views/remove-col')) .click(function() { self._removeProperty(column.id); }).appendTo(th); $('') - .text($.i18n._("core-views")["configure-prop"]) + .text($.i18n._('core-views/configure-prop')) .addClass("action") - .attr("title", $.i18n._("core-views")["configure-col"]) + .attr("title", $.i18n._('core-views/configure-col')) .click(function() { self._constrainProperty(column.id); }).appendTo(th); @@ -380,7 +380,7 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) { if (table.children().length === 0) { var tr = $('').appendTo(table); - $('').text($.i18n._('core-views')['no-settings']).appendTo(tr); + $('').text($.i18n._('core-views/no-settings')).appendTo(tr); } var form = $('
    ').append(table); @@ -389,8 +389,8 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) { var bodyElmts = DOM.bind(body); footer.html( - '' + - '' + '' + + '' ); var footerElmts = DOM.bind(footer); @@ -416,7 +416,7 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) { self._update(); } catch (e) { - alert($.i18n._("core-views")["internal-err"]); + alert($.i18n._('core-views/internal-err')); } }); diff --git a/main/webapp/modules/core/scripts/dialogs/scatterplot-dialog.js b/main/webapp/modules/core/scripts/dialogs/scatterplot-dialog.js index a5a717c40..25c72702b 100644 --- a/main/webapp/modules/core/scripts/dialogs/scatterplot-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/scatterplot-dialog.js @@ -43,19 +43,19 @@ ScatterplotDialog.prototype._createDialog = function() { var dialog = $(DOM.loadHTML("core", "scripts/dialogs/scatterplot-dialog.html")); this._elmts = DOM.bind(dialog); this._elmts.dialogHeader.text( - $.i18n._('core-dialogs')["scatterplot-matrix"] + - ((typeof this._column == "undefined") ? "" : " ("+$.i18n._('core-dialogs')["focusing-on"]+" '" + this._column + "')")); + $.i18n._('core-dialogs/scatterplot-matrix') + + ((typeof this._column == "undefined") ? "" : " ("+$.i18n._('core-dialogs/focusing-on')+" '" + this._column + "')")); this._elmts.closeButton.click(function() { self._dismiss(); }); - 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_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_clock.attr("title", $.i18n._('core-dialogs')["rotated-clock"]); - 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_bigDot.attr("title", $.i18n._('core-dialogs')["big-dot"]); - this._elmts.closeButton.text($.i18n._('core-buttons')["close"]); + 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_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_clock.attr("title", $.i18n._('core-dialogs/rotated-clock')); + 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_bigDot.attr("title", $.i18n._('core-dialogs/big-dot')); + this._elmts.closeButton.text($.i18n._('core-buttons/close')); this._elmts.plotSelector.buttonset().change(function() { self._plot_method = $(this).find("input:checked").val(); @@ -87,7 +87,7 @@ ScatterplotDialog.prototype._renderMatrix = function() { var self = this; var container = this._elmts.tableContainer.html( - '
    '+$.i18n._('core-dialogs')["focusing-on"]+'
    ' + '
    '+$.i18n._('core-dialogs/focusing-on')+'
    ' ); if (theProject.columnModel.columns.length > 0) { @@ -214,7 +214,7 @@ ScatterplotDialog.prototype._renderMatrix = function() { }); } else { container.html( - '
    '+$.i18n._('core-dialogs')["no-column-dataset"]+ '
    ' + '
    '+$.i18n._('core-dialogs/no-column-dataset')+ '
    ' ); } diff --git a/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js b/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js index 06ce916a1..7dd04ba7f 100755 --- a/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/sql-exporter-dialog.js @@ -48,26 +48,26 @@ function SqlExporterDialog(options) { this._dialog = $(DOM.loadHTML("core", "scripts/dialogs/sql-exporter-dialog.html")); this._elmts = DOM.bind(this._dialog); this._level = DialogSystem.showDialog(this._dialog); - this._elmts.dialogHeader.html($.i18n._('core-dialogs')["sql-exporter"]); - this._elmts.or_dialog_content.html($.i18n._('core-dialogs')["content"]); - this._elmts.or_dialog_download.html($.i18n._('core-dialogs')["download"]); + this._elmts.dialogHeader.html($.i18n._('core-dialogs/sql-exporter')); + this._elmts.or_dialog_content.html($.i18n._('core-dialogs/content')); + this._elmts.or_dialog_download.html($.i18n._('core-dialogs/download')); - this._elmts.selectAllButton.html($.i18n._('core-buttons')["select-all"]); - this._elmts.deselectAllButton.html($.i18n._('core-buttons')["deselect-all"]); + this._elmts.selectAllButton.html($.i18n._('core-buttons/select-all')); + this._elmts.deselectAllButton.html($.i18n._('core-buttons/deselect-all')); - this._elmts.downloadPreviewButton.html($.i18n._('core-buttons')["preview"]); - this._elmts.downloadButton.html($.i18n._('core-buttons')["download"]); + this._elmts.downloadPreviewButton.html($.i18n._('core-buttons/preview')); + this._elmts.downloadButton.html($.i18n._('core-buttons/download')); - this._elmts.cancelButton.html($.i18n._('core-buttons')["cancel"]); -// this._elmts.nextButton.html($.i18n._('core-buttons')["next"]); + this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); +// this._elmts.nextButton.html($.i18n._('core-buttons/next')); this._elmts.tableNameLabel.html($.i18n._('core-dialogs')["tableNameLabel"]); - 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.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.includeStructureLabel.html($.i18n._('core-dialogs/for-include-structure-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.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.sqlExportTrimAllColumnsLabel.html($.i18n._('core-dialogs')["sqlExporterTrimColumns"]); diff --git a/main/webapp/modules/core/scripts/dialogs/templating-exporter-dialog.js b/main/webapp/modules/core/scripts/dialogs/templating-exporter-dialog.js index 2758fa5cd..f78474147 100644 --- a/main/webapp/modules/core/scripts/dialogs/templating-exporter-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/templating-exporter-dialog.js @@ -43,14 +43,14 @@ TemplatingExporterDialog.prototype._createDialog = function() { this._elmts = DOM.bind(dialog); this._elmts.controls.find("textarea").bind("keyup change input",function() { self._scheduleUpdate(); }); - this._elmts.dialogHeader.html($.i18n._('core-dialogs')["template-export"]); - 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_rowSep.html($.i18n._('core-dialogs')["template-rows"]); - this._elmts.or_dialog_suffix.html($.i18n._('core-dialogs')["template-suffix"]); - this._elmts.resetButton.html($.i18n._('core-buttons')["reset-template"]); - this._elmts.exportButton.html($.i18n._('core-buttons')["export"]); - this._elmts.cancelButton.html($.i18n._('core-buttons')["cancel"]); + this._elmts.dialogHeader.html($.i18n._('core-dialogs/template-export')); + 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_rowSep.html($.i18n._('core-dialogs/template-rows')); + this._elmts.or_dialog_suffix.html($.i18n._('core-dialogs/template-suffix')); + this._elmts.resetButton.html($.i18n._('core-buttons/reset-template')); + this._elmts.exportButton.html($.i18n._('core-buttons/export')); + this._elmts.cancelButton.html($.i18n._('core-buttons/cancel')); this._elmts.exportButton.click(function() { self._export(); self._dismiss(); }); this._elmts.cancelButton.click(function() { self._dismiss(); }); @@ -107,10 +107,10 @@ TemplatingExporterDialog.prototype._scheduleUpdate = function() { 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() { self._timerID = null; - self._elmts.previewTextarea[0].value = $.i18n._('core-dialogs')["updating"]; + self._elmts.previewTextarea[0].value = $.i18n._('core-dialogs/updating'); self._updatePreview(); }, 1000); }; diff --git a/main/webapp/modules/core/scripts/facets/list-facet.js b/main/webapp/modules/core/scripts/facets/list-facet.js index 558362413..f631a3cf3 100644 --- a/main/webapp/modules/core/scripts/facets/list-facet.js +++ b/main/webapp/modules/core/scripts/facets/list-facet.js @@ -148,23 +148,23 @@ ListFacet.prototype._initializeUI = function() { this._div.empty().show().html( '
    ' + '
    ' + - '' + + '' + '' + '
      ' + - ''+$.i18n._('core-facets')["reset"]+'' + - ''+$.i18n._('core-facets')["invert"]+'' + - ''+$.i18n._('core-facets')["change"]+'' + + ''+$.i18n._('core-facets/reset')+'' + + ''+$.i18n._('core-facets/invert')+'' + + ''+$.i18n._('core-facets/change')+'' + '' + '
    ' + '
    ' + - '
    ' + + '
    ' + '' + '
    ' + '
    ' + @@ -173,7 +173,7 @@ ListFacet.prototype._initializeUI = function() { this._elmts = DOM.bind(this._div); 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() { if (self._elmts.expressionDiv.css("display") != "none") { self._editExpression(); @@ -223,14 +223,14 @@ ListFacet.prototype._copyChoices = function() { var frame = DialogSystem.createDialog(); frame.width("600px"); - var header = $('
    ').addClass("dialog-header").text($.i18n._('core-facets')["facet-choices"]).appendTo(frame); + var header = $('
    ').addClass("dialog-header").text($.i18n._('core-facets/facet-choices')).appendTo(frame); var body = $('
    ').addClass("dialog-body").appendTo(frame); var footer = $('
    ').addClass("dialog-footer").appendTo(frame); body.html('