simplify get language code

Author: fadi-george

package.json

@@ -84,7 +84,7 @@
     },
     {
       "path": "./build/releases/OneSignalSDK.page.es6.js",
-      "limit": "45.364 kB",
+      "limit": "45.322 kB",
       "gzip": true
     },
     {

src/core/executors/IdentityOperationExecutor.test.ts

@@ -9,6 +9,7 @@ import {
 } from '__test__/support/helpers/requests';
 import { updateIdentityModel } from '__test__/support/helpers/setup';
 import { ExecutionResult } from 'src/core/types/operation';
+import { UnknownOpError } from 'src/shared/errors/common';
 import type { MockInstance } from 'vitest';
 import { OPERATION_NAME } from '../constants';
 import { RebuildUserService } from '../modelRepo/RebuildUserService';
@@ -82,11 +83,7 @@ describe('IdentityOperationExecutor', () => {
     // with invalid ops
     const ops = [setAliasOp, deleteAliasOp, someOp];
     const result = executor._execute(ops);
-    await expect(() => result).rejects.toThrow(
-      `Unrecognized operation(s)! Attempted operations:\n${JSON.stringify(
-        ops,
-      )}`,
-    );
+    await expect(() => result).rejects.toThrow(UnknownOpError(ops));
 
     // with both set and delete alias ops
     const ops2 = [setAliasOp, deleteAliasOp];

src/core/executors/LoginUserOperationExecutor.test.ts

@@ -24,6 +24,7 @@ import {
   updatePropertiesModel,
 } from '__test__/support/helpers/setup';
 import { getPushToken, setPushToken } from 'src/shared/database/subscription';
+import { UnknownOpError } from 'src/shared/errors/common';
 import {
   NotificationType,
   SubscriptionType,
@@ -97,9 +98,7 @@ describe('LoginUserOperationExecutor', () => {
     // with invalid ops
     const ops = [someOp];
     const result = executor._execute(ops);
-    await expect(() => result).rejects.toThrow(
-      `Unrecognized operation: ${someOp._name}`,
-    );
+    await expect(() => result).rejects.toThrow(UnknownOpError(someOp));
   });
 
   describe('create user', () => {
@@ -124,9 +123,7 @@ describe('LoginUserOperationExecutor', () => {
       const someOp = new SomeOperation();
       const ops2 = [loginOp, transferSubOp, someOp];
       const res2 = executor._execute(ops2);
-      await expect(res2).rejects.toThrow(
-        `Unrecognized operation: ${someOp._name}`,
-      );
+      await expect(res2).rejects.toThrow(UnknownOpError(someOp));
     });
 
     test('can create user if there is no onesignal id or externalId', async () => {

src/core/executors/LoginUserOperationExecutor.ts

@@ -335,34 +335,16 @@ export class LoginUserOperationExecutor implements IOperationExecutor {
   }
 }
 
-const TRADITIONAL_CHINESE_LANGUAGE_TAG = ['tw', 'hant'];
 const SIMPLIFIED_CHINESE_LANGUAGE_TAG = ['cn', 'hans'];
 
 const getLanguage = () => {
-  let languageTag = navigator.language;
-  if (languageTag) {
-    languageTag = languageTag.toLowerCase();
-    const languageSubtags = languageTag.split('-');
-    if (languageSubtags[0] == 'zh') {
-      // The language is zh-?
-      // We must categorize the language as either zh-Hans (simplified) or zh-Hant (traditional);
-      // OneSignal only supports these two Chinese variants
-      for (const traditionalSubtag of TRADITIONAL_CHINESE_LANGUAGE_TAG) {
-        if (languageSubtags.indexOf(traditionalSubtag) !== -1) {
-          return 'zh-Hant';
-        }
-      }
-      for (const simpleSubtag of SIMPLIFIED_CHINESE_LANGUAGE_TAG) {
-        if (languageSubtags.indexOf(simpleSubtag) !== -1) {
-          return 'zh-Hans';
-        }
-      }
-      return 'zh-Hant'; // Return Chinese traditional by default
-    } else {
-      // Return the language subtag (it can be three characters, so truncate it down to 2 just to be sure)
-      return languageSubtags[0].substring(0, 2);
-    }
-  } else {
-    return 'en';
-  }
+  const languageTag = navigator.language?.toLowerCase();
+  if (!languageTag) return 'en';
+
+  const [primary, ...subtags] = languageTag.split('-');
+  if (primary !== 'zh') return primary.substring(0, 2);
+
+  if (SIMPLIFIED_CHINESE_LANGUAGE_TAG.some((tag) => subtags.includes(tag)))
+    return 'zh-Hans';
+  return 'zh-Hant';
 };

src/core/executors/RefreshUserOperationExecutor.test.ts

@@ -15,6 +15,7 @@ import {
 } from '__test__/support/helpers/requests';
 import { updateIdentityModel } from '__test__/support/helpers/setup';
 import { setPushToken } from 'src/shared/database/subscription';
+import { UnknownOpError } from 'src/shared/errors/common';
 import {
   NotificationType,
   SubscriptionType,
@@ -83,11 +84,7 @@ describe('RefreshUserOperationExecutor', () => {
     const ops = [someOp];
 
     const result = executor._execute(ops);
-    await expect(() => result).rejects.toThrow(
-      `Unrecognized operation(s)! Attempted operations:\n${JSON.stringify(
-        ops,
-      )}`,
-    );
+    await expect(() => result).rejects.toThrow(UnknownOpError(ops));
   });
 
   describe('getUser', () => {

src/core/executors/SubscriptionOperationExecutor.test.ts

@@ -17,6 +17,7 @@ import {
 } from '__test__/support/helpers/requests';
 import { setupSubscriptionModel } from '__test__/support/helpers/setup';
 import { setPushToken } from 'src/shared/database/subscription';
+import { UnknownOpError } from 'src/shared/errors/common';
 import {
   NotificationType,
   SubscriptionType,
@@ -100,9 +101,7 @@ describe('SubscriptionOperationExecutor', () => {
     const ops = [someOp];
 
     const res1 = executor._execute(ops);
-    await expect(() => res1).rejects.toThrow(
-      `Unrecognized operation: ${ops[0]}`,
-    );
+    await expect(() => res1).rejects.toThrow(UnknownOpError(ops));
 
     const deleteOp = new DeleteSubscriptionOperation(
       APP_ID,

src/core/executors/UpdateUserOperationExecutor.test.ts

@@ -6,6 +6,7 @@ import {
   setUpdateUserResponse,
 } from '__test__/support/helpers/requests';
 import { updateIdentityModel } from '__test__/support/helpers/setup';
+import { UnknownOpError } from 'src/shared/errors/common';
 import { type MockInstance } from 'vitest';
 import { OPERATION_NAME } from '../constants';
 import { RebuildUserService } from '../modelRepo/RebuildUserService';
@@ -70,9 +71,7 @@ describe('UpdateUserOperationExecutor', () => {
     const ops = [someOp];
 
     const result = executor._execute(ops);
-    await expect(() => result).rejects.toThrow(
-      `Unrecognized operation: ${ops[0]}`,
-    );
+    await expect(() => result).rejects.toThrow(UnknownOpError(someOp));
   });
 
   describe('SetPropertyOperation', () => {