More small bugfixes

This commit is contained in:
Blakko 2013-07-11 11:05:13 +02:00
parent 23310efded
commit d9ccaf53ad
10 changed files with 14 additions and 17 deletions

View File

@ -239,7 +239,7 @@ 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" : "") + " 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"] )
); );

View File

@ -143,7 +143,7 @@
<div bind="uploadTabBody" id="custom-tabular-exporter-tabs-upload" style="display: none;"><div class="grid-layout grid-layout-for-ui layout-loose layout-full"><table> <div bind="uploadTabBody" id="custom-tabular-exporter-tabs-upload" style="display: none;"><div class="grid-layout grid-layout-for-ui layout-loose layout-full"><table>
<tr> <tr>
<th bind="or_dialog_uploadTo"></th> <th ><span bind="or_dialog_uploadTo"></span></th>
</tr> </tr>
<tr> <tr>
<td><div class="grid-layout grid-layout-for-text layout-tightest"><table bind="uploadTargetTable"></table></div></td> <td><div class="grid-layout grid-layout-for-text layout-tightest"><table bind="uploadTargetTable"></table></div></td>

View File

@ -121,7 +121,7 @@ CustomTabularExporterDialog.prototype._createDialog = function(options) {
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.downloadButton.html($.i18n._('core-dialog')["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"]);

View File

@ -45,8 +45,7 @@ $.ajax({
type : "POST", type : "POST",
async : false, async : false,
data : { data : {
//lng : lang lng : lang
lng: 'en'
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data;

View File

@ -95,7 +95,7 @@ Refine.DefaultImportingController.prototype._prepareParsingPanel = function() {
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').text($.i18n._('core-index-import')["project-name"]); $('#or-import-projname').html($.i18n._('core-index-import')["project-name"]);
$('#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"]);

View File

@ -107,7 +107,7 @@ Refine.JsonParserUI.prototype._initialize = function() {
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.text($.i18n._('core-buttons')["update-preview"]); this._optionContainerElmts.previewButton.text($.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-rows2').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"]);

View File

@ -42,8 +42,7 @@ $.ajax({
type : "POST", type : "POST",
async : false, async : false,
data : { data : {
// lng : lang lng : lang
lng : 'en'
}, },
success : function(data) { success : function(data) {
dictionary = data; dictionary = data;

View File

@ -14,7 +14,7 @@
</tr> </tr>
<tr> <tr>
<td width="1%"><input type="radio" name="recon-dialog-strict-namespace-choice" value="other" /></td> <td width="1%"><input type="radio" name="recon-dialog-strict-namespace-choice" value="other" /></td>
<td bind="or_recon_thisNs"><input bind="strictNamespaceInput" /></td> <td><span bind="or_recon_thisNs"></span><input bind="strictNamespaceInput" /></td>
</tr> </tr>
</table></div> </table></div>
</td> </td>

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"]) + 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 = {
@ -107,7 +107,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {
{}, {},
{ {
id: "core/custom-text-facet", id: "core/custom-text-facet",
label: $.i18n._('core-views')["custom-facet"]+'...', label: $.i18n._('core-views')["custom-text-facet"]+'...',
click: function() { click: function() {
doFilterByExpressionPrompt(null, "list"); doFilterByExpressionPrompt(null, "list");
} }

View File

@ -131,6 +131,7 @@
"rows-in-cluster": "# Rows in Cluster", "rows-in-cluster": "# Rows in Cluster",
"choice-avg-length": "Average Length of Choices", "choice-avg-length": "Average Length of Choices",
"choice-var-length": "Length Variance of Choices", "choice-var-length": "Length Variance of Choices",
"found": "found",
"filtered-from": "filtered from <b>", "filtered-from": "filtered from <b>",
"from-total": "</b> total", "from-total": "</b> total",
"cluster-descr": "This feature helps you find groups of different cell values that might be alternative representations of the same thing. For example, the two strings \"New York\" and \"new york\" are very likely to refer to the same concept and just have capitalization differences, and \"Gödel\" and \"Godel\" probably refer to the same person.", "cluster-descr": "This feature helps you find groups of different cell values that might be alternative representations of the same thing. For example, the two strings \"New York\" and \"new york\" are very likely to refer to the same concept and just have capitalization differences, and \"Gödel\" and \"Godel\" probably refer to the same person.",
@ -372,7 +373,6 @@
"search-match": "Search for match", "search-match": "Search for match",
"not-valid-number": "Not a valid number.", "not-valid-number": "Not a valid number.",
"not-valid-date": "Not a valid date.", "not-valid-date": "Not a valid date.",
"search-match": "Search for Match",
"match-this": "Match this cell only", "match-this": "Match this cell only",
"match-other": "Match other cells with same content", "match-other": "Match other cells with same content",
"search-for": "Search for", "search-for": "Search for",
@ -405,7 +405,6 @@
"booleans": "booleans", "booleans": "booleans",
"drag-drop": "Drag and drop to re-order", "drag-drop": "Drag and drop to re-order",
"forward": "forward", "forward": "forward",
"reverse": "reverse",
"sort-by-col": "sort by this column alone", "sort-by-col": "sort by this column alone",
"smallest-first": "smallest first", "smallest-first": "smallest first",
"largest-first": "largest first", "largest-first": "largest first",
@ -464,13 +463,13 @@
"copy-recon": "Copy reconciliation data...", "copy-recon": "Copy reconciliation data...",
"copy-recon2": "Copy this column's reconciliation data to other columns", "copy-recon2": "Copy this column's reconciliation data to other columns",
"custom-facet": "Custom Facet on column", "custom-facet": "Custom Facet on column",
"custom-numeric": "Custom Numeric Facet on column", "custom-numeric-label": "Custom Numeric Facet on column",
"custom-numeric": "Custom Numeric Facet",
"text-facet": "Text facet", "text-facet": "Text facet",
"numeric-facet": "Numeric facet", "numeric-facet": "Numeric facet",
"timeline-facet": "Timeline facet", "timeline-facet": "Timeline facet",
"scatterplot-facet": "Scatterplot facet", "scatterplot-facet": "Scatterplot facet",
"custom-facet": "Custom text facet", "custom-text-facet": "Custom text facet",
"custom-numeric": "Custom numeric facet",
"custom-facets": "Customized facets", "custom-facets": "Customized facets",
"word-facet": "Word facet", "word-facet": "Word facet",
"duplicates-facet": "Duplicates facet", "duplicates-facet": "Duplicates facet",