Merge commit '6c8c3de87c08ae63d04b2b4bc1049bd35eac19fe' into testE2E-timezone
commit
bca1fffd23
|
@ -161,3 +161,48 @@ If you get errors, be sure to fix them before committing.
|
||||||
- If your PR refers to or fixes an issue, be sure to add `refs #XXX` or `fixes #XXX` to the PR description. Replacing `XXX` with the respective issue number. See more about [Linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
|
- If your PR refers to or fixes an issue, be sure to add `refs #XXX` or `fixes #XXX` to the PR description. Replacing `XXX` with the respective issue number. See more about [Linking a pull request to an issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
|
||||||
- Be sure to fill the PR Template accordingly.
|
- Be sure to fill the PR Template accordingly.
|
||||||
- Review [App Contribution Guidelines](./packages/app-store/CONTRIBUTING.md) when building integrations
|
- Review [App Contribution Guidelines](./packages/app-store/CONTRIBUTING.md) when building integrations
|
||||||
|
|
||||||
|
## Guidelines for committing yarn lockfile
|
||||||
|
|
||||||
|
Do not commit your `yarn.lock` unless you've made changes to the `package.json`. If you've already committed `yarn.lock` unintentionally, follow these steps to undo:
|
||||||
|
|
||||||
|
If your last commit has the `yarn.lock` file alongside other files and you only wish to uncommit the `yarn.lock`:
|
||||||
|
```bash
|
||||||
|
git checkout HEAD~1 yarn.lock
|
||||||
|
git commit -m "Revert yarn.lock changes"
|
||||||
|
```
|
||||||
|
If you've pushed the commit with the `yarn.lock`:
|
||||||
|
1. Correct the commit locally using the above method.
|
||||||
|
2. Carefully force push:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git push origin <your-branch-name> --force
|
||||||
|
```
|
||||||
|
|
||||||
|
If `yarn.lock` was committed a while ago and there have been several commits since, you can use the following steps to revert just the `yarn.lock` changes without impacting the subsequent changes:
|
||||||
|
|
||||||
|
1. **Checkout a Previous Version**:
|
||||||
|
- Find the commit hash before the `yarn.lock` was unintentionally committed. You can do this by viewing the Git log:
|
||||||
|
```bash
|
||||||
|
git log yarn.lock
|
||||||
|
```
|
||||||
|
- Once you have identified the commit hash, use it to checkout the previous version of `yarn.lock`:
|
||||||
|
```bash
|
||||||
|
git checkout <commit_hash> yarn.lock
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Commit the Reverted Version**:
|
||||||
|
- After checking out the previous version of the `yarn.lock`, commit this change:
|
||||||
|
```bash
|
||||||
|
git commit -m "Revert yarn.lock to its state before unintended changes"
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Proceed with Caution**:
|
||||||
|
- If you need to push this change, first pull the latest changes from your remote branch to ensure you're not overwriting other recent changes:
|
||||||
|
```bash
|
||||||
|
git pull origin <your-branch-name>
|
||||||
|
```
|
||||||
|
- Then push the updated branch:
|
||||||
|
```bash
|
||||||
|
git push origin <your-branch-name>
|
||||||
|
```
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
// see https://inlang.com/
|
|
||||||
export async function defineConfig(env) {
|
|
||||||
const { default: i18nextPlugin } = await env.$import(
|
|
||||||
"https://cdn.jsdelivr.net/npm/@inlang/plugin-i18next@2/dist/index.js"
|
|
||||||
);
|
|
||||||
|
|
||||||
const { default: standardLintRules } = await env.$import(
|
|
||||||
"https://cdn.jsdelivr.net/npm/@inlang/plugin-standard-lint-rules@3/dist/index.js"
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
referenceLanguage: "en",
|
|
||||||
plugins: [
|
|
||||||
i18nextPlugin({
|
|
||||||
pathPattern: "./apps/web/public/static/locales/{language}/common.json",
|
|
||||||
}),
|
|
||||||
standardLintRules({
|
|
||||||
// deactivating identical pattern because of nested
|
|
||||||
// resources like "de-DE" and "de-AT" where "de-AT"
|
|
||||||
// contrains overwrites but the majority are identical patterns.
|
|
||||||
identicalPattern: "off",
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"$schema": "https://inlang.com/schema/project-settings",
|
||||||
|
"sourceLanguageTag": "en",
|
||||||
|
"languageTags": ["ar", "az", "bg", "ca", "cs", "da", "de", "el", "en", "es-419", "es", "eu", "fr", "he", "hr", "hu", "id", "it", "iw", "ja", "ko", "nl", "no", "pl", "pt-BR", "pt", "ro", "ru", "sk", "sr", "sv", "ta", "tr", "uk", "vi", "zh-CN", "zh-TW"],
|
||||||
|
"modules": [
|
||||||
|
"https://cdn.jsdelivr.net/npm/@inlang/plugin-i18next@4/dist/index.js",
|
||||||
|
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-empty-pattern@1/dist/index.js",
|
||||||
|
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-identical-pattern@1/dist/index.js",
|
||||||
|
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-without-source@1/dist/index.js",
|
||||||
|
"https://cdn.jsdelivr.net/npm/@inlang/message-lint-rule-missing-translation@1/dist/index.js"
|
||||||
|
],
|
||||||
|
"plugin.inlang.i18next": {
|
||||||
|
"pathPattern": "./apps/web/public/static/locales/{languageTag}/common.json"
|
||||||
|
},
|
||||||
|
"plugin.inlang.standardLintRules": {
|
||||||
|
"identicalPattern": "off"
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue