Merge branch 'development' into ft/bydefault-aligned

bible-technology · Apr 15, 2024 · d97a537 · d97a537
2 parents 1d17783 + e5faf61
commit d97a537
Show file tree

Hide file tree

Showing 8 changed files with 1,115 additions and 263 deletions.
diff --git a/e2e-tests/myFixtures.ts b/e2e-tests/myFixtures.ts
@@ -32,7 +32,8 @@ type myFixture = {
   english: string,
   hindi: string,
   russian: string,
-  farsi: string
+  farsi: string,
+  arabic: string
 }
 const myFixtureTest = myTest.extend<myFixture>({
   userName: "Playwright user",
@@ -60,6 +61,7 @@ const myFixtureTest = myTest.extend<myFixture>({
   hindi: "Hindi",
   russian: "Russian",
   farsi: "Farsi",
+  arabic: "Arabic",
   textUnderscore: "Translation_test_project",
   obsUnderscore: "Obs_test_project",
   syncName: "Sync_Collab_Test",

diff --git a/renderer/src/components/Login/LeftLogin.js b/renderer/src/components/Login/LeftLogin.js
@@ -138,12 +138,14 @@ const LeftLogin = () => {
   };
   function formSubmit(event) {
     event.preventDefault();
-    if (values.username.length < 3 || values.username.length > 15) {
+    const newValue = values;
+    newValue.username = newValue.username.trim();
+    if (newValue.username.length < 3 || newValue.username.length > 15) {
       displayError('The input has to be between 3 and 15 characters long');
-    } else if (users.length > 0 && users.find((item) => (item.username.toLowerCase() === values.username.toLowerCase().trim()))) {
+    } else if (users.length > 0 && users.find((item) => (item.username.toLowerCase() === newValue.username.toLowerCase()))) {
       displayError('User exists, Check archived and active tab by click on view more.');
     } else {
-      handleSubmit(values);
+      handleSubmit(newValue);
       setValues({});
     }
   }

diff --git a/renderer/src/modules/projects/Profile.js b/renderer/src/modules/projects/Profile.js
@@ -21,6 +21,7 @@ const languages = [
   { title: 'Farsi', code: 'fa' },
   { title: 'French', code: 'fr' },
   { title: 'Nepali', code: 'ne' },
+  { title: 'Arabic', code: 'ar' },
 ];
 
 function ProgressCircle({ isFilled, count, text }) {

diff --git a/renderer/src/translations/ar.js b/renderer/src/translations/ar.js
diff --git a/renderer/src/translations/ar.json b/renderer/src/translations/ar.json
diff --git a/renderer/src/translations/fa.js b/renderer/src/translations/fa.js
diff --git a/renderer/src/translations/fa.json b/renderer/src/translations/fa.json
diff --git a/renderer/src/translations/i18n.js b/renderer/src/translations/i18n.js
@@ -1,6 +1,7 @@
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 // import the translation files
+import { Ar } from './ar';
 import { En } from './en';
 import { Hi } from './hi';
 import { Ru } from './ru';
@@ -31,6 +32,9 @@ i18n
       ne: {
         translation: Ne,
       },
+      ar: {
+        translation: Ar,
+      },
     },
 });