aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-09-30 10:41:20 +0200
committerLibravatar vantezzen <hello@vantezzen.io>2019-09-30 10:41:20 +0200
commitb65b3344163248feb316047ad9b70120db84e396 (patch)
treee87b0c0a0c87f35d420af8bfb2d9bb163b613712
parentFix termsBase generation (diff)
downloadferdium-app-b65b3344163248feb316047ad9b70120db84e396.tar.gz
ferdium-app-b65b3344163248feb316047ad9b70120db84e396.tar.zst
ferdium-app-b65b3344163248feb316047ad9b70120db84e396.zip
Add texts in settings to i18n
-rw-r--r--src/components/settings/settings/EditSettingsForm.js56
-rw-r--r--src/i18n/apply-branding.js1
-rw-r--r--src/i18n/locales/defaultMessages.json122
-rw-r--r--src/i18n/locales/en-US.json4
-rw-r--r--src/i18n/messages/src/components/settings/settings/EditSettingsForm.json122
5 files changed, 184 insertions, 121 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 6552220f1..1d2383125 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -13,6 +13,15 @@ import Input from '../../ui/Input';
13 13
14import { FRANZ_TRANSLATION } from '../../../config'; 14import { FRANZ_TRANSLATION } from '../../../config';
15 15
16function escapeHtml(unsafe) {
17 return unsafe
18 .replace(/&/g, '&amp;')
19 .replace(/</g, '&lt;')
20 .replace(/>/g, '&gt;')
21 .replace(/"/g, '&quot;')
22 .replace(/'/g, '&#039;');
23}
24
16const messages = defineMessages({ 25const messages = defineMessages({
17 headline: { 26 headline: {
18 id: 'settings.app.headline', 27 id: 'settings.app.headline',
@@ -26,6 +35,10 @@ const messages = defineMessages({
26 id: 'settings.app.serverInfo', 35 id: 'settings.app.serverInfo',
27 defaultMessage: '!!!We advice you to logout after changing your server as your settings might not be saved otherwise.', 36 defaultMessage: '!!!We advice you to logout after changing your server as your settings might not be saved otherwise.',
28 }, 37 },
38 serverMoneyInfo: {
39 id: 'settings.app.serverMoneyInfo',
40 defaultMessage: '!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz\'s server resources - which Franz\'s creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz\'s recipe store, server resources and its development.',
41 },
29 todoServerInfo: { 42 todoServerInfo: {
30 id: 'settings.app.todoServerInfo', 43 id: 'settings.app.todoServerInfo',
31 defaultMessage: '!!!This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)', 44 defaultMessage: '!!!This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)',
@@ -38,6 +51,10 @@ const messages = defineMessages({
38 id: 'settings.app.lockedPasswordInfo', 51 id: 'settings.app.lockedPasswordInfo',
39 defaultMessage: '!!!Please make sure to set a password you\'ll remember.\nIf you loose this password, you will have to reinstall Ferdi.', 52 defaultMessage: '!!!Please make sure to set a password you\'ll remember.\nIf you loose this password, you will have to reinstall Ferdi.',
40 }, 53 },
54 lockInfo: {
55 id: 'settings.app.lockInfo',
56 defaultMessage: '!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.',
57 },
41 scheduledDNDTimeInfo: { 58 scheduledDNDTimeInfo: {
42 id: 'settings.app.scheduledDNDTimeInfo', 59 id: 'settings.app.scheduledDNDTimeInfo',
43 defaultMessage: '!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.', 60 defaultMessage: '!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.',
@@ -218,24 +235,20 @@ export default @observer class EditSettingsForm extends Component {
218 borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', 235 borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
219 }} 236 }}
220 > 237 >
221 <span> 238 <span
222 You are using the official Franz Server for Ferdi. 239 dangerouslySetInnerHTML={{
223 <br /> 240 __html:
224 We know that Ferdi allows you to use all its features for free but you are 241 // Needed to make links work
225 still using Franz&#x27;s server resources - which Franz&#x27;s creator has to pay for. 242 escapeHtml(
226 <br /> 243 intl.formatMessage(messages.serverMoneyInfo),
227 Please still consider 244 ).replace('[Link 1]', '<a href="https://www.meetfranz.com/pricing" target="_blank">')
228 {' '} 245 .replace('[Link 2]', '<a href="https://github.com/getferdi/server" target="_blank">')
229 <a href="https://www.meetfranz.com/pricing" target="_blank">paying for a Franz account</a> 246 .replace(/\[\/Link]/g, '</a>'),
230 {' '} 247 }}
231 or 248 style={{
232 {' '} 249 whiteSpace: 'pre-wrap',
233 <a href="https://github.com/getferdi/server" target="_blank">using a self-hosted ferdi-server</a> 250 }}
234 {' '} 251 />
235 (if you have the knowledge and resources to do so).
236 <br />
237 By using Ferdi, you still profit greatly from Franz&#x27;s recipe store, server resources and its development.
238 </span>
239 </p> 252 </p>
240 )} 253 )}
241 {isWorkspaceEnabled && ( 254 {isWorkspaceEnabled && (
@@ -276,12 +289,7 @@ export default @observer class EditSettingsForm extends Component {
276 }} 289 }}
277 > 290 >
278 <span> 291 <span>
279 Ferdi password lock allows you to keep your messages protected. 292 { intl.formatMessage(messages.lockInfo) }
280 <br />
281 Using Ferdi password lock, you will be prompted to enter your password everytime you
282 start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut
283 {' '}
284 <code>CMD/CTRL+Shift+L</code>
285 </span> 293 </span>
286 </p> 294 </p>
287 295
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js
index 7e706ca55..662799ab0 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.js
@@ -9,6 +9,7 @@ console.log('Applying Ferdi branding to translations...');
9// Keys to ignore when applying branding 9// Keys to ignore when applying branding
10const ignore = [ 10const ignore = [
11 'login.customServerSuggestion', 11 'login.customServerSuggestion',
12 'settings.app.todoServerInfo',
12]; 13];
13 14
14// Files to ignore when applying branding 15// Files to ignore when applying branding
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index 8022aed3b..4033407e3 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -2465,312 +2465,338 @@
2465 "defaultMessage": "!!!Settings", 2465 "defaultMessage": "!!!Settings",
2466 "end": { 2466 "end": {
2467 "column": 3, 2467 "column": 3,
2468 "line": 20 2468 "line": 29
2469 }, 2469 },
2470 "file": "src/components/settings/settings/EditSettingsForm.js", 2470 "file": "src/components/settings/settings/EditSettingsForm.js",
2471 "id": "settings.app.headline", 2471 "id": "settings.app.headline",
2472 "start": { 2472 "start": {
2473 "column": 12, 2473 "column": 12,
2474 "line": 17 2474 "line": 26
2475 } 2475 }
2476 }, 2476 },
2477 { 2477 {
2478 "defaultMessage": "!!!General", 2478 "defaultMessage": "!!!General",
2479 "end": { 2479 "end": {
2480 "column": 3, 2480 "column": 3,
2481 "line": 24 2481 "line": 33
2482 }, 2482 },
2483 "file": "src/components/settings/settings/EditSettingsForm.js", 2483 "file": "src/components/settings/settings/EditSettingsForm.js",
2484 "id": "settings.app.headlineGeneral", 2484 "id": "settings.app.headlineGeneral",
2485 "start": { 2485 "start": {
2486 "column": 19, 2486 "column": 19,
2487 "line": 21 2487 "line": 30
2488 } 2488 }
2489 }, 2489 },
2490 { 2490 {
2491 "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", 2491 "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
2492 "end": { 2492 "end": {
2493 "column": 3, 2493 "column": 3,
2494 "line": 28 2494 "line": 37
2495 }, 2495 },
2496 "file": "src/components/settings/settings/EditSettingsForm.js", 2496 "file": "src/components/settings/settings/EditSettingsForm.js",
2497 "id": "settings.app.serverInfo", 2497 "id": "settings.app.serverInfo",
2498 "start": { 2498 "start": {
2499 "column": 14, 2499 "column": 14,
2500 "line": 25 2500 "line": 34
2501 }
2502 },
2503 {
2504 "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
2505 "end": {
2506 "column": 3,
2507 "line": 41
2508 },
2509 "file": "src/components/settings/settings/EditSettingsForm.js",
2510 "id": "settings.app.serverMoneyInfo",
2511 "start": {
2512 "column": 19,
2513 "line": 38
2501 } 2514 }
2502 }, 2515 },
2503 { 2516 {
2504 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", 2517 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
2505 "end": { 2518 "end": {
2506 "column": 3, 2519 "column": 3,
2507 "line": 32 2520 "line": 45
2508 }, 2521 },
2509 "file": "src/components/settings/settings/EditSettingsForm.js", 2522 "file": "src/components/settings/settings/EditSettingsForm.js",
2510 "id": "settings.app.todoServerInfo", 2523 "id": "settings.app.todoServerInfo",
2511 "start": { 2524 "start": {
2512 "column": 18, 2525 "column": 18,
2513 "line": 29 2526 "line": 42
2514 } 2527 }
2515 }, 2528 },
2516 { 2529 {
2517 "defaultMessage": "!!!Ferdi Lock Password", 2530 "defaultMessage": "!!!Ferdi Lock Password",
2518 "end": { 2531 "end": {
2519 "column": 3, 2532 "column": 3,
2520 "line": 36 2533 "line": 49
2521 }, 2534 },
2522 "file": "src/components/settings/settings/EditSettingsForm.js", 2535 "file": "src/components/settings/settings/EditSettingsForm.js",
2523 "id": "settings.app.lockedPassword", 2536 "id": "settings.app.lockedPassword",
2524 "start": { 2537 "start": {
2525 "column": 18, 2538 "column": 18,
2526 "line": 33 2539 "line": 46
2527 } 2540 }
2528 }, 2541 },
2529 { 2542 {
2530 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", 2543 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
2531 "end": { 2544 "end": {
2532 "column": 3, 2545 "column": 3,
2533 "line": 40 2546 "line": 53
2534 }, 2547 },
2535 "file": "src/components/settings/settings/EditSettingsForm.js", 2548 "file": "src/components/settings/settings/EditSettingsForm.js",
2536 "id": "settings.app.lockedPasswordInfo", 2549 "id": "settings.app.lockedPasswordInfo",
2537 "start": { 2550 "start": {
2538 "column": 22, 2551 "column": 22,
2539 "line": 37 2552 "line": 50
2553 }
2554 },
2555 {
2556 "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
2557 "end": {
2558 "column": 3,
2559 "line": 57
2560 },
2561 "file": "src/components/settings/settings/EditSettingsForm.js",
2562 "id": "settings.app.lockInfo",
2563 "start": {
2564 "column": 12,
2565 "line": 54
2540 } 2566 }
2541 }, 2567 },
2542 { 2568 {
2543 "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", 2569 "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
2544 "end": { 2570 "end": {
2545 "column": 3, 2571 "column": 3,
2546 "line": 44 2572 "line": 61
2547 }, 2573 },
2548 "file": "src/components/settings/settings/EditSettingsForm.js", 2574 "file": "src/components/settings/settings/EditSettingsForm.js",
2549 "id": "settings.app.scheduledDNDTimeInfo", 2575 "id": "settings.app.scheduledDNDTimeInfo",
2550 "start": { 2576 "start": {
2551 "column": 24, 2577 "column": 24,
2552 "line": 41 2578 "line": 58
2553 } 2579 }
2554 }, 2580 },
2555 { 2581 {
2556 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", 2582 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
2557 "end": { 2583 "end": {
2558 "column": 3, 2584 "column": 3,
2559 "line": 48 2585 "line": 65
2560 }, 2586 },
2561 "file": "src/components/settings/settings/EditSettingsForm.js", 2587 "file": "src/components/settings/settings/EditSettingsForm.js",
2562 "id": "settings.app.scheduledDNDInfo", 2588 "id": "settings.app.scheduledDNDInfo",
2563 "start": { 2589 "start": {
2564 "column": 20, 2590 "column": 20,
2565 "line": 45 2591 "line": 62
2566 } 2592 }
2567 }, 2593 },
2568 { 2594 {
2569 "defaultMessage": "!!!Language", 2595 "defaultMessage": "!!!Language",
2570 "end": { 2596 "end": {
2571 "column": 3, 2597 "column": 3,
2572 "line": 52 2598 "line": 69
2573 }, 2599 },
2574 "file": "src/components/settings/settings/EditSettingsForm.js", 2600 "file": "src/components/settings/settings/EditSettingsForm.js",
2575 "id": "settings.app.headlineLanguage", 2601 "id": "settings.app.headlineLanguage",
2576 "start": { 2602 "start": {
2577 "column": 20, 2603 "column": 20,
2578 "line": 49 2604 "line": 66
2579 } 2605 }
2580 }, 2606 },
2581 { 2607 {
2582 "defaultMessage": "!!!Updates", 2608 "defaultMessage": "!!!Updates",
2583 "end": { 2609 "end": {
2584 "column": 3, 2610 "column": 3,
2585 "line": 56 2611 "line": 73
2586 }, 2612 },
2587 "file": "src/components/settings/settings/EditSettingsForm.js", 2613 "file": "src/components/settings/settings/EditSettingsForm.js",
2588 "id": "settings.app.headlineUpdates", 2614 "id": "settings.app.headlineUpdates",
2589 "start": { 2615 "start": {
2590 "column": 19, 2616 "column": 19,
2591 "line": 53 2617 "line": 70
2592 } 2618 }
2593 }, 2619 },
2594 { 2620 {
2595 "defaultMessage": "!!!Appearance", 2621 "defaultMessage": "!!!Appearance",
2596 "end": { 2622 "end": {
2597 "column": 3, 2623 "column": 3,
2598 "line": 60 2624 "line": 77
2599 }, 2625 },
2600 "file": "src/components/settings/settings/EditSettingsForm.js", 2626 "file": "src/components/settings/settings/EditSettingsForm.js",
2601 "id": "settings.app.headlineAppearance", 2627 "id": "settings.app.headlineAppearance",
2602 "start": { 2628 "start": {
2603 "column": 22, 2629 "column": 22,
2604 "line": 57 2630 "line": 74
2605 } 2631 }
2606 }, 2632 },
2607 { 2633 {
2608 "defaultMessage": "!!!Advanced", 2634 "defaultMessage": "!!!Advanced",
2609 "end": { 2635 "end": {
2610 "column": 3, 2636 "column": 3,
2611 "line": 64 2637 "line": 81
2612 }, 2638 },
2613 "file": "src/components/settings/settings/EditSettingsForm.js", 2639 "file": "src/components/settings/settings/EditSettingsForm.js",
2614 "id": "settings.app.headlineAdvanced", 2640 "id": "settings.app.headlineAdvanced",
2615 "start": { 2641 "start": {
2616 "column": 20, 2642 "column": 20,
2617 "line": 61 2643 "line": 78
2618 } 2644 }
2619 }, 2645 },
2620 { 2646 {
2621 "defaultMessage": "!!!Help us to translate Ferdi into your language.", 2647 "defaultMessage": "!!!Help us to translate Ferdi into your language.",
2622 "end": { 2648 "end": {
2623 "column": 3, 2649 "column": 3,
2624 "line": 68 2650 "line": 85
2625 }, 2651 },
2626 "file": "src/components/settings/settings/EditSettingsForm.js", 2652 "file": "src/components/settings/settings/EditSettingsForm.js",
2627 "id": "settings.app.translationHelp", 2653 "id": "settings.app.translationHelp",
2628 "start": { 2654 "start": {
2629 "column": 19, 2655 "column": 19,
2630 "line": 65 2656 "line": 82
2631 } 2657 }
2632 }, 2658 },
2633 { 2659 {
2634 "defaultMessage": "!!!Cache", 2660 "defaultMessage": "!!!Cache",
2635 "end": { 2661 "end": {
2636 "column": 3, 2662 "column": 3,
2637 "line": 72 2663 "line": 89
2638 }, 2664 },
2639 "file": "src/components/settings/settings/EditSettingsForm.js", 2665 "file": "src/components/settings/settings/EditSettingsForm.js",
2640 "id": "settings.app.subheadlineCache", 2666 "id": "settings.app.subheadlineCache",
2641 "start": { 2667 "start": {
2642 "column": 20, 2668 "column": 20,
2643 "line": 69 2669 "line": 86
2644 } 2670 }
2645 }, 2671 },
2646 { 2672 {
2647 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", 2673 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
2648 "end": { 2674 "end": {
2649 "column": 3, 2675 "column": 3,
2650 "line": 76 2676 "line": 93
2651 }, 2677 },
2652 "file": "src/components/settings/settings/EditSettingsForm.js", 2678 "file": "src/components/settings/settings/EditSettingsForm.js",
2653 "id": "settings.app.cacheInfo", 2679 "id": "settings.app.cacheInfo",
2654 "start": { 2680 "start": {
2655 "column": 13, 2681 "column": 13,
2656 "line": 73 2682 "line": 90
2657 } 2683 }
2658 }, 2684 },
2659 { 2685 {
2660 "defaultMessage": "!!!Clear cache", 2686 "defaultMessage": "!!!Clear cache",
2661 "end": { 2687 "end": {
2662 "column": 3, 2688 "column": 3,
2663 "line": 80 2689 "line": 97
2664 }, 2690 },
2665 "file": "src/components/settings/settings/EditSettingsForm.js", 2691 "file": "src/components/settings/settings/EditSettingsForm.js",
2666 "id": "settings.app.buttonClearAllCache", 2692 "id": "settings.app.buttonClearAllCache",
2667 "start": { 2693 "start": {
2668 "column": 23, 2694 "column": 23,
2669 "line": 77 2695 "line": 94
2670 } 2696 }
2671 }, 2697 },
2672 { 2698 {
2673 "defaultMessage": "!!!Check for updates", 2699 "defaultMessage": "!!!Check for updates",
2674 "end": { 2700 "end": {
2675 "column": 3, 2701 "column": 3,
2676 "line": 84 2702 "line": 101
2677 }, 2703 },
2678 "file": "src/components/settings/settings/EditSettingsForm.js", 2704 "file": "src/components/settings/settings/EditSettingsForm.js",
2679 "id": "settings.app.buttonSearchForUpdate", 2705 "id": "settings.app.buttonSearchForUpdate",
2680 "start": { 2706 "start": {
2681 "column": 25, 2707 "column": 25,
2682 "line": 81 2708 "line": 98
2683 } 2709 }
2684 }, 2710 },
2685 { 2711 {
2686 "defaultMessage": "!!!Restart & install update", 2712 "defaultMessage": "!!!Restart & install update",
2687 "end": { 2713 "end": {
2688 "column": 3, 2714 "column": 3,
2689 "line": 88 2715 "line": 105
2690 }, 2716 },
2691 "file": "src/components/settings/settings/EditSettingsForm.js", 2717 "file": "src/components/settings/settings/EditSettingsForm.js",
2692 "id": "settings.app.buttonInstallUpdate", 2718 "id": "settings.app.buttonInstallUpdate",
2693 "start": { 2719 "start": {
2694 "column": 23, 2720 "column": 23,
2695 "line": 85 2721 "line": 102
2696 } 2722 }
2697 }, 2723 },
2698 { 2724 {
2699 "defaultMessage": "!!!Is searching for update", 2725 "defaultMessage": "!!!Is searching for update",
2700 "end": { 2726 "end": {
2701 "column": 3, 2727 "column": 3,
2702 "line": 92 2728 "line": 109
2703 }, 2729 },
2704 "file": "src/components/settings/settings/EditSettingsForm.js", 2730 "file": "src/components/settings/settings/EditSettingsForm.js",
2705 "id": "settings.app.updateStatusSearching", 2731 "id": "settings.app.updateStatusSearching",
2706 "start": { 2732 "start": {
2707 "column": 25, 2733 "column": 25,
2708 "line": 89 2734 "line": 106
2709 } 2735 }
2710 }, 2736 },
2711 { 2737 {
2712 "defaultMessage": "!!!Update available, downloading...", 2738 "defaultMessage": "!!!Update available, downloading...",
2713 "end": { 2739 "end": {
2714 "column": 3, 2740 "column": 3,
2715 "line": 96 2741 "line": 113
2716 }, 2742 },
2717 "file": "src/components/settings/settings/EditSettingsForm.js", 2743 "file": "src/components/settings/settings/EditSettingsForm.js",
2718 "id": "settings.app.updateStatusAvailable", 2744 "id": "settings.app.updateStatusAvailable",
2719 "start": { 2745 "start": {
2720 "column": 25, 2746 "column": 25,
2721 "line": 93 2747 "line": 110
2722 } 2748 }
2723 }, 2749 },
2724 { 2750 {
2725 "defaultMessage": "!!!You are using the latest version of Ferdi", 2751 "defaultMessage": "!!!You are using the latest version of Ferdi",
2726 "end": { 2752 "end": {
2727 "column": 3, 2753 "column": 3,
2728 "line": 100 2754 "line": 117
2729 }, 2755 },
2730 "file": "src/components/settings/settings/EditSettingsForm.js", 2756 "file": "src/components/settings/settings/EditSettingsForm.js",
2731 "id": "settings.app.updateStatusUpToDate", 2757 "id": "settings.app.updateStatusUpToDate",
2732 "start": { 2758 "start": {
2733 "column": 24, 2759 "column": 24,
2734 "line": 97 2760 "line": 114
2735 } 2761 }
2736 }, 2762 },
2737 { 2763 {
2738 "defaultMessage": "!!!Current version:", 2764 "defaultMessage": "!!!Current version:",
2739 "end": { 2765 "end": {
2740 "column": 3, 2766 "column": 3,
2741 "line": 104 2767 "line": 121
2742 }, 2768 },
2743 "file": "src/components/settings/settings/EditSettingsForm.js", 2769 "file": "src/components/settings/settings/EditSettingsForm.js",
2744 "id": "settings.app.currentVersion", 2770 "id": "settings.app.currentVersion",
2745 "start": { 2771 "start": {
2746 "column": 18, 2772 "column": 18,
2747 "line": 101 2773 "line": 118
2748 } 2774 }
2749 }, 2775 },
2750 { 2776 {
2751 "defaultMessage": "!!!Changes require restart", 2777 "defaultMessage": "!!!Changes require restart",
2752 "end": { 2778 "end": {
2753 "column": 3, 2779 "column": 3,
2754 "line": 108 2780 "line": 125
2755 }, 2781 },
2756 "file": "src/components/settings/settings/EditSettingsForm.js", 2782 "file": "src/components/settings/settings/EditSettingsForm.js",
2757 "id": "settings.app.restartRequired", 2783 "id": "settings.app.restartRequired",
2758 "start": { 2784 "start": {
2759 "column": 29, 2785 "column": 29,
2760 "line": 105 2786 "line": 122
2761 } 2787 }
2762 }, 2788 },
2763 { 2789 {
2764 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", 2790 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
2765 "end": { 2791 "end": {
2766 "column": 3, 2792 "column": 3,
2767 "line": 112 2793 "line": 129
2768 }, 2794 },
2769 "file": "src/components/settings/settings/EditSettingsForm.js", 2795 "file": "src/components/settings/settings/EditSettingsForm.js",
2770 "id": "settings.app.languageDisclaimer", 2796 "id": "settings.app.languageDisclaimer",
2771 "start": { 2797 "start": {
2772 "column": 22, 2798 "column": 22,
2773 "line": 109 2799 "line": 126
2774 } 2800 }
2775 } 2801 }
2776 ], 2802 ],
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 784a0aeb5..ad64bec14 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -247,14 +247,16 @@
247 "settings.app.headlineLanguage": "Language", 247 "settings.app.headlineLanguage": "Language",
248 "settings.app.headlineUpdates": "Updates", 248 "settings.app.headlineUpdates": "Updates",
249 "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.", 249 "settings.app.languageDisclaimer": "Official translations are English & German. All other languages are community based translations.",
250 "settings.app.lockInfo": "Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
250 "settings.app.lockedPassword": "Ferdi Lock Password", 251 "settings.app.lockedPassword": "Ferdi Lock Password",
251 "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", 252 "settings.app.lockedPasswordInfo": "Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
252 "settings.app.restartRequired": "Changes require restart", 253 "settings.app.restartRequired": "Changes require restart",
253 "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", 254 "settings.app.scheduledDNDInfo": "Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
254 "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", 255 "settings.app.scheduledDNDTimeInfo": "Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
255 "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.", 256 "settings.app.serverInfo": "We advice you to logout after changing your server as your settings might not be saved otherwise.",
257 "settings.app.serverMoneyInfo": "You are using the official Ferdi Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Ferdi's server resources - which Ferdi's creator has to pay for.\nPlease still consider [Link 1]paying for a Ferdi account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Ferdi's recipe store, server resources and its development.",
256 "settings.app.subheadlineCache": "Cache", 258 "settings.app.subheadlineCache": "Cache",
257 "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.Ferditodos.com)", 259 "settings.app.todoServerInfo": "This server will be used for the \"Ferdi Todo\" feature. (default: https://app.franztodos.com)",
258 "settings.app.translationHelp": "Help us to translate Ferdi into your language.", 260 "settings.app.translationHelp": "Help us to translate Ferdi into your language.",
259 "settings.app.updateStatusAvailable": "Update available, downloading...", 261 "settings.app.updateStatusAvailable": "Update available, downloading...",
260 "settings.app.updateStatusSearching": "Is searching for update", 262 "settings.app.updateStatusSearching": "Is searching for update",
diff --git a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
index ccbc155f3..07815de19 100644
--- a/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
+++ b/src/i18n/messages/src/components/settings/settings/EditSettingsForm.json
@@ -4,11 +4,11 @@
4 "defaultMessage": "!!!Settings", 4 "defaultMessage": "!!!Settings",
5 "file": "src/components/settings/settings/EditSettingsForm.js", 5 "file": "src/components/settings/settings/EditSettingsForm.js",
6 "start": { 6 "start": {
7 "line": 17, 7 "line": 26,
8 "column": 12 8 "column": 12
9 }, 9 },
10 "end": { 10 "end": {
11 "line": 20, 11 "line": 29,
12 "column": 3 12 "column": 3
13 } 13 }
14 }, 14 },
@@ -17,11 +17,11 @@
17 "defaultMessage": "!!!General", 17 "defaultMessage": "!!!General",
18 "file": "src/components/settings/settings/EditSettingsForm.js", 18 "file": "src/components/settings/settings/EditSettingsForm.js",
19 "start": { 19 "start": {
20 "line": 21, 20 "line": 30,
21 "column": 19 21 "column": 19
22 }, 22 },
23 "end": { 23 "end": {
24 "line": 24, 24 "line": 33,
25 "column": 3 25 "column": 3
26 } 26 }
27 }, 27 },
@@ -30,11 +30,24 @@
30 "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.", 30 "defaultMessage": "!!!We advice you to logout after changing your server as your settings might not be saved otherwise.",
31 "file": "src/components/settings/settings/EditSettingsForm.js", 31 "file": "src/components/settings/settings/EditSettingsForm.js",
32 "start": { 32 "start": {
33 "line": 25, 33 "line": 34,
34 "column": 14 34 "column": 14
35 }, 35 },
36 "end": { 36 "end": {
37 "line": 28, 37 "line": 37,
38 "column": 3
39 }
40 },
41 {
42 "id": "settings.app.serverMoneyInfo",
43 "defaultMessage": "!!!You are using the official Franz Server for Ferdi.\nWe know that Ferdi allows you to use all its features for free but you are still using Franz's server resources - which Franz's creator has to pay for.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development.",
44 "file": "src/components/settings/settings/EditSettingsForm.js",
45 "start": {
46 "line": 38,
47 "column": 19
48 },
49 "end": {
50 "line": 41,
38 "column": 3 51 "column": 3
39 } 52 }
40 }, 53 },
@@ -43,11 +56,11 @@
43 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)", 56 "defaultMessage": "!!!This server will be used for the \"Franz Todo\" feature. (default: https://app.franztodos.com)",
44 "file": "src/components/settings/settings/EditSettingsForm.js", 57 "file": "src/components/settings/settings/EditSettingsForm.js",
45 "start": { 58 "start": {
46 "line": 29, 59 "line": 42,
47 "column": 18 60 "column": 18
48 }, 61 },
49 "end": { 62 "end": {
50 "line": 32, 63 "line": 45,
51 "column": 3 64 "column": 3
52 } 65 }
53 }, 66 },
@@ -56,11 +69,11 @@
56 "defaultMessage": "!!!Ferdi Lock Password", 69 "defaultMessage": "!!!Ferdi Lock Password",
57 "file": "src/components/settings/settings/EditSettingsForm.js", 70 "file": "src/components/settings/settings/EditSettingsForm.js",
58 "start": { 71 "start": {
59 "line": 33, 72 "line": 46,
60 "column": 18 73 "column": 18
61 }, 74 },
62 "end": { 75 "end": {
63 "line": 36, 76 "line": 49,
64 "column": 3 77 "column": 3
65 } 78 }
66 }, 79 },
@@ -69,11 +82,24 @@
69 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.", 82 "defaultMessage": "!!!Please make sure to set a password you'll remember.\nIf you loose this password, you will have to reinstall Ferdi.",
70 "file": "src/components/settings/settings/EditSettingsForm.js", 83 "file": "src/components/settings/settings/EditSettingsForm.js",
71 "start": { 84 "start": {
72 "line": 37, 85 "line": 50,
73 "column": 22 86 "column": 22
74 }, 87 },
75 "end": { 88 "end": {
76 "line": 40, 89 "line": 53,
90 "column": 3
91 }
92 },
93 {
94 "id": "settings.app.lockInfo",
95 "defaultMessage": "!!!Ferdi password lock allows you to keep your messages protected.\nUsing Ferdi password lock, you will be prompted to enter your password everytime you start Ferdi or lock Ferdi yourself using the lock symbol in the bottom left corner or the shortcut CMD/CTRL+Shift+L.",
96 "file": "src/components/settings/settings/EditSettingsForm.js",
97 "start": {
98 "line": 54,
99 "column": 12
100 },
101 "end": {
102 "line": 57,
77 "column": 3 103 "column": 3
78 } 104 }
79 }, 105 },
@@ -82,11 +108,11 @@
82 "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.", 108 "defaultMessage": "!!!Times in 24-Hour-Format. End time can be before start time (e.g. start 17:00, end 09:00) to enable Do-not-Disturb overnight.",
83 "file": "src/components/settings/settings/EditSettingsForm.js", 109 "file": "src/components/settings/settings/EditSettingsForm.js",
84 "start": { 110 "start": {
85 "line": 41, 111 "line": 58,
86 "column": 24 112 "column": 24
87 }, 113 },
88 "end": { 114 "end": {
89 "line": 44, 115 "line": 61,
90 "column": 3 116 "column": 3
91 } 117 }
92 }, 118 },
@@ -95,11 +121,11 @@
95 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.", 121 "defaultMessage": "!!!Scheduled Do-not-Disturb allows you to define a period of time in which you do not want to get Notifications from Ferdi.",
96 "file": "src/components/settings/settings/EditSettingsForm.js", 122 "file": "src/components/settings/settings/EditSettingsForm.js",
97 "start": { 123 "start": {
98 "line": 45, 124 "line": 62,
99 "column": 20 125 "column": 20
100 }, 126 },
101 "end": { 127 "end": {
102 "line": 48, 128 "line": 65,
103 "column": 3 129 "column": 3
104 } 130 }
105 }, 131 },
@@ -108,11 +134,11 @@
108 "defaultMessage": "!!!Language", 134 "defaultMessage": "!!!Language",
109 "file": "src/components/settings/settings/EditSettingsForm.js", 135 "file": "src/components/settings/settings/EditSettingsForm.js",
110 "start": { 136 "start": {
111 "line": 49, 137 "line": 66,
112 "column": 20 138 "column": 20
113 }, 139 },
114 "end": { 140 "end": {
115 "line": 52, 141 "line": 69,
116 "column": 3 142 "column": 3
117 } 143 }
118 }, 144 },
@@ -121,11 +147,11 @@
121 "defaultMessage": "!!!Updates", 147 "defaultMessage": "!!!Updates",
122 "file": "src/components/settings/settings/EditSettingsForm.js", 148 "file": "src/components/settings/settings/EditSettingsForm.js",
123 "start": { 149 "start": {
124 "line": 53, 150 "line": 70,
125 "column": 19 151 "column": 19
126 }, 152 },
127 "end": { 153 "end": {
128 "line": 56, 154 "line": 73,
129 "column": 3 155 "column": 3
130 } 156 }
131 }, 157 },
@@ -134,11 +160,11 @@
134 "defaultMessage": "!!!Appearance", 160 "defaultMessage": "!!!Appearance",
135 "file": "src/components/settings/settings/EditSettingsForm.js", 161 "file": "src/components/settings/settings/EditSettingsForm.js",
136 "start": { 162 "start": {
137 "line": 57, 163 "line": 74,
138 "column": 22 164 "column": 22
139 }, 165 },
140 "end": { 166 "end": {
141 "line": 60, 167 "line": 77,
142 "column": 3 168 "column": 3
143 } 169 }
144 }, 170 },
@@ -147,11 +173,11 @@
147 "defaultMessage": "!!!Advanced", 173 "defaultMessage": "!!!Advanced",
148 "file": "src/components/settings/settings/EditSettingsForm.js", 174 "file": "src/components/settings/settings/EditSettingsForm.js",
149 "start": { 175 "start": {
150 "line": 61, 176 "line": 78,
151 "column": 20 177 "column": 20
152 }, 178 },
153 "end": { 179 "end": {
154 "line": 64, 180 "line": 81,
155 "column": 3 181 "column": 3
156 } 182 }
157 }, 183 },
@@ -160,11 +186,11 @@
160 "defaultMessage": "!!!Help us to translate Ferdi into your language.", 186 "defaultMessage": "!!!Help us to translate Ferdi into your language.",
161 "file": "src/components/settings/settings/EditSettingsForm.js", 187 "file": "src/components/settings/settings/EditSettingsForm.js",
162 "start": { 188 "start": {
163 "line": 65, 189 "line": 82,
164 "column": 19 190 "column": 19
165 }, 191 },
166 "end": { 192 "end": {
167 "line": 68, 193 "line": 85,
168 "column": 3 194 "column": 3
169 } 195 }
170 }, 196 },
@@ -173,11 +199,11 @@
173 "defaultMessage": "!!!Cache", 199 "defaultMessage": "!!!Cache",
174 "file": "src/components/settings/settings/EditSettingsForm.js", 200 "file": "src/components/settings/settings/EditSettingsForm.js",
175 "start": { 201 "start": {
176 "line": 69, 202 "line": 86,
177 "column": 20 203 "column": 20
178 }, 204 },
179 "end": { 205 "end": {
180 "line": 72, 206 "line": 89,
181 "column": 3 207 "column": 3
182 } 208 }
183 }, 209 },
@@ -186,11 +212,11 @@
186 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.", 212 "defaultMessage": "!!!Ferdi cache is currently using {size} of disk space.",
187 "file": "src/components/settings/settings/EditSettingsForm.js", 213 "file": "src/components/settings/settings/EditSettingsForm.js",
188 "start": { 214 "start": {
189 "line": 73, 215 "line": 90,
190 "column": 13 216 "column": 13
191 }, 217 },
192 "end": { 218 "end": {
193 "line": 76, 219 "line": 93,
194 "column": 3 220 "column": 3
195 } 221 }
196 }, 222 },
@@ -199,11 +225,11 @@
199 "defaultMessage": "!!!Clear cache", 225 "defaultMessage": "!!!Clear cache",
200 "file": "src/components/settings/settings/EditSettingsForm.js", 226 "file": "src/components/settings/settings/EditSettingsForm.js",
201 "start": { 227 "start": {
202 "line": 77, 228 "line": 94,
203 "column": 23 229 "column": 23
204 }, 230 },
205 "end": { 231 "end": {
206 "line": 80, 232 "line": 97,
207 "column": 3 233 "column": 3
208 } 234 }
209 }, 235 },
@@ -212,11 +238,11 @@
212 "defaultMessage": "!!!Check for updates", 238 "defaultMessage": "!!!Check for updates",
213 "file": "src/components/settings/settings/EditSettingsForm.js", 239 "file": "src/components/settings/settings/EditSettingsForm.js",
214 "start": { 240 "start": {
215 "line": 81, 241 "line": 98,
216 "column": 25 242 "column": 25
217 }, 243 },
218 "end": { 244 "end": {
219 "line": 84, 245 "line": 101,
220 "column": 3 246 "column": 3
221 } 247 }
222 }, 248 },
@@ -225,11 +251,11 @@
225 "defaultMessage": "!!!Restart & install update", 251 "defaultMessage": "!!!Restart & install update",
226 "file": "src/components/settings/settings/EditSettingsForm.js", 252 "file": "src/components/settings/settings/EditSettingsForm.js",
227 "start": { 253 "start": {
228 "line": 85, 254 "line": 102,
229 "column": 23 255 "column": 23
230 }, 256 },
231 "end": { 257 "end": {
232 "line": 88, 258 "line": 105,
233 "column": 3 259 "column": 3
234 } 260 }
235 }, 261 },
@@ -238,11 +264,11 @@
238 "defaultMessage": "!!!Is searching for update", 264 "defaultMessage": "!!!Is searching for update",
239 "file": "src/components/settings/settings/EditSettingsForm.js", 265 "file": "src/components/settings/settings/EditSettingsForm.js",
240 "start": { 266 "start": {
241 "line": 89, 267 "line": 106,
242 "column": 25 268 "column": 25
243 }, 269 },
244 "end": { 270 "end": {
245 "line": 92, 271 "line": 109,
246 "column": 3 272 "column": 3
247 } 273 }
248 }, 274 },
@@ -251,11 +277,11 @@
251 "defaultMessage": "!!!Update available, downloading...", 277 "defaultMessage": "!!!Update available, downloading...",
252 "file": "src/components/settings/settings/EditSettingsForm.js", 278 "file": "src/components/settings/settings/EditSettingsForm.js",
253 "start": { 279 "start": {
254 "line": 93, 280 "line": 110,
255 "column": 25 281 "column": 25
256 }, 282 },
257 "end": { 283 "end": {
258 "line": 96, 284 "line": 113,
259 "column": 3 285 "column": 3
260 } 286 }
261 }, 287 },
@@ -264,11 +290,11 @@
264 "defaultMessage": "!!!You are using the latest version of Ferdi", 290 "defaultMessage": "!!!You are using the latest version of Ferdi",
265 "file": "src/components/settings/settings/EditSettingsForm.js", 291 "file": "src/components/settings/settings/EditSettingsForm.js",
266 "start": { 292 "start": {
267 "line": 97, 293 "line": 114,
268 "column": 24 294 "column": 24
269 }, 295 },
270 "end": { 296 "end": {
271 "line": 100, 297 "line": 117,
272 "column": 3 298 "column": 3
273 } 299 }
274 }, 300 },
@@ -277,11 +303,11 @@
277 "defaultMessage": "!!!Current version:", 303 "defaultMessage": "!!!Current version:",
278 "file": "src/components/settings/settings/EditSettingsForm.js", 304 "file": "src/components/settings/settings/EditSettingsForm.js",
279 "start": { 305 "start": {
280 "line": 101, 306 "line": 118,
281 "column": 18 307 "column": 18
282 }, 308 },
283 "end": { 309 "end": {
284 "line": 104, 310 "line": 121,
285 "column": 3 311 "column": 3
286 } 312 }
287 }, 313 },
@@ -290,11 +316,11 @@
290 "defaultMessage": "!!!Changes require restart", 316 "defaultMessage": "!!!Changes require restart",
291 "file": "src/components/settings/settings/EditSettingsForm.js", 317 "file": "src/components/settings/settings/EditSettingsForm.js",
292 "start": { 318 "start": {
293 "line": 105, 319 "line": 122,
294 "column": 29 320 "column": 29
295 }, 321 },
296 "end": { 322 "end": {
297 "line": 108, 323 "line": 125,
298 "column": 3 324 "column": 3
299 } 325 }
300 }, 326 },
@@ -303,11 +329,11 @@
303 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.", 329 "defaultMessage": "!!!Official translations are English & German. All other languages are community based translations.",
304 "file": "src/components/settings/settings/EditSettingsForm.js", 330 "file": "src/components/settings/settings/EditSettingsForm.js",
305 "start": { 331 "start": {
306 "line": 109, 332 "line": 126,
307 "column": 22 333 "column": 22
308 }, 334 },
309 "end": { 335 "end": {
310 "line": 112, 336 "line": 129,
311 "column": 3 337 "column": 3
312 } 338 }
313 } 339 }