From e27e81fc6f22e3671bd950293de6bb5223c821d6 Mon Sep 17 00:00:00 2001 From: Carsten Bach Date: Mon, 1 Apr 2024 01:16:12 +0200 Subject: [PATCH 1/3] Wrap strings in backticks to make sprintf work and still allow to replace values iin curly braces (fixes #623) --- src/components/Rsvp.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/components/Rsvp.js b/src/components/Rsvp.js index 78542163d..449f73349 100644 --- a/src/components/Rsvp.js +++ b/src/components/Rsvp.js @@ -196,13 +196,13 @@ const Rsvp = ({ 'You must %s to RSVP to events.', 'gatherpress' ), - - {_x( + ` + ${_x( 'Login', 'Context: You must ~ to RSVP to events.', 'gatherpress' )} - + ` ) )} @@ -215,17 +215,13 @@ const Rsvp = ({ '%s if you do not have an account.', 'gatherpress' ), - - {_x( + ` + ${_x( 'Register', 'Context: ~ if you do not have an account.', 'gatherpress' )} - + ` ) )} From d06352fb107a7d4103866349aab3fdd6e5773960 Mon Sep 17 00:00:00 2001 From: Carsten Bach Date: Mon, 1 Apr 2024 01:26:16 +0200 Subject: [PATCH 2/3] Align with JS CS --- src/components/Rsvp.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/Rsvp.js b/src/components/Rsvp.js index 449f73349..f95dbb0aa 100644 --- a/src/components/Rsvp.js +++ b/src/components/Rsvp.js @@ -197,11 +197,7 @@ const Rsvp = ({ 'gatherpress' ), ` - ${_x( - 'Login', - 'Context: You must ~ to RSVP to events.', - 'gatherpress' - )} + ${_x( 'Login', 'Context: You must ~ to RSVP to events.', 'gatherpress' )} ` ) )} @@ -216,11 +212,7 @@ const Rsvp = ({ 'gatherpress' ), ` - ${_x( - 'Register', - 'Context: ~ if you do not have an account.', - 'gatherpress' - )} + ${_x( 'Register', 'Context: ~ if you do not have an account.', 'gatherpress' )} ` ) )} From 76b7775f0331160bad67d650914b413a572dc54e Mon Sep 17 00:00:00 2001 From: Carsten Bach Date: Mon, 1 Apr 2024 01:29:14 +0200 Subject: [PATCH 3/3] Remove 4 dots to align with JS CS --- src/components/Rsvp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Rsvp.js b/src/components/Rsvp.js index f95dbb0aa..545e4f324 100644 --- a/src/components/Rsvp.js +++ b/src/components/Rsvp.js @@ -197,7 +197,7 @@ const Rsvp = ({ 'gatherpress' ), ` - ${_x( 'Login', 'Context: You must ~ to RSVP to events.', 'gatherpress' )} + ${_x('Login', 'Context: You must ~ to RSVP to events.', 'gatherpress')} ` ) )} @@ -212,7 +212,7 @@ const Rsvp = ({ 'gatherpress' ), ` - ${_x( 'Register', 'Context: ~ if you do not have an account.', 'gatherpress' )} + ${_x('Register', 'Context: ~ if you do not have an account.', 'gatherpress')} ` ) )}