Skip to content

Commit 193f053

Browse files
jgonggrijpjgonggrijp
committed
Make i18n changes consistent with 4a10968, 6cf200a, a6a9e83 (#451)
1 parent d7d0d31 commit 193f053

File tree

4 files changed

+84
-49
lines changed

4 files changed

+84
-49
lines changed

‎frontend/src/panel-source/source-metadata-panel-template.hbs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div class="panel-header">
2-
<h4 class="title is-4">{{#i18n 'source_meta_summary'}}Source {{identifier}}, created by {{creator}} at {{dateUploaded}}{{/i18n}}</h4>
2+
<h4 class="title is-4">{{#i18n 'source.meta-summary'}}Source {{identifier}}, created by {{creator}} at {{dateUploaded}}{{/i18n}}</h4>
33
</div>
44
<div class="panel-content">
55
<!-- source-metadata will be rendered here-->
66
</div>
77
<div class="panel-footer buttons is-right">{{#userIsOwner}}
8-
<button type=button class="button btn-delete is-danger edit-mode">{{#i18n 'delete_source'}}Delete source{{/i18n}}</button>
9-
<button type="submit" class="button btn-save edit-mode">{{#i18n 'save_changes'}}Save changes{{/i18n}}</button>
10-
<button type=reset class="button btn-cancel edit-mode">{{#i18n 'cancel'}}Cancel{{/i18n}}</button>
11-
<button type=button class="button btn-edit">{{#i18n 'edit'}}Edit{{/i18n}}</button>
8+
<button type=button class="button btn-delete is-danger edit-mode">{{#i18n 'button.delete-source'}}Delete source{{/i18n}}</button>
9+
<button type="submit" class="button btn-save edit-mode">{{#i18n 'button.save-changes'}}Save changes{{/i18n}}</button>
10+
<button type=reset class="button btn-cancel edit-mode">{{#i18n 'button.cancel'}}Cancel{{/i18n}}</button>
11+
<button type=button class="button btn-edit">{{#i18n 'button.edit'}}Edit{{/i18n}}</button>
1212
{{/userIsOwner}}</div>

‎frontend/src/source-metadata/source-metadata-template.hbs

+47-28
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<div class="section source">
22
<div class="field">
3-
<label class="label">{{#i18n 'title'}}Title{{/i18n}}</label>
3+
<label class="label">{{#i18n 'label.title'}}Title{{/i18n}}</label>
44
<div class="control">
55
<input class="input" type="text" name="title" {{#unless readonly}}placeholder="The Voyage of the Dawn Treader"{{/unless}} required {{#readonly}}readonly{{/readonly}}>
66
</div>
77
</div>
88
<div class="field">
9-
<label class="label">{{#i18n 'author'}}Author{{/i18n}}</label>
9+
<label class="label">{{#i18n 'label.author'}}Author{{/i18n}}</label>
1010
<div class="control">
1111
<input name="author" class="input" type="text" {{#unless readonly}}placeholder="C.S. Lewis"{{/unless}} required {{#readonly}}readonly{{/readonly}}>
1212
</div>
1313
</div>
1414
<div class="field is-grouped">
1515
<div class="control">
16-
<label class="label">{{#i18n 'editor_opt'}}Editor (optional){{/i18n}}</label>
16+
<label class="label">{{#i18n 'label.editor-opt'}}Editor (optional){{/i18n}}</label>
1717
<input name="editor" class="input" type="text" {{#unless readonly}}placeholder="C.S. Lewis"{{/unless}} {{#readonly}}readonly{{/readonly}}>
1818
</div>
1919
<div class="control">
20-
<label class="label">{{#i18n 'publisher_opt'}}Publisher (optional){{/i18n}}</label>
20+
<label class="label">{{#i18n 'label.publisher-opt'}}Publisher (optional){{/i18n}}</label>
2121
<input name="publisher" class="input" type="text" {{#unless readonly}}placeholder="Geoffrey Bles"{{/unless}} {{#readonly}}readonly{{/readonly}}>
2222
</div>
2323
</div>
2424
<div class="field">
25-
<label class="label">{{#i18n 'repository_opt'}}Repository (optional){{/i18n}}</label>
25+
<label class="label">{{#i18n 'label.repository-opt'}}Repository (optional){{/i18n}}</label>
2626
<div class="control">
2727
<input
2828
name="repository"
2929
class="input"
3030
type="text"
31-
{{#unless readonly}}placeholder="{{#i18n 'repository_placeholder'}}Archive, location, collection, call, fasc, folio{{/i18n}}"{{/unless}}
31+
{{#unless readonly}}placeholder="{{#i18n 'placeholder.repository'}}Archive, location, collection, call, fasc, folio{{/i18n}}"{{/unless}}
3232
{{#readonly}}readonly{{/readonly}}
3333
>
3434
</div>
3535
</div>
3636
{{#upload}}
3737
<div class="field">
38-
<label class="label">{{#i18n 'file'}}File{{/i18n}}</label>
38+
<label class="label">{{#i18n 'label.file'}}File{{/i18n}}</label>
3939
<div class="file">
4040
<label class="file-label has-helptext">
4141
<input class="file-input" type="file" name="source" id="source">
@@ -44,44 +44,63 @@
4444
<i class="fas fa-upload"></i>
4545
</span>
4646
<span class="file-label filelabel">
47-
{{#i18n 'choose_file'}}Choose a file…{{/i18n}}
47+
{{#i18n 'label.choose-file'}}Choose a file…{{/i18n}}
4848
</span>
4949
</span>
5050
<span class="file-name">
51-
{{#i18n 'no_file'}}No file selected{{/i18n}}
51+
{{#i18n 'upload.no-file'}}No file selected{{/i18n}}
5252
</span>
5353
</label>
5454
</div>
55-
<p class="help">{{#i18n 'file_only_txt_utf8_lf'}}Only txt files in UTF-8 encoding (LF for line endings) are supported.{{/i18n}}</p>
55+
<p class="help">{{#i18n 'upload.only-txt-utf8-lf'}}Only txt files in UTF-8 encoding (LF for line endings) are supported.{{/i18n}}</p>
5656
</div>
5757
{{/upload}}
5858

5959
<div class="field">
60-
<label class="label">{{#i18n 'language'}}Language{{/i18n}}</label>
60+
<label class="label">{{#i18n 'label.language'}}Language{{/i18n}}</label>
6161
<div class="control" id="languageSelect">
6262
{{#if readonly}}
6363
<input name="language" class="input" type="text" readonly>
6464
{{else}}
6565
<div class="select has-helptext">
6666
<select name='language' size='1'>
67-
<option value="">{{#i18n 'select_language'}}Select language{{/i18n}}</option>
68-
<option value="en">{{#i18n 'english'}}English{{/i18n}}</option>
69-
<option value="de">{{#i18n 'german'}}German{{/i18n}}</option>
70-
<option value="fr">{{#i18n 'french'}}French{{/i18n}}</option>
71-
<option value="it">{{#i18n 'italian'}}Italian{{/i18n}}</option>
72-
<option value="cs">{{#i18n 'czech'}}Czech{{/i18n}}</option>
73-
<option value="nl">{{#i18n 'dutch'}}Dutch{{/i18n}}</option>
74-
<option value="other">{{#i18n 'other'}}Other{{/i18n}}</option>
67+
<option value="">
68+
{{#i18n 'label.select-language'
69+
}}Select language{{/i18n}}
70+
</option>
71+
<option value="en">
72+
{{#i18n 'label.english'}}English{{/i18n}}
73+
</option>
74+
<option value="de">
75+
{{#i18n 'label.german'}}German{{/i18n}}
76+
</option>
77+
<option value="fr">
78+
{{#i18n 'label.french'}}French{{/i18n}}
79+
</option>
80+
<option value="it">
81+
{{#i18n 'label.italian'}}Italian{{/i18n}}
82+
</option>
83+
<option value="cs">
84+
{{#i18n 'label.czech'}}Czech{{/i18n}}
85+
</option>
86+
<option value="nl">
87+
{{#i18n 'label.dutch'}}Dutch{{/i18n}}
88+
</option>
89+
<option value="other">
90+
{{#i18n 'label.other'}}Other{{/i18n}}
91+
</option>
7592
</select>
7693
</div>
7794
{{/if}}
7895
</div>
79-
<p class="help">{{#i18n 'source_lang_select_help'}}If the source contains multiple languages,
80-
please select 'Other'.{{/i18n}}</p>
96+
<p class="help">
97+
{{#i18n 'upload.source-lang-select-help'
98+
}}If the source contains multiple languages, please select 'Other'.{{/i18n}}
99+
</p>
81100
</div>
82101

83102
<div class="field">
84-
<label class="label">{{#i18n 'source_type'}}Type of source{{/i18n}}</label>
103+
<label class="label">{{#i18n 'label.source-type'}}Type of source{{/i18n}}</label>
85104
{{#if readonly}}
86105
<div class="control">
87106
<input name='sourceType' class="input" type="text" readonly>
@@ -90,27 +109,27 @@
90109
<div class="control sourceTypeSelect">
91110
</div>
92111
{{/if}}
93-
<p class="help">{{#i18n 'source_type_select_help'}}When in doubt, choose 'Unknown'.{{/i18n}}</p>
112+
<p class="help">{{#i18n 'upload.source-type-select-help'}}When in doubt, choose 'Unknown'.{{/i18n}}</p>
94113
</div>
95114
<div class="dates">
96115
{{!date fields with type-aware help will be rendered here}}
97116
</div>
98117
<div class="field">
99118
<div class="control">
100-
<label class="label">{{#i18n 'source_access'}}Source access{{/i18n}}</label>
119+
<label class="label">{{#i18n 'label.source-access'}}Source access{{/i18n}}</label>
101120
<label class="radio">
102121
<input type="radio" name="public" value="public" checked>
103-
{{#i18n 'public'}}Public{{/i18n}}
122+
{{#i18n 'label.public'}}Public{{/i18n}}
104123
</label>
105124
<label class="radio">
106125
<input type="radio" name="public" value="private">
107-
{{#i18n 'private'}}Private{{/i18n}}
126+
{{#i18n 'label.private'}}Private{{/i18n}}
108127
</label>
109-
<p class="help">{{#i18n 'public_private_help'}}Provide access to everyone (public) or only to authenticated users (private).{{/i18n}}</p>
128+
<p class="help">{{#i18n 'upload.public-private-help'}}Provide access to everyone (public) or only to authenticated users (private).{{/i18n}}</p>
110129
</div>
111130
</div>
112131
<div class="field url">
113-
<label class="label">{{#i18n 'url_opt'}}URL (optional){{/i18n}}</label>
132+
<label class="label">{{#i18n 'label.url-opt'}}URL (optional){{/i18n}}</label>
114133
<div class="control">
115134
<input name="url" class="input" type="url" {{#unless readonly}}placeholder="https://www.wikidata.org/wiki/Q331656"{{/unless}} {{#readonly}}readonly{{/readonly}}>
116135
</div>

‎frontend/src/source-metadata/source-metadata-view.ts

+19-7
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,35 @@ export default class SourceMetadataView extends CompositeView {
8484
model: this.getNode('datePublished'),
8585
name: 'datePublished',
8686
required: true,
87-
label: i18next.t('publication_date', 'Publication date'),
88-
additionalHelpText: i18next.t('publication_date_help', `<a href="https://en.wikipedia.org/wiki/ISO_8601" target="_blank">ISO formatted
89-
date with optional time and timezone</a>, or free-form text`),
87+
label: i18next.t('label.publication-date', 'Publication date'),
88+
additionalHelpText: `
89+
${i18next.t(
90+
'upload.publication-date-help.begin'
91+
)}<a
92+
href="https://en.wikipedia.org/wiki/ISO_8601"
93+
target="_blank"
94+
>${i18next.t(
95+
'upload.publication-date-help.link',
96+
'ISO formatted date with optional time and timezone'
97+
)}</a>${i18next.t(
98+
'upload.publication-date-help.end',
99+
', or free-form text'
100+
)}
101+
`),
90102
readonly: this.readonly
91103
});
92104
this.creationDateField = new DateField({
93105
model: this.getNode('dateCreated'),
94106
name: 'dateCreated',
95-
label: i18next.t('creation_date_opt', 'Creation date (optional)'),
96-
additionalHelpText: i18next.t('creation_date_help', 'If known and different from publishing date, specify creation date.'),
107+
label: i18next.t('label.creation-date-opt', 'Creation date (optional)'),
108+
additionalHelpText: i18next.t('upload.creation-date-help', 'If known and different from publishing date, specify creation date.'),
97109
readonly: this.readonly
98110
});
99111
this.retrievalDateField = new DateField({
100112
model: this.getNode('dateRetrieved'),
101113
name: 'dateRetrieved',
102-
label: i18next.t('retrieval_date_opt', 'Retrieval date (optional)'),
103-
additionalHelpText: i18next.t('retrieval_date_help', 'Date (and optional time) at which the source was accessed or retrieved.'),
114+
label: i18next.t('label.retrieval-date-opt', 'Retrieval date (optional)'),
115+
additionalHelpText: i18next.t('upload.retrieval-date-help', 'Date (and optional time) at which the source was accessed or retrieved.'),
104116
readonly: this.readonly
105117
});
106118
this.render();

‎frontend/src/upload/upload-source-template.hbs

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
<header>
2-
<h3 class="title is-3 page-header">{{#i18n 'upload_source'}}Upload source{{/i18n}}</h3>
2+
<h3 class="title is-3 page-header">{{#i18n 'upload.form-title'}}Upload source{{/i18n}}</h3>
33
</header>
44
<div class="section upload-source">
55

66
<div class="field form-feedback-bar has-background-success">
77
<p class="help">
8-
{{#i18n 'upload_success_before_link'}}Source uploaded successfully! Upload another one or{{/i18n}}
9-
<a href="/explore">{{#i18n 'upload_success_link'}}go to the Explorer{{/i18n}}</a>{{#i18n 'upload_success_after_link'}}.{{/i18n}}
8+
{{#i18n 'upload.success.begin'
9+
}}Source uploaded successfully! Upload another one or {{/i18n
10+
}}<a href="/explore">{{#i18n 'upload.success.link'
11+
}}go to the Explorer{{/i18n
12+
}}</a>{{#i18n 'upload.success.end'
13+
}}.{{/i18n}}
1014
</p>
1115
</div>
1216
<div class="field form-feedback-bar has-background-danger has-text-white">
13-
<p class="help">{{#i18n 'upload_failed_help'}}
17+
<p class="help">{{#i18n 'upload.failed-help'}}
1418
Uploading failed.
1519
Please try again and if this error keeps occuring,
1620
contact the site administrator.
@@ -19,25 +23,25 @@
1923
</div>
2024
<div class="field is-grouped">
2125
<div class="control">
22-
<button type=submit class="button is-link btn-submit">{{#i18n 'submit'}}Submit{{/i18n}}</button>
26+
<button type=submit class="button is-link btn-submit">{{#i18n 'button.submit'}}Submit{{/i18n}}</button>
2327
</div>
2428
<div class="control">
25-
<button type=button class="button is-link is-light btn-preview">{{#i18n 'preview'}}Preview{{/i18n}}</button>
29+
<button type=button class="button is-link is-light btn-preview">{{#i18n 'button.preview'}}Preview{{/i18n}}</button>
2630
</div>
2731
<div class="control">
28-
<button type=reset class="button is-link is-light btn-cancel">{{#i18n 'cancel'}}Cancel{{/i18n}}</button>
32+
<button type=reset class="button is-link is-light btn-cancel">{{#i18n 'button.cancel'}}Cancel{{/i18n}}</button>
2933
</div>
3034
</div>
3135
</div>
3236
<div class="modal is-clipped">
3337
<div class="modal-background"></div>
3438
<div class="modal-card">
3539
<header class="modal-card-head">
36-
<p class="modal-card-title">{{#i18n 'preview_source'}}Preview source content{{/i18n}}</p>
40+
<p class="modal-card-title">{{#i18n 'upload.preview-title'}}Preview source content{{/i18n}}</p>
3741
<button
3842
type=button
3943
class="delete"
40-
aria-label="{{#i18n 'close'}}close{{/i18n}}"
44+
aria-label="{{#i18n 'button.close'}}close{{/i18n}}"
4145
>
4246
<i class="fas fa-times"></i>
4347
</button>

0 commit comments

Comments
 (0)