Skip to content

Commit

Permalink
fix english and missing pinterest (#205)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nebulis authored Feb 23, 2024
1 parent 9a59830 commit fc008a7
Show file tree
Hide file tree
Showing 14 changed files with 45 additions and 17 deletions.
10 changes: 5 additions & 5 deletions integration/__snapshots__/meta.en.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`english pages exports meta for public/en/about/contact/index.html corre

exports[`english pages exports meta for public/en/about/who/index.html correctly: meta-description 1`] = `"This blog is a sort of diary we share with you, with a few tips here and there. Above all, it's an unforgettable memory book that we will read in the future."`;

exports[`english pages exports meta for public/en/about/who/index.html correctly: social-network 1`] = `"After living for 6 years Singapore, a unique experience which allowed us to have so many trips to Asia and Oceania, we are back in France with new projects and dreams in mind."`;
exports[`english pages exports meta for public/en/about/who/index.html correctly: social-network 1`] = `"After living for 6 years in Singapore, a unique experience that allowed us to have so many trips to Asia and Oceania, we are back in France with new projects and dreams in mind."`;

exports[`english pages exports meta for public/en/about/who/index.html correctly: title 1`] = `"About us? | Travel Blog"`;

Expand Down Expand Up @@ -450,9 +450,9 @@ exports[`english pages exports meta for public/en/index.html correctly: social-n

exports[`english pages exports meta for public/en/index.html correctly: title 1`] = `"Magic of travels | Travel Blog"`;

exports[`english pages exports meta for public/en/journal/living-abroad/index.html correctly: meta-description 1`] = `"So many questions without an answer before taking the plunge. Why moving abroad? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find? With our own experience, we try to answer your questions as well as possible through our articles."`;
exports[`english pages exports meta for public/en/journal/living-abroad/index.html correctly: meta-description 1`] = `"So many questions without an answer before taking the plunge. Why? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find? With our own experience, we try to answer your questions as well as possible through our articles."`;

exports[`english pages exports meta for public/en/journal/living-abroad/index.html correctly: social-network 1`] = `"So many questions without an answer before taking the plunge. Why moving abroad? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find? With our own experience, we try to answer your questions as well as possible through our articles."`;
exports[`english pages exports meta for public/en/journal/living-abroad/index.html correctly: social-network 1`] = `"So many questions without an answer before taking the plunge. Why? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find? With our own experience, we try to answer your questions as well as possible through our articles."`;

exports[`english pages exports meta for public/en/journal/living-abroad/index.html correctly: title 1`] = `"Living Abroad | Practical Guide"`;

Expand Down Expand Up @@ -540,8 +540,8 @@ exports[`english pages exports meta for public/en/organisation/when-to-go/summer

exports[`english pages exports meta for public/en/organisation/when-to-go/summer/index.html correctly: title 1`] = `"Travel in summer | Travel Guide"`;

exports[`english pages exports meta for public/en/organisation/when-to-go/winter/index.html correctly: meta-description 1`] = `"Do you prefer snowy and magical Christmas? Or lack of sunlight make you feel low? So many places to spend your dream holidays during December, January or February. We guide you with the travels we made in different countries."`;
exports[`english pages exports meta for public/en/organisation/when-to-go/winter/index.html correctly: meta-description 1`] = `"Do you prefer a snowy and magical Christmas? Or does the lack of sunlight make you feel low? There are many places to spend your dream holidays during December, January, or February. We guide you with the travels we made in different countries."`;

exports[`english pages exports meta for public/en/organisation/when-to-go/winter/index.html correctly: social-network 1`] = `"Do you prefer snowy and magical Christmas? Or lack of sunlight make you feel low? So many places to spend your dream holidays during December, January or February. We guide you with the travels we made in different countries."`;
exports[`english pages exports meta for public/en/organisation/when-to-go/winter/index.html correctly: social-network 1`] = `"Do you prefer a snowy and magical Christmas? Or does the lack of sunlight make you feel low? There are many places to spend your dream holidays during December, January, or February. We guide you with the travels we made in different countries."`;

exports[`english pages exports meta for public/en/organisation/when-to-go/winter/index.html correctly: title 1`] = `"Travel in winter | Travel Guide"`;
16 changes: 16 additions & 0 deletions src/components/images/asia/japan/food-in-japan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ const alt = {
donburi5: "Food In Japan Donburi",
donburi6: "Food In Japan Donburi",
donburi7: "Food In Japan Donburi",
cardFr1: "Food In Japan Pinterest card",
cardEn1: "Food In Japan Pinterest card",
}

export const FoodInJapanImages: React.FunctionComponent<ExtraImageProps & { image: keyof typeof alt }> = ({
Expand Down Expand Up @@ -463,6 +465,20 @@ export const FoodInJapanImages: React.FunctionComponent<ExtraImageProps & { imag
}
}
}
cardFr1: file(relativePath: { eq: "asia/japan/food-in-japan/card-fr1.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [1200]) {
...GatsbyImageSharpFluid
}
}
}
cardEn1: file(relativePath: { eq: "asia/japan/food-in-japan/card-en1.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 80, srcSetBreakpoints: [1200]) {
...GatsbyImageSharpFluid
}
}
}
}
`)
useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ const alt = {
singapore: "Christmas Decorations",
singapore2: "Christmas Tree",
singapore3: "Christmas Decorations",
cardFr1: "TODO Pinterest card",
cardFr2: "TODO Pinterest card",
cardEn1: "TODO Pinterest card",
cardEn2: "TODO Pinterest card",
cardFr1: "Christmas In Singapore Pinterest card",
cardFr2: "Christmas In Singapore Pinterest card",
cardEn1: "Christmas In Singapore Pinterest card",
cardEn2: "Christmas In Singapore Pinterest card",
}

export const ChristmasInSingaporeImages: React.FunctionComponent<ExtraImageProps & { image: keyof typeof alt }> = ({
Expand Down
Binary file added src/images/asia/japan/food-in-japan/card-en1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/asia/japan/food-in-japan/card-fr1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/locales/en/about/who.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"title": "About us ...",
"description": "After living for 6 years Singapore, a unique experience which allowed us to have so many trips to Asia and Oceania, we are back in France with new projects and dreams in mind.",
"description": "After living for 6 years in Singapore, a unique experience that allowed us to have so many trips to Asia and Oceania, we are back in France with new projects and dreams in mind.",
"section1": "After 6 years of love, daily grind and need for change of scenery, we decided in 2016 to change our life and settle in Singapore with our 2 cats without ever having set foot there.",
"section2": "A hell of an adventure that allowed us to make numerous trips and discoveries in Asia and Oceania, but above all, unforgettable encounters.",
"section3": "In 2022, after 6 years of living in Singapore, this unique experience ended. We headed back to France with new projects and dreams in mind.",
Expand Down
4 changes: 2 additions & 2 deletions src/locales/en/journal/living-abroad.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"quote": {
"part1": "It's not that easy to leave everything behind and change your life to go away and live abroad.",
"part2": "So many questions without an answer before taking the plunge. Why moving abroad? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find?",
"part2": "So many questions without an answer before taking the plunge. Why? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find?",
"part3": "With our own experience, we try to answer your questions as well as possible through our articles."
},
"full-title": "Living Abroad | Practical Guide",
"inform": {
"title": "A SUCCESSFUL EXPATRIATION",
"subtitle": "By asking the right questions ..."
},
"meta-description": "So many questions without an answer before taking the plunge. Why moving abroad? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find? With our own experience, we try to answer your questions as well as possible through our articles."
"meta-description": "So many questions without an answer before taking the plunge. Why? Which country to choose? What are the processes to follow? What are the pros and cons? How long to stay abroad? What job will I be able to find? With our own experience, we try to answer your questions as well as possible through our articles."
}
6 changes: 3 additions & 3 deletions src/locales/en/organisation/when-to-go/winter.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"title": "Travel in winter",
"full-title": "Travel in winter | Travel Guide",
"google-description": "Do you prefer snowy and magical Christmas? Or lack of sunlight make you feel low? So many places to spend your dream holidays during December, January or February. We guide you with the travels we made in different countries.",
"social-network-description": "Do you prefer snowy and magical Christmas? Or lack of sunlight make you feel low? So many places to spend your dream holidays during December, January or February. We guide you with the travels we made in different countries.",
"part1": "Do you prefer snowy and magical Christmas? Or lack of sunlight make you feel low?",
"google-description": "Do you prefer a snowy and magical Christmas? Or does the lack of sunlight make you feel low? There are many places to spend your dream holidays during December, January, or February. We guide you with the travels we made in different countries.",
"social-network-description": "Do you prefer a snowy and magical Christmas? Or does the lack of sunlight make you feel low? There are many places to spend your dream holidays during December, January, or February. We guide you with the travels we made in different countries.",
"part1": "Do you prefer a snowy and magical Christmas? Or does the lack of sunlight make you feel low?",
"part2": "Have holidays near astounding landscapes covered with a large white coat, or else escape cold winter for heavenly beaches and for the tropical sun.",
"part3": "So many places to spend your dream holidays during December, January or February.",
"part4": "We guide you with the travels we made in different countries."
Expand Down
5 changes: 4 additions & 1 deletion src/pages/asia/japan/food-in-japan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,10 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
facebookQuote={`${t("facebook.part1")}\n${t("facebook.part2")}`}
pinterest={{
description: t("pinterest"),
nodes: i18n.languageCode === "fr" ? [] : [],
nodes:
i18n.languageCode === "fr"
? [<FoodInJapanImages image="cardFr1" key="cardFr1" />]
: [<FoodInJapanImages image="cardEn1" key="cardEn1" />],
}}
/>
</JapanBlogLayout>
Expand Down
11 changes: 10 additions & 1 deletion src/pages/asia/singapore/christmas-in-singapore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,16 @@ const IndexPage: React.FunctionComponent<PageProps> = ({ location }) => {
facebookQuote={`${t("facebook.part1")}\n${t("facebook.part2")}\n${t("facebook.part3")}`}
pinterest={{
description: t("pinterest"),
nodes: i18n.languageCode === "fr" ? [] : [],
nodes:
i18n.languageCode === "fr"
? [
<ChristmasInSingaporeImages image="cardFr1" key="cardFr1" />,
<ChristmasInSingaporeImages image="cardFr2" key="cardFr1" />,
]
: [
<ChristmasInSingaporeImages image="cardEn1" key="cardEn1" />,
<ChristmasInSingaporeImages image="cardEn2" key="cardEn1" />,
],
}}
/>
</ChristmasBlogLayout>
Expand Down

0 comments on commit fc008a7

Please sign in to comment.