Skip to content

Commit

Permalink
update articles part 1
Browse files Browse the repository at this point in the history
  • Loading branch information
Nebulis committed Feb 20, 2024
1 parent e056fc4 commit 3d4b3df
Show file tree
Hide file tree
Showing 15 changed files with 72 additions and 60 deletions.
8 changes: 7 additions & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ module.exports = {
},
},
plugins: [
`gatsby-plugin-emotion`,
// https://github.com/gatsbyjs/gatsby/issues/35911#issuecomment-1195569818
{
resolve: `gatsby-plugin-emotion`,
options: {
sourceMap: false,
},
},
`gatsby-plugin-react-helmet`,
{
resolve: `gatsby-source-filesystem`,
Expand Down
4 changes: 2 additions & 2 deletions src/components/images/asia/vietnam/prepare-vietnam-images.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const alt = {
hammock: "Prepare Vietnam Sleeping Hammock",
baggage: "Prepare Vietnam Cat Baggage",
landscape: "Prepare Vietnam Landscape Paddy Field",
laughing: "Prepare Vietnam Laughing Women",
people: "Prepare Vietnam Vietnamese People",
scooter: "Prepare Vietnam Scooter Traffic Jam",
currency: "Prepare Vietnam Currency",
currency2: "Prepare Vietnam Currency",
Expand Down Expand Up @@ -57,7 +57,7 @@ export const PrepareVietnamImages: React.FunctionComponent<ExtraImageProps & { i
}
}
}
laughing: file(relativePath: { eq: "asia/vietnam/prepare/prepare-vietnam-laughing.jpg" }) {
people: file(relativePath: { eq: "asia/vietnam/prepare/prepare-vietnam-people.jpg" }) {
childImageSharp {
fluid(maxWidth: 1200, quality: 60, srcSetBreakpoints: [600]) {
...GatsbyImageSharpFluid
Expand Down
Binary file modified src/images/asia/vietnam/prepare/prepare-vietnam-landscape.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 not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/asia/vietnam/prepare/prepare-vietnam-scooter.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions src/locales/en/about/who.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"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.",
"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": "An incredible adventure that allowed us to make many trips.",
"section3": "A sort of diary that we share with you, a few tips here and there but above all an unforgettable memory book that we will read ourselves in the future.",
"section4": "Let's meet for a new article every Saturday.",
"section5": "¡ Have a good trip !",
"section6": "❤️ ️️Mrs Magic is particularly dreamy, devourer of novels and series, she also likes to take pictures of everything and anything. Sensitive to animal welfare and protection, fan of shopping. Always smiling, she is also strong-willed. ❤️",
"section7": "❤️ Mr Magic is a manga enthusiast and a sports fan - in reality as on a sofa -. A bit clumsy, but quite adventurer, he is able to stay calm on any situation. Comfortable with technology, he takes care of the technical part of the blog. ❤️",
"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.",
"section4": "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.",
"section5": "Let's meet for a new article every Sunday.",
"section6": "¡ Have a good trip !",
"section7": "❤️ Mrs Magic is particularly dreamy, devourer of novels and series, she also likes to take pictures of everything and anything. Sensitive to animal welfare and protection, fan of shopping. Always smiling, she is also strong-willed. ❤️",
"section8": "❤️ Mr Magic is a manga enthusiast and a sports fan - in reality as on a sofa -. A bit clumsy, but quite adventurer, he is able to stay calm on any situation. Comfortable with technology, he takes care of the technical part of the blog. ❤️",
"contact": "Contact us"
}
21 changes: 13 additions & 8 deletions src/locales/en/journal/living-abroad/living-abroad-where.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"part5": "Moving abroad doesn't have to happen for your career only. You may be retired, and you want to stay in a new country for your last years. The question of the cost of living then arises. Either you have lived in a country where retirement exists and you will have to live with what you will earn, or you have lived in a country where retirement doesn't exist and you will live on your savings.",
"part6": "Speaking of retirement, don't forget to prepare for it. Remember that when you go abroad, if you have a local contract, you will no longer be contributing to your country's retirement, during the entire time of your expatriation. In France, you can continue to contribute to it through the [CFE](https://www.cfe.fr/assurance-sante), but this is an additional expense.",
"part7": "You may be a student and need to support yourself.",
"part8": "You can think about your future too. Moving abroad and earning more money is perhaps a way to build your future. For example, to increase your savings to buy a house or whatever you dream about."
"part8": "You can think about your future too. Moving abroad and earning more money is perhaps a way to build your future. For example, to increase your savings to buy a house or whatever you dream about.",
"part9": "Peaceful place in our condominium"
},
"part3": {
"title1": "#Process#",
Expand All @@ -61,7 +62,8 @@
"part2": "Finding out if we can adapt to another culture is complicated. If you have been to a country at least once you will already have a little insight. It will give you indications on how to live with locals and therefore, you will know if it suits you. On the other hand, if you don't know the country's culture, inform and ask yourself the right questions. A long-term expatriation and a weeklong trip are two different things.",
"part3": "A country can also be multicultural. It can be an advantage and ease adaptation without impacting your way of life too much. It is always easier to live in a country where the customs are close to ours.",
"part4": "If, on the contrary, the culture and the way of life of the locals are different from yours, it can take time to adapt. You can also be afraid of offending people if you make a mistake, but just respect people, and it will go well. Unless you do something irretrievable, people know you are a foreigner and won't hold it against you. Do not hesitate to communicate, get information from other foreigners, or on the internet.",
"part5": "If you need it, check if there are any expatriate groups from your home country, especially on Facebook. Although we recommend trying to blend in with the locals instead, it can be a way for you to adapt."
"part5": "If you need it, check if there are any expatriate groups from your home country, especially on Facebook. Although we recommend trying to blend in with the locals instead, it can be a way for you to adapt.",
"part6": "Beautiful street art created by Yip Yew Chong in Singapore, Chinatown. Detective Conan explores the streets of Singapore."
},
"part5": {
"title1": "#Language#",
Expand All @@ -88,7 +90,8 @@
"part7": "ease of travel",
"part8": "travel time to each country",
"part9": "Ease of travel also meant, for us, to be able to go to a new country just for a long weekend and be able to make the most of it in such a short time.",
"part10": "Exactly what Singapore can offer us. We are talking to you about this country because we live there. Other countries can make this possible, as well."
"part10": "Exactly what Singapore can offer us. We are talking to you about this country because we live there. Other countries can make this possible, as well.",
"part11": "Heavenly place in Singapore. Singapore is not just about buildings and crowds. You will find plenty of unknown places that will amaze you as much as Thailand."
},
"part7": {
"title1": "#Distance#",
Expand Down Expand Up @@ -130,7 +133,8 @@
"part3": "Take into account the size of the city as well, living in [Paris](paris) or living in the suburbs does not offer the same lifestyle, the same stress, and therefore the same environment.",
"part4": "You like the city, but you still need to be close to nature, with the sea less than an hour from your home, the mountains a few kilometers away, all for exotic weekends while living in the frenzy of the city during the week.",
"part5": "Or on the contrary, you want to go straight out of your accommodation for a hike.",
"part6": "Just like the climate, the environment will have an impact on your mood. We, therefore, find it important to ask the right questions."
"part6": "Just like the climate, the environment will have an impact on your mood. We, therefore, find it important to ask the right questions.",
"part7": "1, 2, 3... Splash"
},
"part11": {
"title1": "#Family#",
Expand All @@ -154,7 +158,8 @@
"part4": "We can talk about guns, traffickers, or gangs. Some countries authorize residents to carry weapons. Others don't care and let their citizens arm themselves. Often this leads to an increase in violence and crime. Which then leads to the creation of gangs and the establishment of traffickers. A bit of a vicious cycle from our point of view. However, this makes some neighborhoods in certain cities, and even certain regions of certain countries, very dangerous. Fortunately, this very rarely applies to an entire country. A country that comes to our mind and which makes us both dream and fear is [the United States](united-states).",
"part5": "We can also talk about diseases. If we keep hearing about COVID-19, many people forget that some countries are already affected by many diseases for many years and for which their infrastructures are not ready. Malaria, yellow fever, or even ebola. All are serious and fatal diseases for which there is not necessarily a vaccine as of today. We think about Africa without necessarily pointing at specific countries.",
"part6": "And we can talk about security in the cities. Some are known and recognized for their safety and the civility of their citizens. For example in Singapore, you can leave your phone or wallet unattended. There is no risk that someone will steal them from you. You can walk around without fear of getting mugged in any neighborhood. You feel safe anywhere and anytime.",
"part7": "For each point, We mentioned a country or a continent. We could have added many more examples, so don't be scared about it. We don't say you should avoid those countries, just be aware of dangers before moving. Don't forget as well that when we name a country, the hazard does not necessarily apply to the whole country or the whole continent."
"part7": "For each point, We mentioned a country or a continent. We could have added many more examples, so don't be scared about it. We don't say you should avoid those countries, just be aware of dangers before moving. Don't forget as well that when we name a country, the hazard does not necessarily apply to the whole country or the whole continent.",
"part8": "Lost in the Cambodian countryside."
},
"part13": {
"title1": "#Health#",
Expand All @@ -164,15 +169,15 @@
"part3": "Do not hesitate to compare offers in several insurances but above all do not miss it. Medical costs can be outrageous.",
"part4": "Some countries are also more renowned than others in terms of medicine and have modern infrastructure. It will inevitably affect the cost of services."
},
"part14":
{
"part14": {
"title1": "#Animals#",
"title2": "Can I bring my animals easily?",
"part1": "A real puzzle to find out which forms you will need to bring your animals!",
"part2": "In some countries, you will need to prepare at least six months before the departure because of all the vaccines. Check carefully. Missing vaccines can lead to a longer quarantine for your animal, or, even worst, your animal won't be allowed to come in.",
"part3": "For other countries, you will not have anything to provide. Finally, some countries limit the number of animals that can come in every year.",
"part4": "And let's be clear, there was no way we would move to a foreign country and abandon our animals. Yet, we had comments like: You are monsters, you traumatized them because of the plane when you could have given them to someone and not changed their habits. Social networks are very wonderful!",
"part5": "We will write a more detailed article on this because we received a lot of questions on the topic."
"part5": "We will write a more detailed article on this because we received a lot of questions on the topic.",
"part6": "We told you our cat always prevents us from taking photos."
},
"part15": {
"title1": "#Extra#",
Expand Down
14 changes: 8 additions & 6 deletions src/locales/fr/about/who.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
{
"title": "À propos de nous ...",
"description": "Après 6 ans de vie à Singapour, une expérience unique qui nous a permis de faire tant de voyages en Asie et en Océanie, nous voilà de retour en France avec d’autres projets et rêves plein la tête.",
"section1": "Après 6 ans d’amour, une routine boulot dodo et un manque de dépaysement nous avons décidé en 2016 de changer de vie pour venir nous installer à Singapour avec nos 2 chats sans jamais y avoir mis les pieds.",
"section2": "Une sacrée aventure qui nous a permis de faire de nombreux voyages.",
"section3": "Une sorte de journal intime que nous partageons avec vous, quelques astuces par ci par là mais surtout un carnet de souvenirs inoubliable que nous lirons nous-même dans le futur.",
"section4": "On se retrouve pour un nouvel article tous les samedis à 10h.",
"section5": "¡ Bonne aventure !",
"section6": "❤️ ️Mme Magic est particulièrement rêveuse, dévoreuse de romans et de séries, elle aime également faire des photos de tout et n'importe quoi. Sensible à la protection animale, adepte du shopping, elle cache derrière son sourire un très fort caractère. ❤️",
"section7": "❤️ Mr Magic est un passionné de manga et un fan de sport - dans la réalité comme dans un canapé -. Mi manchot, mi aventurier, il reste de tout temps d’un calme olympien. Très à l'aise avec un ordinateur, il s'occupe de la partie technique du blog. ❤️",
"section2": "Une sacrée aventure qui nous a permis de faire de nombreux voyages et découvertes en Asie et en Océanie mais surtout de magnifiques et inoubliables rencontres.",
"section3": "En 2022, après 6 ans de vie à Singapour, cette expérience unique prenait fin et nous avons repris le chemin de la France avec d’autres projets et rêves plein la tête.",
"section4": "Ce blog est une sorte de journal intime que nous partageons avec vous, quelques astuces par ci par là mais surtout un carnet de souvenirs inoubliable que nous lirons nous-même dans le futur.",
"section5": "On se retrouve pour un nouvel article toutes les deux semaines, le dimanche à 10h",
"section6": "¡ Bonne aventure !",
"section7": "❤️ Mme Magic est particulièrement rêveuse, dévoreuse de romans et de séries, elle aime également faire des photos de tout et n'importe quoi. Sensible à la protection animale, adepte du shopping, elle cache derrière son sourire un très fort caractère. ❤️",
"section8": "❤️ Mr Magic est un passionné de manga et un fan de sport - dans la réalité comme dans un canapé -. Mi manchot, mi aventurier, il reste de tout temps d’un calme olympien. Très à l'aise avec un ordinateur, il s'occupe de la partie technique du blog. ❤️",
"contact": "Nous Contacter"
}
Loading

0 comments on commit 3d4b3df

Please sign in to comment.