From 46e233722f9d1ccec1bd97816bb055caa12f8096 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 12 Sep 2011 08:43:32 -0400 Subject: [PATCH] Vandelay: import strings from DTD Using the new template-style embedded string localizer: [% l('...') %] Removed vandelay.dtd. Signed-off-by: Bill Erickson --- Open-ILS/src/templates/vandelay/inc/attrs.tt2 | 52 ++++----- Open-ILS/src/templates/vandelay/inc/export.tt2 | 42 ++++---- .../src/templates/vandelay/inc/import_errors.tt2 | 2 +- Open-ILS/src/templates/vandelay/inc/marchtml.tt2 | 10 +- Open-ILS/src/templates/vandelay/inc/matches.tt2 | 22 ++-- Open-ILS/src/templates/vandelay/inc/progress.tt2 | 6 +- Open-ILS/src/templates/vandelay/inc/queue.tt2 | 54 +++++----- .../src/templates/vandelay/inc/queueselect.tt2 | 12 +-- Open-ILS/src/templates/vandelay/inc/toolbar.tt2 | 14 +-- Open-ILS/src/templates/vandelay/inc/upload.tt2 | 36 +++---- Open-ILS/src/templates/vandelay/vandelay.tt2 | 2 +- Open-ILS/web/opac/locale/en-US/vandelay.dtd | 119 --------------------- 12 files changed, 126 insertions(+), 245 deletions(-) delete mode 100644 Open-ILS/web/opac/locale/en-US/vandelay.dtd diff --git a/Open-ILS/src/templates/vandelay/inc/attrs.tt2 b/Open-ILS/src/templates/vandelay/inc/attrs.tt2 index 1a09b0bb82..83685480cf 100644 --- a/Open-ILS/src/templates/vandelay/inc/attrs.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/attrs.tt2 @@ -1,72 +1,72 @@
- + - +
- &vandelay.create.attr.def; + [% l('Create Attribute Definition') %]
- + - + - + - + - + - +
+

[% l('You can enter multiple tags, separated by spaces and/or commas') %]

+

[% l('Example') %]:120, 220, 300 or 120 220 330
+

[% l('You can enter multiple subfields, separated by spaces and/or commas') %]

+

[% l('Example') %]: a, b, j, x or a b j x
+ id="attr-editor-create-button">[% l('Create') %] + onclick="dijit.byId('attr-editor-dialog').onCancel();">[% l('Cancel') %]
+ id="attr-editor-update-button">[% l('Update') %] + onclick="dijit.byId('attr-editor-dialog').onCancel();">[% l('Cancel') %] + onclick="if(confirm('[% l('Are you sure you want to delete this record?') %]')) { vlAttrDelete(); }"> + [% l('Delete record') %]
@@ -76,13 +76,13 @@ - - - - - - - + + + + + + +
&vandelay.id;&vandelay.code;&vandelay.descrip;&vandelay.tag;&vandelay.subfield;&vandelay.xpath;&vandelay.remove;[% l('ID') %][% l('Code') %][% l('Description') %][% l('Tag') %][% l('Subfield') %][% l('XPath') %][% l('Remove') %]
diff --git a/Open-ILS/src/templates/vandelay/inc/export.tt2 b/Open-ILS/src/templates/vandelay/inc/export.tt2 index 1f7a9e3f03..5565a81012 100644 --- a/Open-ILS/src/templates/vandelay/inc/export.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/export.tt2 @@ -1,63 +1,63 @@ -

&vandelay.export.records;


+

[% l('Export Records') %]


- + - + - + - + - + - + - + - + - + - +
&vandelay.export.use_field_no;[% l('Use Field Number') %] - &vandelay.export.field_no_hint; + [% l('(starting from 0)') %]
&vandelay.export.from_csv;[% l('From CSV File') %]
&vandelay.export.or;
[% l('Or') %]
&vandelay.export.record_id;[% l('Record ID') %]
&vandelay.export.or;
[% l('Or') %]
&vandelay.export.bucket;[% l('Record Bucket ID') %]
&vandelay.record.type;[% l('Record Type') %]
&vandelay.export.format;[% l('Record Format') %]
&vandelay.export.encoding;[% l('Record Encoding') %]
&vandelay.export.holdings;[% l('Include holdings in Bibliographic Records') %]
- +
diff --git a/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 b/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 index 588260e86f..821363c530 100644 --- a/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 @@ -1,7 +1,7 @@
+ onclick="displayGlobalDiv('vl-queue-div');">↖ [% l('Back To Import Queue') %]
diff --git a/Open-ILS/src/templates/vandelay/inc/marchtml.tt2 b/Open-ILS/src/templates/vandelay/inc/marchtml.tt2 index ad54452997..1a82220922 100644 --- a/Open-ILS/src/templates/vandelay/inc/marchtml.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/marchtml.tt2 @@ -1,10 +1,10 @@ -

&vandelay.marc.record;


- - +

[% l('MARC Record') %]


+ +
- - + +
diff --git a/Open-ILS/src/templates/vandelay/inc/matches.tt2 b/Open-ILS/src/templates/vandelay/inc/matches.tt2 index 2376dbc259..4e5d95bd2d 100644 --- a/Open-ILS/src/templates/vandelay/inc/matches.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/matches.tt2 @@ -5,33 +5,33 @@ defaultCell: {styles: 'text-align: center;'}, cells : [[ { - name: '&vandelay.overlay.target;', + name: '[% l('Merge Target') %]', get: vlGetOverlayTargetSelector, formatter : vlFormatOverlayTargetSelector, }, - {name: '&vandelay.id;', field:'id'}, - { name: '&vandelay.view.marc;', + {name: '[% l('ID') %]', field:'id'}, + { name: '[% l('View MARC') %]', get: vlGetViewMARC, formatter : vlFormatViewMatchMARC }, {name: 'Match Score', field:'match_score'}, {name: 'Queued Record Quality', field:'rec_quality'}, {name: 'Matched Record Quality', field:'match_quality'}, - {name: '&vandelay.creator;', get: vlGetCreator}, - {name: '&vandelay.create.date;', field:'create_date', get: vlGetDateTimeField}, - {name: '&vandelay.last.edit.date;', field:'edit_date', get: vlGetDateTimeField}, - {name: '&vandelay.source;', field:'source'}, - {name: '&vandelay.tcn.source;', field:'tcn_source'}, - {name: '&vandelay.tcn.value;', field:'tcn_value'} + {name: '[% l('Creator') %]', get: vlGetCreator}, + {name: '[% l('Create Date') %]', field:'create_date', get: vlGetDateTimeField}, + {name: '[% l('Last Edit Date') %]', field:'edit_date', get: vlGetDateTimeField}, + {name: '[% l('Source') %]', field:'source'}, + {name: '[% l('TCN Source') %]', field:'tcn_source'}, + {name: '[% l('TCN Value') %]', field:'tcn_value'} ]] }]; } -

&vandelay.import.matches;


+

[% l('Import Matches') %]


+ onclick="displayGlobalDiv('vl-queue-div');">↖ [% l('Back To Import Queue') %]
diff --git a/Open-ILS/src/templates/vandelay/inc/progress.tt2 b/Open-ILS/src/templates/vandelay/inc/progress.tt2 index e5e18334fe..b92455f77f 100644 --- a/Open-ILS/src/templates/vandelay/inc/progress.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/progress.tt2 @@ -5,12 +5,12 @@
diff --git a/Open-ILS/src/templates/vandelay/inc/queue.tt2 b/Open-ILS/src/templates/vandelay/inc/queue.tt2 index 749434f0a5..0f24b8c7b5 100644 --- a/Open-ILS/src/templates/vandelay/inc/queue.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/queue.tt2 @@ -9,13 +9,13 @@ - - + + + function() { displayGlobalDiv("vl-marc-upload-div"); });}'>[% l('Delete Queue') %]
Queue Actions
&vandelay.import.selected;
&vandelay.import.all;
[% l('Import Selected Records') %]
[% l('Import All Records') %]
View Import Items
&vandelay.delete.queue;
@@ -24,8 +24,8 @@ - - + + @@ -39,21 +39,21 @@ - + - + - + @@ -126,13 +126,13 @@ get='vlGetViewMARC' formatter='vlFormatViewMARC' styles='text-align: center;' - nonSelectable='true'>&vandelay.view.marc; + nonSelectable='true'>[% l('View MARC') %] + nonSelectable='true'>[% l('Matches') %] + get='vlGetDateTimeField'>[% l('Import Time') %]
Queue Summary
&vandelay.queue.total;
&vandelay.queue.imported;
[% l('Records in Queue:') %]
[% l('Records Imported:') %]
Record Import Failures
Items in Queue
Items Imported
Queue Filters
&vandelay.limit.to.collision.matches;[% l('Limit to Records with Matches') %]
&vandelay.limit.to.non.imported;[% l('Limit to Non-Imported Records') %]
&vandelay.limit.to.import_error;[% l('Limit to Records with Import Errors') %] @@ -77,7 +77,7 @@ - &vandelay.results.per.page; + [% l('Records Per Page') %] - &vandelay.prev.page; + [% l('« Previous') %] - &vandelay.next.page; + [% l('Next »') %]
&vandelay.matches; &vandelay.import.time;
@@ -167,13 +167,13 @@ get='vlGetViewMARC' formatter='vlFormatViewMARC' styles='text-align: center;' - nonSelectable='true'>&vandelay.view.marc; + nonSelectable='true'>[% l('View MARC') %] &vandelay.matches; + nonSelectable='true'>[% l('Matches') %] &vandelay.import.time; + get='vlGetDateTimeField'>[% l('Import Time') %] @@ -195,43 +195,43 @@ - + - + - + - + - + - + - + diff --git a/Open-ILS/src/templates/vandelay/inc/queueselect.tt2 b/Open-ILS/src/templates/vandelay/inc/queueselect.tt2 index 2149dfa0fe..e72633b044 100644 --- a/Open-ILS/src/templates/vandelay/inc/queueselect.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/queueselect.tt2 @@ -1,17 +1,17 @@ -

&vandelay.select.queue;


+

[% l('Select a Queue to Inspect') %]


&vandelay.auto.import.merge_profile;[% l('Merge Profile') %]
&vandelay.auto.import.noncolliding;[% l('Import Non-Matching Records') %]
&vandelay.auto.import.auto_overlay_exact;[% l('Merge On Exact Match (901c)') %]
&vandelay.auto.import.auto_overlay_1match;[% l('Merge On Single Match') %]
&vandelay.auto.import.auto_overlay_best;[% l('Merge On Best Match') %]
&vandelay.auto.import.auto_overlay_best_ratio;[% l('Best/Single Match Minimum Quality Ratio') %] - (&vandelay.auto.import.auto_overlay_best_ratio.desc;) + [% l('New Record Quality / Quality of Best Match') %]
&vandelay.auto.import.ft_merge_profile;[% l('Insufficient Quality Fall-Through Profile') %]
- + - +
&vandelay.queue.type;[% l('Queue Type') %]
&vandelay.queue;[% l('Queue') %] @@ -19,7 +19,7 @@
- +
diff --git a/Open-ILS/src/templates/vandelay/inc/toolbar.tt2 b/Open-ILS/src/templates/vandelay/inc/toolbar.tt2 index 144cd45336..cdfc6d61e8 100644 --- a/Open-ILS/src/templates/vandelay/inc/toolbar.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/toolbar.tt2 @@ -1,16 +1,16 @@
&vandelay.export.records;
+ onclick="displayGlobalDiv('vl-marc-export-div');" showLabel="true">[% l('Export Records') %]
&vandelay.import.records;
+ onclick="displayGlobalDiv('vl-marc-upload-div');" showLabel="true">[% l('Import Records') %]
&vandelay.inspect.queue;
+ onclick="vlShowQueueSelect();" showLabel="true">[% l('Inspect Queue') %]
&vandelay.edit.attributes;
+ onclick="vlShowAttrEditor();" showLabel="true">[% l('Record Display Attributes') %]
&vandelay.edit.profiles;
+ onclick="vlShowProfileEditor();" showLabel="true">[% l('Merge / Overlay Profiles') %]
&vandelay.edit.match_set;
+ onclick="vlShowMatchSetEditor();" showLabel="true">[% l('Record Match Sets') %]
&vandelay.edit.import_item_attrs;
+ onclick="vlShowImportItemAttrEditor();" showLabel="true">[% l('Import Item Attributes') %] diff --git a/Open-ILS/src/templates/vandelay/inc/upload.tt2 b/Open-ILS/src/templates/vandelay/inc/upload.tt2 index 0c1bbd5342..cd5b3b12af 100644 --- a/Open-ILS/src/templates/vandelay/inc/upload.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/upload.tt2 @@ -1,23 +1,23 @@ -

&vandelay.marc.file.upload;


+

[% l('Evergreen MARC File Upload') %]


- + - + - + - + - + - + - + - + - + - + - + @@ -93,9 +93,9 @@
&vandelay.record.type;[% l('Record Type') %]
&vandelay.create.upload.queue;[% l('Create a New Upload Queue') %] &vandelay.add.existing.queue;[% l('or Add to an Existing Queue') %] @@ -38,52 +38,52 @@
&vandelay.import.bib_sources;[% l('Select a Record Source') %]
- &vandelay.import.actions; + [% l('Record Import Actions') %]
&vandelay.auto.import.merge_profile;[% l('Merge Profile') %]
&vandelay.auto.import.noncolliding;[% l('Import Non-Matching Records') %]
&vandelay.auto.import.auto_overlay_exact;[% l('Merge On Exact Match (901c)') %]
&vandelay.auto.import.auto_overlay_1match;[% l('Merge On Single Match') %]
&vandelay.auto.import.auto_overlay_best;[% l('Merge On Best Match') %]
&vandelay.auto.import.auto_overlay_best_ratio;[% l('Best/Single Match Minimum Quality Ratio') %] - (&vandelay.auto.import.auto_overlay_best_ratio.desc;) + [% l('New Record Quality / Quality of Best Match') %]
&vandelay.auto.import.ft_merge_profile;[% l('Insufficient Quality Fall-Through Profile') %]
- &vandelay.file.to.upload; + [% l('File to Upload:') %] - +
diff --git a/Open-ILS/src/templates/vandelay/vandelay.tt2 b/Open-ILS/src/templates/vandelay/vandelay.tt2 index 7aaac3f541..17750281af 100644 --- a/Open-ILS/src/templates/vandelay/vandelay.tt2 +++ b/Open-ILS/src/templates/vandelay/vandelay.tt2 @@ -31,7 +31,7 @@ [% INCLUDE 'vandelay/inc/queueselect.tt2' %]