generaltranslation 9.4.0 → 9.4.2

package/dist/index.js

@@ -62,6 +62,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import { libraryDefaultLocale } from './settings/settings';
 import { noSourceLocaleProvidedError, noTargetLocaleProvidedError, } from './logging/errors';
 import { gtInstanceLogger } from './logging/logger';
@@ -229,7 +238,7 @@ var GT = /** @class */ (function (_super) {
                     case 0:
                         this._validateAuth('setupProject');
                         options = __assign(__assign({}, options), { locales: (_a = options === null || options === void 0 ? void 0 : options.locales) === null || _a === void 0 ? void 0 : _a.map(function (locale) {
-                                return _this.resolveCanonicalLocale(locale);
+                                return _this.resolveServiceLocale(locale);
                             }) });
                         return [4 /*yield*/, _setupProject(files, this._getTranslationConfig(), options)];
                     case 1: return [2 /*return*/, _b.sent()];
@@ -301,7 +310,7 @@ var GT = /** @class */ (function (_super) {
      */
     GT.prototype.enqueueFiles = function (files, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var mergedOptions, error, error;
+            var mergedOptions, error, error, targetLocaleIdentities, result;
             var _this = this;
             var _a, _b;
             return __generator(this, function (_c) {
@@ -323,12 +332,15 @@ var GT = /** @class */ (function (_super) {
                             gtInstanceLogger.error(error);
                             throw new Error(error);
                         }
-                        // Replace target locales with canonical locales
-                        mergedOptions = __assign(__assign({}, mergedOptions), { targetLocales: mergedOptions.targetLocales.map(function (locale) {
-                                return _this.resolveCanonicalLocale(locale);
+                        targetLocaleIdentities = __spreadArray([], mergedOptions.targetLocales, true);
+                        // Convert configured identities at the service boundary.
+                        mergedOptions = __assign(__assign({}, mergedOptions), { sourceLocale: this.resolveServiceLocale(mergedOptions.sourceLocale), targetLocales: mergedOptions.targetLocales.map(function (locale) {
+                                return _this.resolveServiceLocale(locale);
                             }) });
                         return [4 /*yield*/, _enqueueFiles(files, mergedOptions, this._getTranslationConfig())];
-                    case 1: return [2 /*return*/, _c.sent()];
+                    case 1:
+                        result = _c.sent();
+                        return [2 /*return*/, __assign(__assign({}, result), { locales: targetLocaleIdentities })];
                 }
             });
         });
@@ -360,12 +372,20 @@ var GT = /** @class */ (function (_super) {
      */
     GT.prototype.publishFiles = function (files) {
         return __awaiter(this, void 0, void 0, function () {
+            var result;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this._validateAuth('publishFiles');
                         return [4 /*yield*/, _publishFiles(files, this._getTranslationConfig())];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, {
+                                results: result.results.map(function (item) { return (__assign(__assign({}, item), (item.locale && {
+                                    locale: _this.resolveServiceResponseLocale(item.locale),
+                                }))); }),
+                            }];
                 }
             });
         });
@@ -384,7 +404,7 @@ var GT = /** @class */ (function (_super) {
                 switch (_a.label) {
                     case 0:
                         this._validateAuth('submitUserEditDiffs');
-                        normalized = __assign(__assign({}, payload), { diffs: (payload.diffs || []).map(function (d) { return (__assign(__assign({}, d), { locale: _this.resolveCanonicalLocale(d.locale) })); }) });
+                        normalized = __assign(__assign({}, payload), { diffs: (payload.diffs || []).map(function (d) { return (__assign(__assign({}, d), { locale: _this.resolveServiceLocale(d.locale) })); }) });
                         return [4 /*yield*/, _submitUserEditDiffs(normalized, this._getTranslationConfig())];
                     case 1:
                         _a.sent();
@@ -421,13 +441,19 @@ var GT = /** @class */ (function (_super) {
      */
     GT.prototype.getProjectInfo = function () {
         return __awaiter(this, arguments, void 0, function (options) {
+            var result;
+            var _this = this;
             if (options === void 0) { options = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this._validateAuth('getProjectInfo');
                         return [4 /*yield*/, _getProjectInfo(options, this._getTranslationConfig())];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1:
+                        result = _a.sent();
+                        return [2 /*return*/, __assign(__assign({}, result), { defaultLocale: this.resolveServiceResponseLocale(result.defaultLocale), currentLocales: result.currentLocales.map(function (locale) {
+                                    return _this.resolveServiceResponseLocale(locale);
+                                }) })];
                 }
             });
         });
@@ -444,15 +470,19 @@ var GT = /** @class */ (function (_super) {
                         // Validation
                         this._validateAuth('queryFileData');
                         // Replace target locales with canonical locales
-                        data.translatedFiles = (_a = data.translatedFiles) === null || _a === void 0 ? void 0 : _a.map(function (item) { return (__assign(__assign({}, item), { locale: _this.resolveCanonicalLocale(item.locale) })); });
+                        data.translatedFiles = (_a = data.translatedFiles) === null || _a === void 0 ? void 0 : _a.map(function (item) { return (__assign(__assign({}, item), { locale: _this.resolveServiceLocale(item.locale) })); });
                         return [4 /*yield*/, _queryFileData(data, options, this._getTranslationConfig())];
                     case 1:
                         result = _d.sent();
                         // Resolve canonical locales
-                        result.translatedFiles = (_b = result.translatedFiles) === null || _b === void 0 ? void 0 : _b.map(function (item) { return (__assign(__assign({}, item), (item.locale && { locale: _this.resolveAliasLocale(item.locale) }))); });
+                        result.translatedFiles = (_b = result.translatedFiles) === null || _b === void 0 ? void 0 : _b.map(function (item) { return (__assign(__assign({}, item), (item.locale && {
+                            locale: _this.resolveServiceResponseLocale(item.locale),
+                        }))); });
                         result.sourceFiles = (_c = result.sourceFiles) === null || _c === void 0 ? void 0 : _c.map(function (item) { return (__assign(__assign(__assign({}, item), (item.sourceLocale && {
-                            sourceLocale: _this.resolveAliasLocale(item.sourceLocale),
-                        })), { locales: item.locales.map(function (locale) { return _this.resolveAliasLocale(locale); }) })); });
+                            sourceLocale: _this.resolveServiceResponseLocale(item.sourceLocale),
+                        })), { locales: item.locales.map(function (locale) {
+                                return _this.resolveServiceResponseLocale(locale);
+                            }) })); });
                         return [2 /*return*/, result];
                 }
             });
@@ -485,13 +515,15 @@ var GT = /** @class */ (function (_super) {
                         return [4 /*yield*/, _querySourceFile(data, options, this._getTranslationConfig())];
                     case 1:
                         result = _a.sent();
-                        // Replace locales with canonical locales
-                        result.translations = result.translations.map(function (item) { return (__assign(__assign({}, item), (item.locale && { locale: _this.resolveAliasLocale(item.locale) }))); });
+                        // Restore configured identities from service language codes.
+                        result.translations = result.translations.map(function (item) { return (__assign(__assign({}, item), (item.locale && {
+                            locale: _this.resolveServiceResponseLocale(item.locale),
+                        }))); });
                         result.sourceFile.locales = result.sourceFile.locales.map(function (locale) {
-                            return _this.resolveAliasLocale(locale);
+                            return _this.resolveServiceResponseLocale(locale);
                         });
                         if (result.sourceFile.sourceLocale) {
-                            result.sourceFile.sourceLocale = this.resolveAliasLocale(result.sourceFile.sourceLocale);
+                            result.sourceFile.sourceLocale = this.resolveServiceResponseLocale(result.sourceFile.sourceLocale);
                         }
                         return [2 /*return*/, result];
                 }
@@ -523,11 +555,11 @@ var GT = /** @class */ (function (_super) {
                         return [4 /*yield*/, _getProjectData(projectId, options, this._getTranslationConfig())];
                     case 1:
                         result = _a.sent();
-                        // Replace locales with canonical locales
+                        // Restore configured identities from service language codes.
                         result.currentLocales = result.currentLocales.map(function (item) {
-                            return _this.resolveAliasLocale(item);
+                            return _this.resolveServiceResponseLocale(item);
                         });
-                        result.defaultLocale = this.resolveAliasLocale(result.defaultLocale);
+                        result.defaultLocale = this.resolveServiceResponseLocale(result.defaultLocale);
                         return [2 /*return*/, result];
                 }
             });
@@ -569,7 +601,7 @@ var GT = /** @class */ (function (_super) {
                                     fileId: file.fileId,
                                     branchId: file.branchId,
                                     locale: file.locale
-                                        ? this.resolveCanonicalLocale(file.locale)
+                                        ? this.resolveServiceLocale(file.locale)
                                         : undefined,
                                     versionId: file.versionId,
                                     useLatestAvailableVersion: file.useLatestAvailableVersion,
@@ -600,7 +632,7 @@ var GT = /** @class */ (function (_super) {
      */
     GT.prototype.downloadFileBatch = function (requests_1) {
         return __awaiter(this, arguments, void 0, function (requests, options) {
-            var result;
+            var requestedFiles, result;
             var _this = this;
             if (options === void 0) { options = {}; }
             return __generator(this, function (_a) {
@@ -608,16 +640,37 @@ var GT = /** @class */ (function (_super) {
                     case 0:
                         // Validation
                         this._validateAuth('downloadFileBatch');
-                        requests = requests.map(function (request) { return (__assign(__assign({}, request), { locale: request.locale
-                                ? _this.resolveCanonicalLocale(request.locale)
-                                : undefined })); });
+                        requestedFiles = new Map();
+                        requests = requests.map(function (request) {
+                            var _a;
+                            var locale = request.locale
+                                ? _this.resolveServiceLocale(request.locale)
+                                : undefined;
+                            if (locale) {
+                                var key = JSON.stringify([request.fileId, locale]);
+                                var group = (_a = requestedFiles.get(key)) !== null && _a !== void 0 ? _a : [];
+                                group.push(request);
+                                requestedFiles.set(key, group);
+                            }
+                            return __assign(__assign({}, request), { locale: locale });
+                        });
                         return [4 /*yield*/, _downloadFileBatch(requests, options, this._getTranslationConfig())];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, {
-                                files: result.data.map(function (file) { return (__assign(__assign({}, file), (file.locale && {
-                                    locale: _this.resolveAliasLocale(file.locale),
-                                }))); }),
+                                files: result.data.map(function (file) {
+                                    var _a;
+                                    if (!file.locale)
+                                        return file;
+                                    var serviceLocale = _this.standardizeLocale(file.locale);
+                                    var matchingRequests = ((_a = requestedFiles.get(JSON.stringify([file.fileId, serviceLocale]))) !== null && _a !== void 0 ? _a : []).filter(function (request) {
+                                        return (!request.branchId || request.branchId === file.branchId) &&
+                                            (!request.versionId || request.versionId === file.versionId);
+                                    });
+                                    return __assign(__assign({}, file), { locale: matchingRequests.length === 1
+                                            ? matchingRequests[0].locale
+                                            : _this.resolveServiceResponseLocale(file.locale) });
+                                }),
                                 count: result.count,
                             }];
                 }
@@ -646,9 +699,9 @@ var GT = /** @class */ (function (_super) {
                     case 0:
                         // Validation
                         this._validateAuth('uploadSourceFiles');
-                        mergedOptions = __assign(__assign({}, options), { sourceLocale: this.resolveCanonicalLocale((_b = (_a = options.sourceLocale) !== null && _a !== void 0 ? _a : this.sourceLocale) !== null && _b !== void 0 ? _b : libraryDefaultLocale) });
+                        mergedOptions = __assign(__assign({}, options), { sourceLocale: this.resolveServiceLocale((_b = (_a = options.sourceLocale) !== null && _a !== void 0 ? _a : this.sourceLocale) !== null && _b !== void 0 ? _b : libraryDefaultLocale) });
                         // resolve canonical locales
-                        files = files.map(function (f) { return (__assign(__assign({}, f), { source: __assign(__assign({}, f.source), { locale: _this.resolveCanonicalLocale(f.source.locale) }) })); });
+                        files = files.map(function (f) { return (__assign(__assign({}, f), { source: __assign(__assign({}, f.source), { locale: _this.resolveServiceLocale(f.source.locale) }) })); });
                         return [4 /*yield*/, _uploadSourceFiles(files, mergedOptions, this._getTranslationConfig())];
                     case 1:
                         result = _c.sent();
@@ -716,8 +769,8 @@ var GT = /** @class */ (function (_super) {
                             gtInstanceLogger.error(error);
                             throw new Error(error);
                         }
-                        mergedOptions.sourceLocale = this.resolveCanonicalLocale(mergedOptions.sourceLocale);
-                        targetFiles = files.map(function (f) { return (__assign(__assign({}, f), { translations: f.translations.map(function (t) { return (__assign(__assign({}, t), { locale: _this.resolveCanonicalLocale(t.locale) })); }) })); });
+                        mergedOptions.sourceLocale = this.resolveServiceLocale(mergedOptions.sourceLocale);
+                        targetFiles = files.map(function (f) { return (__assign(__assign({}, f), { source: __assign(__assign({}, f.source), { locale: _this.resolveServiceLocale(f.source.locale) }), translations: f.translations.map(function (t) { return (__assign(__assign({}, t), { locale: _this.resolveServiceLocale(t.locale) })); }) })); });
                         return [4 /*yield*/, _uploadTranslations(targetFiles, mergedOptions, this._getTranslationConfig())];
                     case 1:
                         result = _b.sent();

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { l as defaultTimeout } from "./unwrapApiResult-BzGfPw75.mjs";
-import { a as gtInstanceLogger, c as translationRequestFailedError, i as fetchLogger, l as translationTimeoutError, n as validateResponse, o as noSourceLocaleProvidedError, r as fetchWithTimeout, s as noTargetLocaleProvidedError, t as GTRuntime } from "./runtime-BiKgjDUI.mjs";
+import { a as gtInstanceLogger, c as translationRequestFailedError, i as fetchLogger, l as translationTimeoutError, n as validateResponse, o as noSourceLocaleProvidedError, r as fetchWithTimeout, s as noTargetLocaleProvidedError, t as GTRuntime } from "./runtime-Bcp4F2ME.mjs";
 import { c as decode, f as isSupportedFileFormatTransform, n as declareVar, p as API_VERSION, r as decodeVars, t as derive, u as encode } from "./derive-CTzR56T_.mjs";
 import { n as isBinaryFileFormat } from "./file-Dga6cyM8.mjs";
 import { LocaleConfig, determineLocale, formatCurrency, formatCutoff, formatDateTime, formatList, formatListToParts, formatMessage, formatNum, formatRelativeTime, formatRelativeTimeFromDate, getLocaleDirection, getLocaleEmoji, getLocaleName, getLocaleProperties, getRegionProperties, isSameDialect, isSameLanguage, isSupersetLocale, isValidLocale, requiresTranslation, resolveAliasLocale, resolveCanonicalLocale, standardizeLocale } from "@generaltranslation/format";
@@ -772,7 +772,7 @@ var GT = class extends GTRuntime {
 		this._validateAuth("setupProject");
 		options = {
 			...options,
-			locales: options?.locales?.map((locale) => this.resolveCanonicalLocale(locale))
+			locales: options?.locales?.map((locale) => this.resolveServiceLocale(locale))
 		};
 		return await _setupProject(files, this._getTranslationConfig(), options);
 	}
@@ -837,11 +837,16 @@ var GT = class extends GTRuntime {
 			gtInstanceLogger.error(error);
 			throw new Error(error);
 		}
+		const targetLocaleIdentities = [...mergedOptions.targetLocales];
 		mergedOptions = {
 			...mergedOptions,
-			targetLocales: mergedOptions.targetLocales.map((locale) => this.resolveCanonicalLocale(locale))
+			sourceLocale: this.resolveServiceLocale(mergedOptions.sourceLocale),
+			targetLocales: mergedOptions.targetLocales.map((locale) => this.resolveServiceLocale(locale))
+		};
+		return {
+			...await _enqueueFiles(files, mergedOptions, this._getTranslationConfig()),
+			locales: targetLocaleIdentities
 		};
-		return await _enqueueFiles(files, mergedOptions, this._getTranslationConfig());
 	}
 	/**
 	* Creates or upserts a file tag, associating a set of source files
@@ -862,7 +867,10 @@ var GT = class extends GTRuntime {
 	*/
 	async publishFiles(files) {
 		this._validateAuth("publishFiles");
-		return await _publishFiles(files, this._getTranslationConfig());
+		return { results: (await _publishFiles(files, this._getTranslationConfig())).results.map((item) => ({
+			...item,
+			...item.locale && { locale: this.resolveServiceResponseLocale(item.locale) }
+		})) };
 	}
 	/**
 	* Submits user edit diffs for existing translations so future generations preserve user intent.
@@ -876,7 +884,7 @@ var GT = class extends GTRuntime {
 			...payload,
 			diffs: (payload.diffs || []).map((d) => ({
 				...d,
-				locale: this.resolveCanonicalLocale(d.locale)
+				locale: this.resolveServiceLocale(d.locale)
 			}))
 		}, this._getTranslationConfig());
 	}
@@ -908,23 +916,28 @@ var GT = class extends GTRuntime {
 	*/
 	async getProjectInfo(options = {}) {
 		this._validateAuth("getProjectInfo");
-		return await _getProjectInfo(options, this._getTranslationConfig());
+		const result = await _getProjectInfo(options, this._getTranslationConfig());
+		return {
+			...result,
+			defaultLocale: this.resolveServiceResponseLocale(result.defaultLocale),
+			currentLocales: result.currentLocales.map((locale) => this.resolveServiceResponseLocale(locale))
+		};
 	}
 	async queryFileData(data, options = {}) {
 		this._validateAuth("queryFileData");
 		data.translatedFiles = data.translatedFiles?.map((item) => ({
 			...item,
-			locale: this.resolveCanonicalLocale(item.locale)
+			locale: this.resolveServiceLocale(item.locale)
 		}));
 		const result = await _queryFileData(data, options, this._getTranslationConfig());
 		result.translatedFiles = result.translatedFiles?.map((item) => ({
 			...item,
-			...item.locale && { locale: this.resolveAliasLocale(item.locale) }
+			...item.locale && { locale: this.resolveServiceResponseLocale(item.locale) }
 		}));
 		result.sourceFiles = result.sourceFiles?.map((item) => ({
 			...item,
-			...item.sourceLocale && { sourceLocale: this.resolveAliasLocale(item.sourceLocale) },
-			locales: item.locales.map((locale) => this.resolveAliasLocale(locale))
+			...item.sourceLocale && { sourceLocale: this.resolveServiceResponseLocale(item.sourceLocale) },
+			locales: item.locales.map((locale) => this.resolveServiceResponseLocale(locale))
 		}));
 		return result;
 	}
@@ -947,10 +960,10 @@ var GT = class extends GTRuntime {
 		const result = await _querySourceFile(data, options, this._getTranslationConfig());
 		result.translations = result.translations.map((item) => ({
 			...item,
-			...item.locale && { locale: this.resolveAliasLocale(item.locale) }
+			...item.locale && { locale: this.resolveServiceResponseLocale(item.locale) }
 		}));
-		result.sourceFile.locales = result.sourceFile.locales.map((locale) => this.resolveAliasLocale(locale));
-		if (result.sourceFile.sourceLocale) result.sourceFile.sourceLocale = this.resolveAliasLocale(result.sourceFile.sourceLocale);
+		result.sourceFile.locales = result.sourceFile.locales.map((locale) => this.resolveServiceResponseLocale(locale));
+		if (result.sourceFile.sourceLocale) result.sourceFile.sourceLocale = this.resolveServiceResponseLocale(result.sourceFile.sourceLocale);
 		return result;
 	}
 	/**
@@ -968,8 +981,8 @@ var GT = class extends GTRuntime {
 	async getProjectData(projectId, options = {}) {
 		this._validateAuth("getProjectData");
 		const result = await _getProjectData(projectId, options, this._getTranslationConfig());
-		result.currentLocales = result.currentLocales.map((item) => this.resolveAliasLocale(item));
-		result.defaultLocale = this.resolveAliasLocale(result.defaultLocale);
+		result.currentLocales = result.currentLocales.map((item) => this.resolveServiceResponseLocale(item));
+		result.defaultLocale = this.resolveServiceResponseLocale(result.defaultLocale);
 		return result;
 	}
 	/**
@@ -998,7 +1011,7 @@ var GT = class extends GTRuntime {
 		return (await _downloadFileBatch([{
 			fileId: file.fileId,
 			branchId: file.branchId,
-			locale: file.locale ? this.resolveCanonicalLocale(file.locale) : void 0,
+			locale: file.locale ? this.resolveServiceLocale(file.locale) : void 0,
 			versionId: file.versionId,
 			useLatestAvailableVersion: file.useLatestAvailableVersion
 		}], options, this._getTranslationConfig())).data?.[0]?.data ?? "";
@@ -1021,16 +1034,31 @@ var GT = class extends GTRuntime {
 	*/
 	async downloadFileBatch(requests, options = {}) {
 		this._validateAuth("downloadFileBatch");
-		requests = requests.map((request) => ({
-			...request,
-			locale: request.locale ? this.resolveCanonicalLocale(request.locale) : void 0
-		}));
+		const requestedFiles = /* @__PURE__ */ new Map();
+		requests = requests.map((request) => {
+			const locale = request.locale ? this.resolveServiceLocale(request.locale) : void 0;
+			if (locale) {
+				const key = JSON.stringify([request.fileId, locale]);
+				const group = requestedFiles.get(key) ?? [];
+				group.push(request);
+				requestedFiles.set(key, group);
+			}
+			return {
+				...request,
+				locale
+			};
+		});
 		const result = await _downloadFileBatch(requests, options, this._getTranslationConfig());
 		return {
-			files: result.data.map((file) => ({
-				...file,
-				...file.locale && { locale: this.resolveAliasLocale(file.locale) }
-			})),
+			files: result.data.map((file) => {
+				if (!file.locale) return file;
+				const serviceLocale = this.standardizeLocale(file.locale);
+				const matchingRequests = (requestedFiles.get(JSON.stringify([file.fileId, serviceLocale])) ?? []).filter((request) => (!request.branchId || request.branchId === file.branchId) && (!request.versionId || request.versionId === file.versionId));
+				return {
+					...file,
+					locale: matchingRequests.length === 1 ? matchingRequests[0].locale : this.resolveServiceResponseLocale(file.locale)
+				};
+			}),
 			count: result.count
 		};
 	}
@@ -1050,13 +1078,13 @@ var GT = class extends GTRuntime {
 		this._validateAuth("uploadSourceFiles");
 		const mergedOptions = {
 			...options,
-			sourceLocale: this.resolveCanonicalLocale(options.sourceLocale ?? this.sourceLocale ?? "en")
+			sourceLocale: this.resolveServiceLocale(options.sourceLocale ?? this.sourceLocale ?? "en")
 		};
 		files = files.map((f) => ({
 			...f,
 			source: {
 				...f.source,
-				locale: this.resolveCanonicalLocale(f.source.locale)
+				locale: this.resolveServiceLocale(f.source.locale)
 			}
 		}));
 		const result = await _uploadSourceFiles(files, mergedOptions, this._getTranslationConfig());
@@ -1107,12 +1135,16 @@ var GT = class extends GTRuntime {
 			gtInstanceLogger.error(error);
 			throw new Error(error);
 		}
-		mergedOptions.sourceLocale = this.resolveCanonicalLocale(mergedOptions.sourceLocale);
+		mergedOptions.sourceLocale = this.resolveServiceLocale(mergedOptions.sourceLocale);
 		const result = await _uploadTranslations(files.map((f) => ({
 			...f,
+			source: {
+				...f.source,
+				locale: this.resolveServiceLocale(f.source.locale)
+			},
 			translations: f.translations.map((t) => ({
 				...t,
-				locale: this.resolveCanonicalLocale(t.locale)
+				locale: this.resolveServiceLocale(t.locale)
 			}))
 		})), mergedOptions, this._getTranslationConfig());
 		return {