Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic footer Copyright date #741

Merged
merged 5 commits into from
Oct 13, 2022
Merged

Dynamic footer Copyright date #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d0d64f1
Update checkout-footer.jsx
bfeister Sep 29, 2022
be4a650
whitespace to bump CLA check
bfeister Sep 29, 2022
ecb44c2
Merge branch 'develop' into patch-1
bfeister Oct 12, 2022
0a2ba8e
Add translation and alternate footer changes (force push is to remove…
bfeister Oct 12, 2022
9903f20
Merge branch 'develop' into patch-1
bfeister Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/template-retail-react-app/app/components/footer/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ const Footer = ({...otherProps}) => {

<Box {...styles.bottomHalf}>
<Text {...styles.copyright}>
&copy;{' '}
&copy; {new Date().getFullYear()}{' '}
{intl.formatMessage({
id: 'footer.message.copyright',
defaultMessage:
'2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed.'
'Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed.'
})}
</Text>

Expand Down
4 changes: 2 additions & 2 deletions packages/template-retail-react-app/app/pages/checkout/partials/checkout-footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ const CheckoutFooter = ({...otherProps}) => {

<Box {...styles.bottomHalf}>
<Text {...styles.copyright}>
&copy;{' '}
&copy; {new Date().getFullYear()}{' '}
{intl.formatMessage({
id: 'checkout_footer.message.copyright',
defaultMessage:
'2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed.'
'Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed.'
Copy link
Contributor

@vmarta vmarta Oct 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you repeat the change for the other footer file too? Thanks. There are 2 kinds of footer: one for the main core pages, while the other one is for the checkout.

https://github.com/bfeister/pwa-kit/blob/7cb911ed673164cb7c9389448bf5844e7e3b1ab7/packages/template-retail-react-app/app/components/footer/index.jsx#L166-L173

And yeah, unfortunately doing so would need another round of translation updates, because they use a different message id footer.message.copyright.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done! 👍

})}
</Text>

Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/de-DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce oder dessen Geschäftspartner. Alle Rechte vorbehalten. Dies ist lediglich ein Geschäft zu Demonstrationszwecken. Aufgegebene Bestellungen WERDEN NICHT bearbeitet."
"value": "Salesforce oder dessen Geschäftspartner. Alle Rechte vorbehalten. Dies ist lediglich ein Geschäft zu Demonstrationszwecken. Aufgegebene Bestellungen WERDEN NICHT bearbeitet."
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/en-GB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
"value": "Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
}
],
"checkout_header.link.cart": [
Expand Down
4 changes: 2 additions & 2 deletions packages/template-retail-react-app/app/translations/compiled/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
"value": "Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
}
],
"checkout_header.link.cart": [
Expand Down Expand Up @@ -1228,7 +1228,7 @@
"footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
"value": "Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
}
],
"footer.subscribe.button.sign_up": [
Expand Down
4 changes: 2 additions & 2 deletions packages/template-retail-react-app/app/translations/compiled/en-XB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "[!! 2021 ṠṠṠâĺèèèśḟŏŏŏŕćèèè ŏŕŕŕ íṭṭṭś âââḟḟíííĺíâââṭèśśś. ḀḀḀĺĺ ŕíĝĝĝḫṭśśś ŕèèèśèŕŕŕṿèḋḋḋ. ṮṮṮḫíśśś íśśś â ḋèṁṁṁŏ śśśṭŏŕŕŕè ŏŏŏńĺẏẏẏ. ÕÕÕŕḋèèèŕś ṁâḋḋḋè ẄẄẄḬĻĻĻĻ ŊÕÕÕṮ ḃḃḃè ṗṗṗŕŏćććèśśśśèḋ. !!]"
"value": "[!! ṠṠṠâĺèèèśḟŏŏŏŕćèèè ŏŕŕŕ íṭṭṭś âââḟḟíííĺíâââṭèśśś. ḀḀḀĺĺ ŕíĝĝĝḫṭśśś ŕèèèśèŕŕŕṿèḋḋḋ. ṮṮṮḫíśśś íśśś â ḋèṁṁṁŏ śśśṭŏŕŕŕè ŏŏŏńĺẏẏẏ. ÕÕÕŕḋèèèŕś ṁâḋḋḋè ẄẄẄḬĻĻĻĻ ŊÕÕÕṮ ḃḃḃè ṗṗṗŕŏćććèśśśśèḋ. !!]"
}
],
"checkout_header.link.cart": [
Expand Down Expand Up @@ -3209,4 +3209,4 @@
"value": "[!! Ṕĺèèèâśèèè śíííĝń íń ṭŏ ćŏńńńṭíńńńůè! !!]"
}
]
}
}
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/es-MX.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce o sus afiliados. Todos los derechos reservados. Esta es solo una tienda de demostración. Los pedidos realizados NO se procesarán."
"value": "Salesforce o sus afiliados. Todos los derechos reservados. Esta es solo una tienda de demostración. Los pedidos realizados NO se procesarán."
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/fr-FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce ou ses affiliés. Tous droits réservés. Ceci est une boutique de démonstration uniquement. Les commandes NE SERONT PAS traitées."
"value": "Salesforce ou ses affiliés. Tous droits réservés. Ceci est une boutique de démonstration uniquement. Les commandes NE SERONT PAS traitées."
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/it-IT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce o società affiliate. Tutti i diritti riservati. Questo è un negozio fittizio a scopo dimostrativo. Gli ordini effettuati NON VERRANNO evasi."
"value": "Salesforce o società affiliate. Tutti i diritti riservati. Questo è un negozio fittizio a scopo dimostrativo. Gli ordini effettuati NON VERRANNO evasi."
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce またはその系列会社。All Rights Reserved. これはデモのみを目的とするストアです。注文を確定しても処理されません。"
"value": "Salesforce またはその系列会社。All Rights Reserved. これはデモのみを目的とするストアです。注文を確定しても処理されません。"
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/ko-KR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2022 Salesforce or its affiliates. All rights reserved. 데모용 매장입니다. 주문이 처리되지 않습니다."
"value": "Salesforce or its affiliates. All rights reserved. 데모용 매장입니다. 주문이 처리되지 않습니다."
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce ou suas afiliadas. Todos os direitos reservados. Esta é apenas uma loja de demonstração. Os pedidos feitos NÃO SERÃO processados."
"value": "Salesforce ou suas afiliadas. Todos os direitos reservados. Esta é apenas uma loja de demonstração. Os pedidos feitos NÃO SERÃO processados."
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce 或其附属公司。保留所有权利。此仅为示范商店。所下订单不会被处理。"
"value": "Salesforce 或其附属公司。保留所有权利。此仅为示范商店。所下订单不会被处理。"
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/compiled/zh-TW.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@
"checkout_footer.message.copyright": [
{
"type": 0,
"value": "2021 Salesforce 或相關企業。保留一切權利。這只是一個示範商店。在此下單將「不會」進行處理。"
"value": "Salesforce 或相關企業。保留一切權利。這只是一個示範商店。在此下單將「不會」進行處理。"
}
],
"checkout_header.link.cart": [
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/de-DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "Allgemeine Geschäftsbedingungen"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce oder dessen Geschäftspartner. Alle Rechte vorbehalten. Dies ist lediglich ein Geschäft zu Demonstrationszwecken. Aufgegebene Bestellungen WERDEN NICHT bearbeitet."
"defaultMessage": "Salesforce oder dessen Geschäftspartner. Alle Rechte vorbehalten. Dies ist lediglich ein Geschäft zu Demonstrationszwecken. Aufgegebene Bestellungen WERDEN NICHT bearbeitet."
},
"checkout_header.link.cart": {
"defaultMessage": "Zurück zum Warenkorb"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/en-GB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "Terms & Conditions"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
"defaultMessage": "Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
},
"checkout_header.link.cart": {
"defaultMessage": "Back to cart"
Expand Down
4 changes: 2 additions & 2 deletions packages/template-retail-react-app/app/translations/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "Terms & Conditions"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
"defaultMessage": "Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re: the translations, we'll need to update all of the other locales too. And then re-compile them.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Fixed

},
"checkout_header.link.cart": {
"defaultMessage": "Back to cart"
Expand Down Expand Up @@ -511,7 +511,7 @@
"defaultMessage": "Terms & Conditions"
},
"footer.message.copyright": {
"defaultMessage": "2021 Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
"defaultMessage": "Salesforce or its affiliates. All rights reserved. This is a demo store only. Orders made WILL NOT be processed."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bfeister Please update the other locales too, just like how you did here with en-US.

},
"footer.subscribe.button.sign_up": {
"defaultMessage": "Sign Up"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/es-MX.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "Términos y condiciones"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce o sus afiliados. Todos los derechos reservados. Esta es solo una tienda de demostración. Los pedidos realizados NO se procesarán."
"defaultMessage": "Salesforce o sus afiliados. Todos los derechos reservados. Esta es solo una tienda de demostración. Los pedidos realizados NO se procesarán."
},
"checkout_header.link.cart": {
"defaultMessage": "Regresar al carrito"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/fr-FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "Conditions générales"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce ou ses affiliés. Tous droits réservés. Ceci est une boutique de démonstration uniquement. Les commandes NE SERONT PAS traitées."
"defaultMessage": "Salesforce ou ses affiliés. Tous droits réservés. Ceci est une boutique de démonstration uniquement. Les commandes NE SERONT PAS traitées."
},
"checkout_header.link.cart": {
"defaultMessage": "Retour au panier"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/it-IT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "Termini e condizioni"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce o società affiliate. Tutti i diritti riservati. Questo è un negozio fittizio a scopo dimostrativo. Gli ordini effettuati NON VERRANNO evasi."
"defaultMessage": "Salesforce o società affiliate. Tutti i diritti riservati. Questo è un negozio fittizio a scopo dimostrativo. Gli ordini effettuati NON VERRANNO evasi."
},
"checkout_header.link.cart": {
"defaultMessage": "Torna al carrello"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "使用条件"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce またはその系列会社。All Rights Reserved. これはデモのみを目的とするストアです。注文を確定しても処理されません。"
"defaultMessage": "Salesforce またはその系列会社。All Rights Reserved. これはデモのみを目的とするストアです。注文を確定しても処理されません。"
},
"checkout_header.link.cart": {
"defaultMessage": "買い物カゴに戻る"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/ko-KR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "이용 약관"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2022 Salesforce or its affiliates. All rights reserved. 데모용 매장입니다. 주문이 처리되지 않습니다."
"defaultMessage": "Salesforce or its affiliates. All rights reserved. 데모용 매장입니다. 주문이 처리되지 않습니다."
},
"checkout_header.link.cart": {
"defaultMessage": "카트로 돌아가기"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "Termos e condições"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce ou suas afiliadas. Todos os direitos reservados. Esta é apenas uma loja de demonstração. Os pedidos feitos NÃO SERÃO processados."
"defaultMessage": "Salesforce ou suas afiliadas. Todos os direitos reservados. Esta é apenas uma loja de demonstração. Os pedidos feitos NÃO SERÃO processados."
},
"checkout_header.link.cart": {
"defaultMessage": "Voltar ao carrinho"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "条款与条件"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce 或其附属公司。保留所有权利。此仅为示范商店。所下订单不会被处理。"
"defaultMessage": "Salesforce 或其附属公司。保留所有权利。此仅为示范商店。所下订单不会被处理。"
},
"checkout_header.link.cart": {
"defaultMessage": "返回购物车"
Expand Down
2 changes: 1 addition & 1 deletion packages/template-retail-react-app/app/translations/zh-TW.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@
"defaultMessage": "條款與條件"
},
"checkout_footer.message.copyright": {
"defaultMessage": "2021 Salesforce 或相關企業。保留一切權利。這只是一個示範商店。在此下單將「不會」進行處理。"
"defaultMessage": "Salesforce 或相關企業。保留一切權利。這只是一個示範商店。在此下單將「不會」進行處理。"
},
"checkout_header.link.cart": {
"defaultMessage": "返回購物車"
Expand Down