Skip to content

Commit

Permalink
Merge branch 'feature/add-translation-into-application' of https://gi…
Browse files Browse the repository at this point in the history
…thub.com/BesLogic/releaf-canopeum into feature/add-translation-into-application
  • Loading branch information
AlexGeorge29 committed Mar 23, 2024
2 parents d301920 + fb1ad66 commit a51a35b
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion canopeum_frontend/src/components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const Navbar = () => {
</ul>
</div>
</div>
<button
<button
className="btn btn-primary"
onClick={handleChangeLanguage}
type='button'
Expand Down
2 changes: 1 addition & 1 deletion canopeum_frontend/src/locale/en/home.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"home": "Home"
}
}
6 changes: 3 additions & 3 deletions canopeum_frontend/src/locale/en/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import homeJSON from './home.json'

const enJSON = {
translation: {...homeJSON }
const enJSON = {
translation: {...homeJSON }
}

export default enJSON
export default enJSON
2 changes: 1 addition & 1 deletion canopeum_frontend/src/locale/fr/home.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"home": "Accueil"
}
}
6 changes: 3 additions & 3 deletions canopeum_frontend/src/locale/fr/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import homeJSON from './home.json'

const frJSON = {
translation: {...homeJSON }
const frJSON = {
translation: {...homeJSON }
}

export default frJSON
export default frJSON
2 changes: 1 addition & 1 deletion canopeum_frontend/src/locale/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ const resources = {
fr: {...frJSON}
}

export default resources
export default resources
1 change: 0 additions & 1 deletion canopeum_frontend/src/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ const Home = () => {
);
};
export default Home;

0 comments on commit a51a35b

Please sign in to comment.