Suisin/chore: add Khmer language into deriv-app (#15714)

* chore: add Khmer language into deriv-app * chore: update deriv-com/translations package version * Merge branch 'master' of github.com:binary-com/deriv-app into suisin/UPM1116/add_khmer_language * chore: update km.json file * chore: update quill-icons version and remove korean constant flag * chore: update km.json file * chore: add KM tag in initmoment so that time does not get translated * chore: empty commit * chore: update km.json files * chore: remove comments for p2p i18next * chore: fix bots toast notification issue * chore: update khmer strings * chore: strings to fix translation issue * chore: update km.json strings * chore: update km json strings * fix: version * fix: remove unused imports --------- Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
binary-com · Jul 24, 2024 · 649cd7b · 649cd7b
1 parent 9dfecda
commit 649cd7b
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 29 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/account/package.json b/packages/account/package.json
@@ -31,7 +31,7 @@
     "dependencies": {
         "@binary-com/binary-document-uploader": "^2.4.8",
         "@deriv-com/analytics": "1.10.0",
-        "@deriv-com/translations": "1.3.3",
+        "@deriv-com/translations": "1.3.4",
         "@deriv-com/utils": "^0.0.25",
         "@deriv-com/ui": "1.29.3",
         "@deriv/api": "^1.0.0",

diff --git a/packages/account/src/Components/language-settings/language-radio-button.tsx b/packages/account/src/Components/language-settings/language-radio-button.tsx
@@ -1,5 +1,5 @@
 import { ChangeEventHandler } from 'react';
-import { Text, Icon } from '@deriv/components';
+import { Text } from '@deriv/components';
 import clsx from 'clsx';
 import { TranslationFlag } from '@deriv/shared';
 
@@ -29,13 +29,7 @@ const LanguageRadioButton = ({ is_current_language, id, language_text, name, onC
                 className='settings-language__language--radio-button'
             />
             <label htmlFor={id} className='settings-language__language--center-label'>
-                <div>
-                    {TranslationFlag[id] ? (
-                        TranslationFlag[id](36, 24)
-                    ) : (
-                        <Icon icon={`IcFlag${id}`} className='settings-language__language-flag' />
-                    )}
-                </div>
+                <div>{TranslationFlag[id](36, 24)}</div>
                 <div>
                     <Text
                         size='xs'

diff --git a/packages/appstore/package.json b/packages/appstore/package.json
@@ -27,7 +27,7 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@deriv-com/analytics": "1.10.0",
-        "@deriv-com/translations": "1.3.3",
+        "@deriv-com/translations": "1.3.4",
         "@deriv/account": "^1.0.0",
         "@deriv/cashier": "^1.0.0",
         "@deriv/cfd": "^1.0.0",

diff --git a/packages/bot-skeleton/src/scratch/blocks/index.js b/packages/bot-skeleton/src/scratch/blocks/index.js
@@ -16,4 +16,3 @@ import './Binary/Trade Definition';
 import './Logic';
 import './Math';
 import './Text';
-
diff --git a/packages/bot-web-ui/src/components/bot-notification/bot-notification.scss b/packages/bot-web-ui/src/components/bot-notification/bot-notification.scss
@@ -36,6 +36,7 @@
 
         &-body {
             padding: 0;
+            height: 100%;
         }
     }
 

diff --git a/packages/cfd/package.json b/packages/cfd/package.json
@@ -87,7 +87,7 @@
     "dependencies": {
         "@deriv-com/analytics": "1.10.0",
         "@deriv-com/ui": "1.29.3",
-        "@deriv-com/translations": "1.3.3",
+        "@deriv-com/translations": "1.3.4",
         "@deriv-com/utils": "^0.0.25",
         "@deriv/account": "^1.0.0",
         "@deriv/api": "^1.0.0",

diff --git a/packages/components/src/components/icon/flag/ic-flag-ko.svg b/packages/components/src/components/icon/flag/ic-flag-ko.svg
diff --git a/packages/components/src/components/icon/icons.js b/packages/components/src/components/icon/icons.js
@@ -725,7 +725,6 @@ import './dxtrade/ic-dxtrade-financial-platform.svg';
 import './dxtrade/ic-dxtrade-financial.svg';
 import './dxtrade/ic-dxtrade-one-password.svg';
 import './dxtrade/ic-dxtrade-synthetic-platform.svg';
-import './flag/ic-flag-ko.svg';
 import './mt5/ic-mt5-bvi-derived.svg';
 import './mt5/ic-mt5-bvi-financial.svg';
 import './mt5/ic-mt5-bvi-standard.svg';

diff --git a/packages/components/src/components/types/icons.types.ts b/packages/components/src/components/types/icons.types.ts
@@ -9,7 +9,6 @@ export type TIconsManifest = Readonly<{
     contract: string;
     currency: string;
     dxtrade: string;
-    flag: string;
     mt5: string;
     option: string;
     stock: string;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -99,7 +99,7 @@
         "@deriv-com/analytics": "1.10.0",
         "@deriv-com/quill-tokens": "^2.0.4",
         "@deriv-com/quill-ui": "1.13.17",
-        "@deriv-com/translations": "1.3.3",
+        "@deriv-com/translations": "1.3.4",
         "@deriv-com/ui": "1.29.3",
         "@deriv-com/utils": "^0.0.25",
         "@deriv/account": "^1.0.0",

diff --git a/packages/core/src/App/Components/Routes/language-link.tsx b/packages/core/src/App/Components/Routes/language-link.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
 import { observer, useStore } from '@deriv/stores';
-import { Icon } from '@deriv/components';
 import { TranslationFlag, UNSUPPORTED_LANGUAGES } from '@deriv/shared';
 import { getAllowedLanguages, useTranslations } from '@deriv-com/translations';
 
@@ -19,11 +18,7 @@ const LanguageLink = observer(({ is_clickable = false, lang, toggleModal }: TLan
 
     const link: React.ReactNode = (
         <React.Fragment>
-            {TranslationFlag[lang] ? (
-                TranslationFlag[lang](36, 24)
-            ) : (
-                <Icon icon={`IcFlag${lang}`} className='settings-language__language-flag' />
-            )}
+            {TranslationFlag[lang](36, 24)}
             <span
                 className={classNames('settings-language__language-name', {
                     'settings-language__language-name--active': is_active,

diff --git a/packages/core/src/Utils/Language/__tests__/language.spec.js b/packages/core/src/Utils/Language/__tests__/language.spec.js
@@ -9,6 +9,7 @@ const languages = {
     FR: 'Français',
     ID: 'Indonesian',
     IT: 'Italiano',
+    KM: 'ខ្មែរ',
     KO: '한국어',
     MN: 'Монгол',
     PL: 'Polish',

diff --git a/packages/p2p/src/components/i18next/index.ts b/packages/p2p/src/components/i18next/index.ts
@@ -12,6 +12,7 @@ import de from 'Translations/de.json';
 import fr from 'Translations/fr.json';
 import id from 'Translations/id.json';
 import it from 'Translations/it.json';
+import km from 'Translations/km.json';
 import ko from 'Translations/ko.json';
 import mn from 'Translations/mn.json';
 import pl from 'Translations/pl.json';
@@ -48,6 +49,7 @@ const i18n_config = {
         FR: { translations: { ...fr } },
         ID: { translations: { ...id } },
         IT: { translations: { ...it } },
+        KM: { translations: { ...km } },
         KO: { translations: { ...ko } },
         MN: { translations: { ...mn } },
         PL: { translations: { ...pl } },

diff --git a/packages/shared/src/utils/constants/translation-flag.tsx b/packages/shared/src/utils/constants/translation-flag.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import {
     FlagArabLeagueIcon,
     FlagBangladeshIcon,
+    FlagCambodiaIcon,
     FlagChinaSimplifiedIcon,
     FlagChinaTraditionalIcon,
     FlagFranceIcon,
@@ -12,6 +13,7 @@ import {
     FlagPolandIcon,
     FlagPortugalIcon,
     FlagRussiaIcon,
+    FlagSouthKoreaIcon,
     FlagSpainIcon,
     FlagSriLankaIcon,
     FlagTanzaniaIcon,
@@ -30,7 +32,8 @@ const flagComponents = {
     FR: FlagFranceIcon,
     ID: FlagIndonesiaIcon,
     IT: FlagItalyIcon,
-    // KO: ,
+    KM: FlagCambodiaIcon,
+    KO: FlagSouthKoreaIcon,
     MN: FlagMongoliaIcon,
     PL: FlagPolandIcon,
     PT: FlagPortugalIcon,

diff --git a/packages/shared/src/utils/date/date-time.ts b/packages/shared/src/utils/date/date-time.ts
@@ -13,7 +13,7 @@ type TExtendedMoment = typeof moment & {
 
 // Localize moment instance with specific object
 export const initMoment = (lang: string) => {
-    const hasEnMomentLocale = ['EN', 'AR', 'BN', 'SI']; // 'AR', 'BN' & 'SI' langs have non-numeric dates ('২০২৪-০৫-০৭'), our current usage of moment requires us to make all dates numeric
+    const hasEnMomentLocale = ['EN', 'AR', 'BN', 'SI', 'KM']; // 'AR', 'BN' & 'SI' langs have non-numeric dates ('২০২৪-০৫-০৭'), our current usage of moment requires us to make all dates numeric
     if (!lang) return moment;
     let locale = lang.toLowerCase().replace('_', '-');
     if (hasEnMomentLocale.includes(lang)) locale = 'en-gb';

diff --git a/packages/translations/src/i18next/i18next.ts b/packages/translations/src/i18next/i18next.ts
@@ -16,6 +16,7 @@ const ALL_LANGUAGES = Object.freeze({
     FR: 'Français',
     ID: 'Indonesian',
     IT: 'Italiano',
+    KM: 'ខ្មែរ',
     KO: '한국어',
     MN: 'Монгол',
     PL: 'Polish',
@@ -37,6 +38,7 @@ export const getAllowedLanguages = () => {
         ES: 'Español',
         BN: 'বাংলা',
         DE: 'Deutsch',
+        KM: 'ខ្មែរ',
         KO: '한국어',
         MN: 'Монгол',
         PT: 'Português',

diff --git a/packages/translations/src/translations/km.json b/packages/translations/src/translations/km.json
@@ -4269,4 +4269,4 @@
     "-1254554534": "សូមប្ដូររយៈពេលតារាងទំហំទៅតារាងកសិករលើនិងការប្រើប្រាស់អ្វីទាំងអស់ច្បាស់ល្អជាង។",
     "-1658230823": "កិច្ចប្រភេទបានលក់សម្រាប់ <0 />។",
     "-1905867404": "កិច្ចប្បល់បង្ហាញបានបញ្ចប់"
-}
+}