From a3cfcf8ffc1560f824b9c74850171ed9f1f2c89a Mon Sep 17 00:00:00 2001 From: Jan Henrik Overland Date: Tue, 8 Sep 2020 17:12:41 +0200 Subject: [PATCH 1/3] fix: tweak info text and style --- i18n/en.pot | 23 ++++++------- src/components/Dashboard/PrintInfo.js | 33 ++++++++++--------- .../Dashboard/styles/PrintInfo.module.css | 4 +++ 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index d0622c869..d15d52c26 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2020-09-08T06:57:57.672Z\n" -"PO-Revision-Date: 2020-09-08T06:57:57.672Z\n" +"POT-Creation-Date: 2020-09-08T15:07:59.261Z\n" +"PO-Revision-Date: 2020-09-08T15:07:59.261Z\n" msgid "Untitled dashboard" msgstr "" @@ -68,27 +68,24 @@ msgstr "" msgid "Print" msgstr "" -msgid "The pages below are a preview of how the dashboard layout will be printed." +msgid "dashboard layout" msgstr "" -msgid "" -"The pages below are a preview of how each dashboard item will be printed on " -"a separate page." +msgid "one item per page" msgstr "" -msgid "" -"Use the default printer settings for best results and check that all " -"dashboard items have finished loading before printing. This text will not " -"be printed." +msgid "Print Preview" msgstr "" -msgid "dashboard layout" +msgid "Use Chrome or Edge web browser" msgstr "" -msgid "one item per page" +msgid "Wait for all dashboard items to load before printing this page" msgstr "" -msgid "Print Preview" +msgid "" +"Use A4 landscape paper size and default margin settings in the browser " +"print dialog" msgstr "" msgid "{{count}} selected" diff --git a/src/components/Dashboard/PrintInfo.js b/src/components/Dashboard/PrintInfo.js index bb711d705..7000fff49 100644 --- a/src/components/Dashboard/PrintInfo.js +++ b/src/components/Dashboard/PrintInfo.js @@ -11,18 +11,6 @@ const PrintInfo = ({ isLayout }) => { ? a4LandscapeWidthPx : window.innerWidth - const infoPartOne = isLayout - ? i18n.t( - 'The pages below are a preview of how the dashboard layout will be printed.' - ) - : i18n.t( - 'The pages below are a preview of how each dashboard item will be printed on a separate page.' - ) - - const infoPartTwo = i18n.t( - 'Use the default printer settings for best results and check that all dashboard items have finished loading before printing. This text will not be printed.' - ) - const infoHeader = isLayout ? i18n.t('dashboard layout') : i18n.t('one item per page') @@ -33,9 +21,24 @@ const PrintInfo = ({ isLayout }) => { {`${i18n.t('Print Preview')}: ${infoHeader}`}

-

{`${infoPartOne} ${infoPartTwo}`}

+

+ {i18n.t('For best print results:')} +

+

+

+

diff --git a/src/components/Dashboard/styles/PrintInfo.module.css b/src/components/Dashboard/styles/PrintInfo.module.css index ccb9f9729..2d46afb13 100644 --- a/src/components/Dashboard/styles/PrintInfo.module.css +++ b/src/components/Dashboard/styles/PrintInfo.module.css @@ -16,6 +16,10 @@ max-width: 800px; } +.infoList > li { + padding: 4px 0; +} + .divider { width: 1102px; margin-left: 0px; From 4d1e81d915e8a230a1bf752a611e2dad59f3859c Mon Sep 17 00:00:00 2001 From: Jan Henrik Overland Date: Tue, 8 Sep 2020 17:33:24 +0200 Subject: [PATCH 2/3] fix: i18n --- i18n/en.pot | 7 +++++-- src/components/Dashboard/PrintInfo.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/i18n/en.pot b/i18n/en.pot index d15d52c26..14d2d52d5 100644 --- a/i18n/en.pot +++ b/i18n/en.pot @@ -5,8 +5,8 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"POT-Creation-Date: 2020-09-08T15:07:59.261Z\n" -"PO-Revision-Date: 2020-09-08T15:07:59.261Z\n" +"POT-Creation-Date: 2020-09-08T15:31:37.955Z\n" +"PO-Revision-Date: 2020-09-08T15:31:37.955Z\n" msgid "Untitled dashboard" msgstr "" @@ -77,6 +77,9 @@ msgstr "" msgid "Print Preview" msgstr "" +msgid "For best print results" +msgstr "" + msgid "Use Chrome or Edge web browser" msgstr "" diff --git a/src/components/Dashboard/PrintInfo.js b/src/components/Dashboard/PrintInfo.js index 7000fff49..e96232969 100644 --- a/src/components/Dashboard/PrintInfo.js +++ b/src/components/Dashboard/PrintInfo.js @@ -22,7 +22,7 @@ const PrintInfo = ({ isLayout }) => {

- {i18n.t('For best print results:')} + {`${i18n.t('For best print results')}:`}

    From 87559984ddb0de7f05a50f91412734d7cbceafc7 Mon Sep 17 00:00:00 2001 From: Jan Henrik Overland Date: Tue, 8 Sep 2020 17:35:30 +0200 Subject: [PATCH 3/3] fix: tweak info --- src/components/Dashboard/PrintInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Dashboard/PrintInfo.js b/src/components/Dashboard/PrintInfo.js index e96232969..d79c6b906 100644 --- a/src/components/Dashboard/PrintInfo.js +++ b/src/components/Dashboard/PrintInfo.js @@ -29,7 +29,7 @@ const PrintInfo = ({ isLayout }) => {
  • {i18n.t('Use Chrome or Edge web browser')}
  • {i18n.t( - 'Wait for all dashboard items to load before printing this page' + 'Wait for all dashboard items to load before printing' )}