Skip to content

Commit 9ab377a

Browse files
arthur-lemeurdanielweck
arthur-lemeur
and
danielweck
authored
fix: additional labelling information in the "settings" GUI to describe actions and choices (PR #2712 Fixes #2628)
Co-authored-by: Daniel Weck <daniel.weck@gmail.com>
1 parent 8af31d6 commit 9ab377a

File tree

30 files changed

+121
-14
lines changed

30 files changed

+121
-14
lines changed

‎src/main/redux/sagas/win/library.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function* winClose(_action: winActions.library.closed.TAction) {
224224
// ],
225225
// defaultId: 1,
226226
// title: translator.translate("app.session.exit.askBox.title"),
227-
// message: translator.translate("app.session.exit.askBox.message"),
227+
// message: translator.translate("app.session.exit.askBox.help"),
228228
// },
229229
// );
230230
// },

‎src/renderer/library/components/settings/Settings.tsx‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const LanguageSettings: React.FC<{}> = () => {
7777
};
7878
const selectedKey = options.find(({name}) => name === currentLanguageString);
7979
return (
80-
<ComboBox label={__("settings.language.languageChoice")} defaultItems={options} defaultSelectedKey={selectedKey?.id} onSelectionChange={setLang} svg={LanguageIcon}>
80+
<ComboBox label={__("settings.language.languageChoice")} defaultItems={options} defaultSelectedKey={selectedKey?.id} onSelectionChange={setLang} svg={LanguageIcon} style={{borderBottom: "2px solid var(--color-extralight-grey)"}}>
8181
{item => <ComboBoxItem>{item.name}</ComboBoxItem>}
8282
</ComboBox>
8383
);
@@ -102,6 +102,10 @@ const ConnectionSettings: React.FC<{}> = () => {
102102
return (
103103
<section className={stylesSettings.section} style={{ position: "relative" }}>
104104
<h4>{__("settings.auth.title")}</h4>
105+
<div className={stylesSettings.session_text}>
106+
<SVG ariaHidden svg={InfoIcon} />
107+
<p>{__("settings.auth.help")}</p>
108+
</div>
105109
<Auth />
106110
</section>
107111
);
@@ -117,6 +121,10 @@ const SaveSessionSettings: React.FC<{}> = () => {
117121
return (
118122
<section className={stylesSettings.section} style={{ position: "relative" }}>
119123
<h4>{__("app.session.exit.askBox.message")}</h4>
124+
<div className={stylesSettings.session_text} style={{ margin: "0" }}>
125+
<SVG ariaHidden svg={InfoIcon} />
126+
<p>{__("app.session.exit.askBox.help")}</p>
127+
</div>
120128
<div className={stylesAnnotations.annotations_checkbox}>
121129
<input type="checkbox" id="saveSessionSettings" className={stylesGlobal.checkbox_custom_input} name="saveSessionSettings" checked={sessionSaveState} onChange={onChange} />
122130
<label htmlFor="saveSessionSettings" className={stylesGlobal.checkbox_custom_label}>
@@ -197,8 +205,12 @@ const SaveCreatorSettings: React.FC<{}> = () => {
197205
return (
198206
<section className={stylesSettings.section} style={{ position: "relative" }}>
199207
<h4>{__("settings.annotationCreator.creator")}</h4>
200-
<div className={stylesInput.form_group} style={{marginTop: "20px", width: "360px"}}>
201-
<input type="text" name="creator-name" style={{width: "100%", marginLeft: "10px"}} className="R2_CSS_CLASS__FORCE_NO_FOCUS_OUTLINE" title={name} value={name} onChange={(e) => {
208+
<div className={stylesSettings.session_text} style={{ margin: "0" }}>
209+
<SVG ariaHidden svg={InfoIcon} />
210+
<p>{__("settings.annotationCreator.help")}</p>
211+
</div>
212+
<div className={stylesInput.form_group} style={{ marginTop: "20px", width: "360px"}}>
213+
<input type="text" name="creator-name" style={{ width: "100%", marginLeft: "10px" }} className="R2_CSS_CLASS__FORCE_NO_FOCUS_OUTLINE" title={name} value={name} onChange={(e) => {
202214
const v = e.target.value;
203215
setName(v);
204216
}} />

‎src/resources/locales/ar.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"no": "لا",
3535
"yes": "نعم"
3636
},
37+
"help": "",
3738
"message": "هل تريد حفظ الجلسة؟",
3839
"title": "حفظ الجلسة"
3940
}
@@ -531,12 +532,14 @@
531532
"settings": {
532533
"annotationCreator": {
533534
"creator": "",
535+
"help": "",
534536
"name": "",
535537
"organization": "",
536538
"person": "",
537539
"type": ""
538540
},
539541
"auth": {
542+
"help": "",
540543
"title": "",
541544
"wipeData": "حذف بيانات تسجيل الدخول"
542545
},

‎src/resources/locales/bg.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"no": "Не",
3535
"yes": "Да"
3636
},
37+
"help": "",
3738
"message": "Искате ли да запазите сесията ?",
3839
"title": "Запази сесията"
3940
}
@@ -531,12 +532,14 @@
531532
"settings": {
532533
"annotationCreator": {
533534
"creator": "",
535+
"help": "",
534536
"name": "",
535537
"organization": "",
536538
"person": "",
537539
"type": ""
538540
},
539541
"auth": {
542+
"help": "",
540543
"title": "",
541544
"wipeData": "Изтриване на данните за удостоверяване"
542545
},

‎src/resources/locales/ca.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"no": "No",
3535
"yes": "Sí"
3636
},
37+
"help": "",
3738
"message": "Vols guardar la sessió?",
3839
"title": "Guardar sessió"
3940
}
@@ -531,12 +532,14 @@
531532
"settings": {
532533
"annotationCreator": {
533534
"creator": "",
535+
"help": "",
534536
"name": "",
535537
"organization": "",
536538
"person": "",
537539
"type": ""
538540
},
539541
"auth": {
542+
"help": "",
540543
"title": "",
541544
"wipeData": "Netejar dades d'autenticació"
542545
},

‎src/resources/locales/da.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"no": "Nej",
3535
"yes": "Ja"
3636
},
37+
"help": "",
3738
"message": "Ønsker du at gemme denne session?",
3839
"title": "Gem session"
3940
}
@@ -529,12 +530,14 @@
529530
"settings": {
530531
"annotationCreator": {
531532
"creator": "Opretter",
533+
"help": "",
532534
"name": "Navn",
533535
"organization": "Organisation",
534536
"person": "Person",
535537
"type": "Type:"
536538
},
537539
"auth": {
540+
"help": "",
538541
"title": "Administrér adgang til kataloger",
539542
"wipeData": "Nulstil login-data"
540543
},

‎src/resources/locales/de.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"no": "Nein",
3535
"yes": "Ja"
3636
},
37+
"help": "",
3738
"message": "Möchten Sie die Sitzung speichern?",
3839
"title": "Sitzung sichern"
3940
}
@@ -531,12 +532,14 @@
531532
"settings": {
532533
"annotationCreator": {
533534
"creator": "",
535+
"help": "",
534536
"name": "",
535537
"organization": "",
536538
"person": "",
537539
"type": ""
538540
},
539541
"auth": {
542+
"help": "",
540543
"title": "",
541544
"wipeData": "Login-Daten löschen"
542545
},

‎src/resources/locales/el.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"no": "Όχι",
3535
"yes": "Ναι"
3636
},
37+
"help": "",
3738
"message": "Θέλεις να αποθηκεύσεις τη συνεδρία;",
3839
"title": "Αποθήκευση συνεδρίας"
3940
}
@@ -531,12 +532,14 @@
531532
"settings": {
532533
"annotationCreator": {
533534
"creator": "",
535+
"help": "",
534536
"name": "",
535537
"organization": "",
536538
"person": "",
537539
"type": ""
538540
},
539541
"auth": {
542+
"help": "",
540543
"title": "",
541544
"wipeData": "Διαγραφή δεδομένων ελέγχου ταυτότητας"
542545
},

‎src/resources/locales/en.json‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@
3434
"no": "No",
3535
"yes": "Yes"
3636
},
37-
"message": "Do you want to save the session?",
38-
"title": "Save session"
37+
"help": "Activate this if you want reader windows that are open when you close the application to automatically re-open at next launch.",
38+
"message": "Saving and restoring the reading session",
39+
"title": "Save session?"
3940
}
4041
}
4142
},
@@ -530,14 +531,16 @@
530531
},
531532
"settings": {
532533
"annotationCreator": {
533-
"creator": "Creator",
534+
"creator": "Annotations creator (optional)",
535+
"help": "If specified, this name will be included in the metadata of exported notes.",
534536
"name": "Name",
535537
"organization": "Organization",
536538
"person": "Person",
537539
"type": "Type:"
538540
},
539541
"auth": {
540-
"title": "Manage access to catalogs",
542+
"help": "This action deletes all OPDS login credentials.",
543+
"title": "Access to publication catalogs",
541544
"wipeData": "Clear login data"
542545
},
543546
"keyboard": {
@@ -554,11 +557,11 @@
554557
"languageChoice": "Language"
555558
},
556559
"library": {
557-
"enableAPIAPP": "Activate access to the French library system (PNB)",
558-
"title": "Add a French library account"
560+
"enableAPIAPP": "Activate the 'PNB' library system",
561+
"title": "Access to French library accounts"
559562
},
560563
"session": {
561-
"title": "Save session"
564+
"title": "Enable session saving"
562565
},
563566
"tabs": {
564567
"appearance": "Appearance",

‎src/resources/locales/es.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"no": "No",
3535
"yes": "Sí"
3636
},
37+
"help": "",
3738
"message": "¿Quieres guardar la sesión?",
3839
"title": "Guardar sesión"
3940
}
@@ -531,12 +532,14 @@
531532
"settings": {
532533
"annotationCreator": {
533534
"creator": "",
535+
"help": "",
534536
"name": "",
535537
"organization": "",
536538
"person": "",
537539
"type": ""
538540
},
539541
"auth": {
542+
"help": "",
540543
"title": "",
541544
"wipeData": "Borrar datos de autenticación"
542545
},

0 commit comments

Comments
 (0)