Skip to content

Commit 1e81a00

Browse files
mb-008mb-008
authored
fix(cli): typo in resolveOverridenLocale function name (#576)
* fix(cli): fix typo in resolveOverridenLocale function name * fix(cli): fix Added changeset
1 parent 220fb10 commit 1e81a00

File tree

7 files changed

+29
-21
lines changed

7 files changed

+29
-21
lines changed

‎.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+
---

‎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

‎packages/cli/src/cli/utils/buckets.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import _ from "lodash";
22
import path from "path";
33
import { glob } from "glob";
44
import { CLIError } from "./errors";
5-
import { I18nConfig, resolveOverridenLocale, BucketItem } from "@lingo.dev/_spec";
5+
import { I18nConfig, resolveOverriddenLocale, BucketItem } from "@lingo.dev/_spec";
66
import { bucketTypeSchema } from "@lingo.dev/_spec";
77
import Z from "zod";
88

@@ -21,15 +21,15 @@ export function getBuckets(i18nConfig: I18nConfig) {
2121

2222
function extractPathPatterns(sourceLocale: string, include: BucketItem[], exclude?: BucketItem[]) {
2323
const includedPatterns = include.flatMap((pattern) =>
24-
expandPlaceholderedGlob(pattern.path, resolveOverridenLocale(sourceLocale, pattern.delimiter)).map(
24+
expandPlaceholderedGlob(pattern.path, resolveOverriddenLocale(sourceLocale, pattern.delimiter)).map(
2525
(pathPattern) => ({
2626
pathPattern,
2727
delimiter: pattern.delimiter,
2828
}),
2929
),
3030
);
3131
const excludedPatterns = exclude?.flatMap((pattern) =>
32-
expandPlaceholderedGlob(pattern.path, resolveOverridenLocale(sourceLocale, pattern.delimiter)).map(
32+
expandPlaceholderedGlob(pattern.path, resolveOverriddenLocale(sourceLocale, pattern.delimiter)).map(
3333
(pathPattern) => ({
3434
pathPattern,
3535
delimiter: pattern.delimiter,

‎packages/spec/src/locales.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ export const getLocaleCodeDelimiter = (locale: string): string | null => {
249249
}
250250
};
251251

252-
export const resolveOverridenLocale = (locale: string, delimiter?: "-" | "_" | null): string => {
252+
export const resolveOverriddenLocale = (locale: string, delimiter?: "-" | "_" | null): string => {
253253
if (!delimiter) {
254254
return locale;
255255
}

0 commit comments

Comments
 (0)