converted required leftToRight to optional rightToLeft (monkeytypegam…

…e#4229)

* converted required leftToRight to optional rightToLeft

* merge straggler

* removed empty lines

* removed empty lines

LANGUAGES.md

@@ -19,17 +19,15 @@ The contents of the file should be as follows:
 
 ```
 {
-  "name": "language",
-  "leftToRight": true,
-  "ligatures": true,
-  "bcp47": "es-ES",
-  "words": [
-    "words",
-  ]
+  "name": string,
+  "rightToLeft": boolean,
+  "ligatures": boolean,
+  "bcp47": string,
+  "words": string[]
 }
 ```
 
-It is recommended that you familiarize yourselves with JSON before adding a language. For the `name` field, put the name of your language. `leftToRight` indicates how the language is written. If it is written left to right then put `true`, otherwise put `false`.
+It is recommended that you familiarize yourselves with JSON before adding a language. For the `name` field, put the name of your language. `rightToLeft` indicates how the language is written. If it is written left to right then put `true`, otherwise put `false`.
 `ligatures` A ligature occurs when multiple letters are joined together to form a character [more details](<https://en.wikipedia.org/wiki/Ligature_(writing)>). If there's joining in the words, which is the case in languages like (Arabic, Malayalam, Persian, Sanskrit, Central_Kurdish... etc.), then set the value to `true`, otherwise set to `false`. For `bcp47` put your languages [IETF language tag](https://en.wikipedia.org/wiki/IETF_language_tag). Finally, add your list of words to the `words` field.
 
 In addition to the language file, you need to add your language to the `_groups.json` and `_list.json` files in the same directory. Add the name of the language to the `_groups.json` file like so:

frontend/scripts/json-validation.js

@@ -508,7 +508,7 @@ function validateLanguages() {
       type: "object",
       properties: {
         name: { type: "string" },
-        leftToRight: { type: "boolean" },
+        rightToLeft: { type: "boolean" },
         noLazyMode: { type: "boolean" },
         bcp47: { type: "string" },
         words: {
@@ -525,7 +525,7 @@ function validateLanguages() {
           },
         },
       },
-      required: ["name", "leftToRight", "words"],
+      required: ["name", "words"],
     };
     let languageFilesAllGood = true;
     let languageWordListsAllGood = true;

frontend/src/ts/test/caret.ts

@@ -62,12 +62,12 @@ export async function updatePosition(): Promise<void> {
   ] as HTMLElement;
 
   const currentLanguage = await Misc.getCurrentLanguage(Config.language);
-  const isLanguageLeftToRight = currentLanguage.leftToRight;
+  const isLanguageRightToLeft = currentLanguage.rightToLeft;
   const letterPosLeft =
     (currentLetter
       ? currentLetter.offsetLeft
       : previousLetter.offsetLeft + previousLetter.offsetWidth) +
-    (isLanguageLeftToRight
+    (!isLanguageRightToLeft
       ? 0
       : currentLetter
       ? currentLetter.offsetWidth

frontend/src/ts/test/test-logic.ts

@@ -885,7 +885,7 @@ export async function init(): Promise<void> {
     }
   }
 
-  if (Config.tapeMode !== "off" && !language.leftToRight) {
+  if (Config.tapeMode !== "off" && !language.rightToLeft) {
     Notifications.add("This language does not support tape mode.", 0, {
       important: true,
     });
@@ -1173,11 +1173,7 @@ export async function init(): Promise<void> {
     }
   }
   //handle right-to-left languages
-  if (language.leftToRight) {
-    TestUI.arrangeCharactersLeftToRight();
-  } else {
-    TestUI.arrangeCharactersRightToLeft();
-  }
+  TestUI.setRightToLeft(language.rightToLeft);
   if (language.ligatures) {
     $("#words").addClass("withLigatures");
     $("#resultWordsHistory .words").addClass("withLigatures");

frontend/src/ts/test/test-ui.ts

@@ -830,16 +830,16 @@ export function lineJump(currentTop: number): void {
   updateWordsHeight();
 }
 
-export function arrangeCharactersRightToLeft(): void {
-  $("#words").addClass("rightToLeftTest");
-  $("#resultWordsHistory .words").addClass("rightToLeftTest");
-  $("#resultReplay .words").addClass("rightToLeftTest");
-}
-
-export function arrangeCharactersLeftToRight(): void {
-  $("#words").removeClass("rightToLeftTest");
-  $("#resultWordsHistory .words").removeClass("rightToLeftTest");
-  $("#resultReplay .words").removeClass("rightToLeftTest");
+export function setRightToLeft(isEnabled: boolean): void {
+  if (isEnabled) {
+    $("#words").addClass("rightToLeftTest");
+    $("#resultWordsHistory .words").addClass("rightToLeftTest");
+    $("#resultReplay .words").addClass("rightToLeftTest");
+  } else {
+    $("#words").removeClass("rightToLeftTest");
+    $("#resultWordsHistory .words").removeClass("rightToLeftTest");
+    $("#resultReplay .words").removeClass("rightToLeftTest");
+  }
 }
 
 async function loadWordsHistory(): Promise<boolean> {

frontend/src/ts/types/types.d.ts

@@ -20,7 +20,7 @@ declare namespace MonkeyTypes {
 
   interface LanguageObject {
     name: string;
-    leftToRight: boolean;
+    rightToLeft: boolean;
     noLazyMode?: boolean;
     ligatures?: boolean;
     orderedByFrequency?: boolean;

frontend/static/languages/afrikaans.json

@@ -1,6 +1,5 @@
 {
   "name": "afrikaans",
-  "leftToRight": true,
   "words": [
     "die",
     "wees",

frontend/static/languages/afrikaans_10k.json

@@ -1,6 +1,5 @@
 {
   "name": "afrikaans_10k",
-  "leftToRight": true,
   "words": [
     "aan",
     "aanbetref",

frontend/static/languages/afrikaans_1k.json

@@ -1,6 +1,5 @@
 {
   "name": "afrikaans_1k",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "sterker",

frontend/static/languages/albanian.json

@@ -1,6 +1,5 @@
 {
   "name": "albanian",
-  "leftToRight": true,
   "words": [
     "të",
     "e",

frontend/static/languages/albanian_1k.json

@@ -1,6 +1,5 @@
 {
   "name": "albanian_1k",
-  "leftToRight": true,
   "words": [
     "I",
     "e tij",

frontend/static/languages/amharic.json

@@ -1,6 +1,5 @@
 {
   "name": "amharic",
-  "leftToRight": true,
   "ligatures": false,
   "bcp47": "am-ET",
   "words": [

frontend/static/languages/arabic.json

@@ -1,6 +1,6 @@
 {
   "name": "arabic",
-  "leftToRight": false,
+  "rightToLeft": true,
   "ligatures": true,
   "bcp47": "ar-SA",
   "words": [

frontend/static/languages/arabic_10k.json

@@ -1,6 +1,6 @@
 {
   "name": "arabic_10k",
-  "leftToRight": false,
+  "rightToLeft": true,
   "ligatures": true,
   "bcp47": "ar-SA",
   "words": [

frontend/static/languages/armenian_western.json

@@ -1,6 +1,5 @@
 {
   "name": "armenian_western",
-  "leftToRight": true,
   "bcp47": "hyw",
   "words": [
     "կանանց",

frontend/static/languages/armenian_western_1k.json

@@ -1,6 +1,5 @@
 {
   "name": "armenian_western_1k",
-  "leftToRight": true,
   "bcp47": "hyw",
   "words": [
     "թարգմանուած",

frontend/static/languages/azerbaijani.json

@@ -1,6 +1,5 @@
 {
   "name": "azerbaijani",
-  "leftToRight": true,
   "bcp47": "az-AZ",
   "words": [
     "dərs",

frontend/static/languages/azerbaijani_1k.json

@@ -1,6 +1,5 @@
 {
   "name": "azerbaijani_1k",
-  "leftToRight": true,
   "bcp47": "az-AZ",
   "words": [
     "dərs",

frontend/static/languages/bangla.json

@@ -1,6 +1,5 @@
 {
   "name": "bangla",
-  "leftToRight": true,
   "ligatures": true,
   "noLazyMode": true,
   "bcp47": "bn-BD",

frontend/static/languages/bangla_10k.json

@@ -1,6 +1,5 @@
 {
   "name": "bangla_10k",
-  "leftToRight": true,
   "ligatures": true,
   "noLazyMode": true,
   "bcp47": "bn_BD",

frontend/static/languages/bangla_letters.json

@@ -1,6 +1,5 @@
 {
   "name": "bangla_letters",
-  "leftToRight": true,
   "ligatures": true,
   "noLazyMode": true,
   "bcp47": "bn-BD",

frontend/static/languages/belarusian_1k.json

@@ -1,6 +1,5 @@
 {
   "name": "belarusian_1k",
-  "leftToRight": true,
   "noLazyMode": true,
   "bcp47": "be-BY",
   "words": [

frontend/static/languages/bulgarian.json

@@ -1,6 +1,5 @@
 {
   "name": "bulgarian",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "а",

frontend/static/languages/catalan.json

@@ -1,6 +1,5 @@
 {
   "name": "catalan",
-  "leftToRight": true,
   "words": [
     "de",
     "la",

frontend/static/languages/catalan_1k.json

@@ -1,6 +1,5 @@
 {
   "name": "catalan_1k",
-  "leftToRight": true,
   "words": [
     "de",
     "la",

frontend/static/languages/chinese_traditional.json

@@ -1,6 +1,5 @@
 {
   "name": "chinese_traditional",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "安靜",

frontend/static/languages/code_arduino.json

@@ -1,6 +1,5 @@
 {
   "name": "code_arduino",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "digitalRead",

frontend/static/languages/code_assembly.json

@@ -1,6 +1,5 @@
 {
   "name": "code_assembly",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "AAA",

frontend/static/languages/code_bash.json

@@ -1,6 +1,5 @@
 {
   "name": "code_bash",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "ls",

frontend/static/languages/code_brainfck.json

@@ -1,6 +1,5 @@
 {
   "name": "code_brainfck",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     ">",

frontend/static/languages/code_c++.json

@@ -1,6 +1,5 @@
 {
   "name": "code_c++",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "alignas",

frontend/static/languages/code_c.json

@@ -1,6 +1,5 @@
 {
   "name": "code_c",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "auto",

frontend/static/languages/code_csharp.json

@@ -1,6 +1,5 @@
 {
   "name": "code_csharp",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "abstract",

frontend/static/languages/code_css.json

@@ -1,6 +1,5 @@
 {
   "name": "code_css",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "background-color",

frontend/static/languages/code_dart.json

@@ -1,6 +1,5 @@
 {
   "name": "code_dart",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "()",

frontend/static/languages/code_elixir.json

@@ -1,6 +1,5 @@
 {
   "name": "code_elixir",
-  "leftToRight": true,
   "ligatures": true,
   "words": [
     "__MODULE__",

frontend/static/languages/code_fsharp.json

@@ -1,6 +1,5 @@
 {
   "name": "code_fsharp",
-  "leftToRight": true,
   "words": [
     "abstract",
     "and",

frontend/static/languages/code_gdscript.json

@@ -1,6 +1,5 @@
 {
   "name": "code_gdscript",
-  "leftToRight": true,
   "words": [
     "var",
     "const",

frontend/static/languages/code_gdscript_2.json

@@ -1,6 +1,5 @@
 {
   "name": "code_gdscript_2",
-  "leftToRight": true,
   "words": [
     "var",
     "const",

frontend/static/languages/code_go.json

@@ -1,6 +1,5 @@
 {
   "name": "code_go",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "break",

frontend/static/languages/code_haskell.json

@@ -1,6 +1,5 @@
 {
   "name": "code_haskell",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "!",

frontend/static/languages/code_html.json

@@ -1,6 +1,5 @@
 {
   "name": "code_html",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "-->",

frontend/static/languages/code_java.json

@@ -1,6 +1,5 @@
 {
   "name": "code_java",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "abstract",

frontend/static/languages/code_javascript.json

@@ -1,6 +1,5 @@
 {
   "name": "code_javascript",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "this",

frontend/static/languages/code_javascript_1k.json

@@ -1,6 +1,5 @@
 {
   "name": "code_javascript_1k",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "var",

frontend/static/languages/code_julia.json

@@ -1,6 +1,5 @@
 {
   "name": "code_julia",
-  "leftToRight": true,
   "noLazyMode": true,
   "words": [
     "return",