Skip to content

Commit 71471a7

Browse files
committed
Merge branch 'main' of https://github.com/SXsid/lingo.dev
2 parents 6d3272c + b71bf63 commit 71471a7

13 files changed

Lines changed: 114 additions & 41 deletions

File tree

.changeset/funny-shoes-scream.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/new-buses-carry.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/polite-trees-compete.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.changeset/serious-wasps-unite.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ node_modules
1414

1515
# Testing
1616
coverage
17+
.idea
1718

1819
# Turbo
1920
.turbo

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ cd packages/cli
2424
pnpm run dev
2525

2626
# in terminal window 2 - test the CLI
27-
cd package
27+
cd packages/cli
2828
pnpm lingo.dev --help # this command will use the current cli code + demo config from ./package/i18n.json
2929
```
3030

packages/cli/src/cli/cmd/cleanup.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { I18nConfig, resolveOverridenLocale } from "@lingo.dev/_spec";
1+
import { I18nConfig, resolveOverriddenLocale } from "@lingo.dev/_spec";
22
import { Command } from "interactive-commander";
33
import _ from "lodash";
44
import { getConfig } from "../utils/config";
@@ -38,17 +38,20 @@ export default new Command()
3838
ora.info(`Processing bucket: ${bucket.type}`);
3939

4040
for (const bucketConfig of bucket.config) {
41-
const sourceLocale = resolveOverridenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
41+
const sourceLocale = resolveOverriddenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
4242
const bucketOra = Ora({ indent: 2 }).info(`Processing path: ${bucketConfig.pathPattern}`);
43-
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, { isCacheRestore: false, defaultLocale: sourceLocale });
43+
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
44+
isCacheRestore: false,
45+
defaultLocale: sourceLocale,
46+
});
4447
bucketLoader.setDefaultLocale(sourceLocale);
4548

4649
// Load source data
4750
const sourceData = await bucketLoader.pull(sourceLocale);
4851
const sourceKeys = Object.keys(sourceData);
4952

5053
for (const _targetLocale of targetLocales) {
51-
const targetLocale = resolveOverridenLocale(_targetLocale, bucketConfig.delimiter);
54+
const targetLocale = resolveOverriddenLocale(_targetLocale, bucketConfig.delimiter);
5255
try {
5356
const targetData = await bucketLoader.pull(targetLocale);
5457
const targetKeys = Object.keys(targetData);

packages/cli/src/cli/cmd/i18n.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { bucketTypeSchema, I18nConfig, localeCodeSchema, resolveOverridenLocale } from "@lingo.dev/_spec";
1+
import { bucketTypeSchema, I18nConfig, localeCodeSchema, resolveOverriddenLocale } from "@lingo.dev/_spec";
22
import { LingoDotDevEngine } from "@lingo.dev/_sdk";
33
import { Command } from "interactive-commander";
44
import Z from "zod";
@@ -79,7 +79,7 @@ export default new Command()
7979
ora.start("Creating i18n.lock...");
8080
for (const bucket of buckets) {
8181
for (const bucketConfig of bucket.config) {
82-
const sourceLocale = resolveOverridenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
82+
const sourceLocale = resolveOverriddenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
8383

8484
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
8585
isCacheRestore: false,
@@ -110,7 +110,7 @@ export default new Command()
110110
const bucketOra = Ora({ indent: 4 });
111111
bucketOra.info(`Processing path: ${bucketConfig.pathPattern}`);
112112

113-
const sourceLocale = resolveOverridenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
113+
const sourceLocale = resolveOverriddenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
114114
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
115115
isCacheRestore: true,
116116
defaultLocale: sourceLocale,
@@ -154,7 +154,7 @@ export default new Command()
154154
let requiresUpdate: string | null = null;
155155
bucketLoop: for (const bucket of buckets) {
156156
for (const bucketConfig of bucket.config) {
157-
const sourceLocale = resolveOverridenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
157+
const sourceLocale = resolveOverriddenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
158158

159159
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
160160
isCacheRestore: false,
@@ -176,7 +176,7 @@ export default new Command()
176176
}
177177

178178
for (const _targetLocale of targetLocales) {
179-
const targetLocale = resolveOverridenLocale(_targetLocale, bucketConfig.delimiter);
179+
const targetLocale = resolveOverriddenLocale(_targetLocale, bucketConfig.delimiter);
180180
const { unlocalizable: targetUnlocalizable, ...targetData } = await bucketLoader.pull(targetLocale);
181181

182182
const missingKeys = _.difference(Object.keys(sourceData), Object.keys(targetData));
@@ -227,7 +227,7 @@ export default new Command()
227227
for (const bucketConfig of bucket.config) {
228228
const bucketOra = Ora({ indent: 2 }).info(`Processing path: ${bucketConfig.pathPattern}`);
229229

230-
const sourceLocale = resolveOverridenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
230+
const sourceLocale = resolveOverriddenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
231231

232232
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
233233
isCacheRestore: false,
@@ -238,7 +238,7 @@ export default new Command()
238238
let sourceData = await bucketLoader.pull(sourceLocale);
239239

240240
for (const _targetLocale of targetLocales) {
241-
const targetLocale = resolveOverridenLocale(_targetLocale, bucketConfig.delimiter);
241+
const targetLocale = resolveOverriddenLocale(_targetLocale, bucketConfig.delimiter);
242242
try {
243243
bucketOra.start(`[${sourceLocale} -> ${targetLocale}] (0%) Localization in progress...`);
244244

packages/cli/src/cli/cmd/lockfile.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Command } from "interactive-commander";
22
import Z from "zod";
33
import Ora from "ora";
44
import { createLockfileHelper } from "../utils/lockfile";
5-
import { bucketTypeSchema, resolveOverridenLocale } from "@lingo.dev/_spec";
5+
import { bucketTypeSchema, resolveOverriddenLocale } from "@lingo.dev/_spec";
66
import { getConfig } from "../utils/config";
77
import createBucketLoader from "../loaders";
88
import { getBuckets } from "../utils/buckets";
@@ -25,8 +25,11 @@ export default new Command()
2525

2626
for (const bucket of buckets) {
2727
for (const bucketConfig of bucket.config) {
28-
const sourceLocale = resolveOverridenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
29-
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, { isCacheRestore: false, defaultLocale: sourceLocale });
28+
const sourceLocale = resolveOverriddenLocale(i18nConfig!.locale.source, bucketConfig.delimiter);
29+
const bucketLoader = createBucketLoader(bucket.type, bucketConfig.pathPattern, {
30+
isCacheRestore: false,
31+
defaultLocale: sourceLocale,
32+
});
3033
bucketLoader.setDefaultLocale(sourceLocale);
3134

3235
const sourceData = await bucketLoader.pull(sourceLocale);

packages/cli/src/cli/cmd/show/files.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Ora from "ora";
44
import { getConfig } from "../../utils/config";
55
import { CLIError } from "../../utils/errors";
66
import { getBuckets } from "../../utils/buckets";
7-
import { resolveOverridenLocale } from "@lingo.dev/_spec";
7+
import { resolveOverriddenLocale } from "@lingo.dev/_spec";
88

99
export default new Command()
1010
.command("files")
@@ -28,10 +28,10 @@ export default new Command()
2828
const buckets = getBuckets(i18nConfig);
2929
for (const bucket of buckets) {
3030
for (const bucketConfig of bucket.config) {
31-
const sourceLocale = resolveOverridenLocale(i18nConfig.locale.source, bucketConfig.delimiter);
31+
const sourceLocale = resolveOverriddenLocale(i18nConfig.locale.source, bucketConfig.delimiter);
3232
const sourcePath = bucketConfig.pathPattern.replace(/\[locale\]/g, sourceLocale);
3333
const targetPaths = i18nConfig.locale.targets.map((_targetLocale) => {
34-
const targetLocale = resolveOverridenLocale(_targetLocale, bucketConfig.delimiter);
34+
const targetLocale = resolveOverriddenLocale(_targetLocale, bucketConfig.delimiter);
3535
return bucketConfig.pathPattern.replace(/\[locale\]/g, targetLocale);
3636
});
3737

0 commit comments

Comments
 (0)