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.

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

feat: add localization feature and footer to test with #30

Merged

Conversation

chosww
Copy link
Collaborator

@chosww chosww commented Oct 30, 2024

No description provided.

@chosww
Copy link
Collaborator Author

chosww commented Oct 30, 2024

@greatislander seems like I don't have permission to create a branch on main repo, so I opened a draft PR from a forked repo.

src/_includes/partials/global/footer.njk Outdated Show resolved Hide resolved
package.json Outdated
@@ -30,8 +30,10 @@
"homepage": "https://github.com/inclusive-design/standards.idrc.ocadu.ca#readme",
"dependencies": {
"@11ty/eleventy": "^3.0.0-beta.1",
Copy link
Member

Choose a reason for hiding this comment

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

Can you merge changes from main into your branch? It's using v3 now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I am having some weird issue with Git, where I can't merge main branch to this one. CLI is keep saying that it is already up to date, but I don't see this package changes. Just letting you know that I am going to merge main for the dependency updates.

Copy link
Member

Choose a reason for hiding this comment

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

I think you may need to add the upstream if you have cloned your own fork. Do you want to walk through that process?

Copy link
Member

Choose a reason for hiding this comment

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

@chosww Can you push the merge we did yesterday?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Hey @greatislander, happen to be that eleventy 3.0 update was only made to package-lock.json, and package.json is not updated in main branch. I thought it was an issue with git, but I already have the latest changes in this PR

Copy link
Member

Choose a reason for hiding this comment

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

I've updated main for clarity (Eleventy 3.0.0 matched that version requirement but I think it's better to be clear that we aren't using a beta). Can you merge upstream main in?

src/_includes/partials/global/language-selector.njk Outdated Show resolved Hide resolved
@greatislander greatislander added the enhancement New feature or request label Nov 1, 2024
@chosww chosww marked this pull request as ready for review November 5, 2024 19:05
@greatislander greatislander merged commit 38db80c into inclusive-design:main Nov 6, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants