Merge pull request #16 from lokalise/feature/MRP-700_locales

MRP-700 Ditto locales

Author: m-evans-1

src/modules/publish/PublishService.ts

@@ -36,12 +36,20 @@ export class PublishService {
     }
 
     const locales = Object.keys(items[0].translations)
+    const engineLocalesMap = new Map<string, string>()
+    const connectorLocalesMap = new Map<string, string>()
+    locales.forEach((locale) => {
+      const lowerCased = locale !== defaultLocale ? locale.toLowerCase() : locale
+      engineLocalesMap.set(locale, lowerCased)
+      connectorLocalesMap.set(lowerCased, locale)
+    })
     const toUpdate: VariantUpdateData = {}
 
-    for (const locale of locales) {
-      toUpdate[locale] = {}
+    for (const engineLocale of locales) {
+      const connectorLocale = engineLocalesMap.get(engineLocale) ?? engineLocale
+      toUpdate[connectorLocale] = {}
       for (const item of items) {
-        toUpdate[locale][item.uniqueId] = { text: item.translations[locale] }
+        toUpdate[connectorLocale][item.uniqueId] = { text: item.translations[engineLocale] }
       }
     }
     const toUpdateDataEntries = Object.entries(toUpdate)
@@ -58,16 +66,17 @@ export class PublishService {
       if (isRejected(result) && variant) {
         const uniqueIdsWithError = Object.keys(data)
 
+        const engineVariant = connectorLocalesMap.get(variant) ?? variant
         uniqueIdsWithError.forEach((uniqueId) => {
           const existingError = publishErrors.find((error) => error.uniqueId === uniqueId)
           if (existingError) {
             existingError.perLocaleErrors = {
               ...existingError.perLocaleErrors,
-              ...buildPerLocaleErrors(result.reason as InternalError, variant),
+              ...buildPerLocaleErrors(result.reason as InternalError, engineVariant),
             }
           } else {
             publishErrors.push(
-              buildTranslatePublishError(result.reason as InternalError, uniqueId, variant),
+              buildTranslatePublishError(result.reason as InternalError, uniqueId, engineVariant),
             )
           }
         })

src/modules/translate/TranslateService.ts

@@ -14,11 +14,11 @@ export class TranslateService {
   async getContent(
     config: IntegrationConfig,
     auth: AuthConfig,
-    locales: string[],
     ids: ItemIdentifiers[],
     // Default locale might not be needed for integration logic
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     defaultLocale: string,
+    originalLocalesMap: Map<string, string>,
   ): Promise<[ContentItem[], ItemIdentifiers[]]> {
     const { apiKey } = auth
 
@@ -29,6 +29,7 @@ export class TranslateService {
       throw new AuthFailedError()
     }
 
+    const locales = [...originalLocalesMap.keys()]
     const componentsByName = await this.dittoApiClient.getWorkspaceComponents(apiKey)
 
     const desiredIds = ids.map((id) => id.uniqueId)
@@ -38,10 +39,11 @@ export class TranslateService {
 
     const items = filteredWorkspaceComponentEntries.map(([id, data]) => {
       const localTexts = locales.reduce((acc, local) => {
+        const finalLocale = originalLocalesMap.get(local) ?? local
         if (data.variants?.[local]) {
-          acc[local] = data.variants[local].text
+          acc[finalLocale] = data.variants[local].text
         } else {
-          acc[local] = ''
+          acc[finalLocale] = ''
         }
 
         return acc

src/modules/translate/translateController.ts

@@ -8,12 +8,18 @@ export const getContent = async (
 ) => {
   const { translateService } = req.diScope.cradle
 
+  const originalLocalesMap = new Map<string, string>()
+  req.body.locales.forEach((locale) => {
+    const lowerCased = locale !== req.body.defaultLocale ? locale.toLowerCase() : locale
+    originalLocalesMap.set(lowerCased, locale)
+  })
+
   const [items, updateItems] = await translateService.getContent(
     req.integrationConfig,
     req.authConfig,
-    req.body.locales,
     req.body.items,
     req.body.defaultLocale,
+    originalLocalesMap,
   )
 
   await reply.send({ items, updateItems })