From 5c6939b5d5be96c944b8eca800b308a5dbaf6e7d Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 11:27:33 -0400 Subject: [PATCH 01/76] New translations auth.json (Telugu) --- api/locales/te/auth.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 api/locales/te/auth.json diff --git a/api/locales/te/auth.json b/api/locales/te/auth.json new file mode 100644 index 00000000..e19547a0 --- /dev/null +++ b/api/locales/te/auth.json @@ -0,0 +1,16 @@ +{ + "login": { + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" + }, + "register": { + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" + } +} From d81f736bebd0e7efeeb367b92a11785e0f188cb2 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 11:27:33 -0400 Subject: [PATCH 02/76] New translations common.json (Telugu) --- api/locales/te/common.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 api/locales/te/common.json diff --git a/api/locales/te/common.json b/api/locales/te/common.json new file mode 100644 index 00000000..8bb9c042 --- /dev/null +++ b/api/locales/te/common.json @@ -0,0 +1,18 @@ +{ + "field": { + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" + } +} From ef20fe7295fe6d822c09d372591a736aad2f2802 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:17 -0400 Subject: [PATCH 03/76] New translations auth.json (Romanian) --- api/locales/ro/auth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/locales/ro/auth.json b/api/locales/ro/auth.json index 929e2596..e19547a0 100644 --- a/api/locales/ro/auth.json +++ b/api/locales/ro/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-mailul sau telefonul nu au fost găsite", - "INVALID_PASSWORD": "Parolă nevalidă", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Înregistrarea noului utilizator este dezactivată", - "INVITE_ONLY": "Trebuie să fii invitat să te înregistrezi", + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", "EMAIL_INVALID": "Invalid Email", - "EMAIL_ALREADY_REGISTERED": "E-mailul este deja înregistrat", - "DATE_OF_BIRTH_UNDERAGE": "Trebuie să ai {{years}} ani sau mai mult", - "CONSENT_REQUIRED": "Trebuie să fiți de acord cu Termenii de utilizare și Politica de confidențialitate.", - "USERNAME_TOO_MANY_USERS": "Prea mulți utilizatori au acest nume de utilizator, vă rugăm să încercați altul" + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 312ac8452025adf5a0325d959f16a237e7c93c61 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:18 -0400 Subject: [PATCH 04/76] New translations auth.json (Esperanto) --- api/locales/eo/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/eo/auth.json b/api/locales/eo/auth.json index 2d0f7de9..e19547a0 100644 --- a/api/locales/eo/auth.json +++ b/api/locales/eo/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-Mail aŭ Telefonnumero ne trovis", - "INVALID_PASSWORD": "Pasfrazo ne validas", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Nova uzanta reĝistro estas malebligita", - "INVITE_ONLY": "Vi devas esti invitita de iu membro", - "EMAIL_INVALID": "Retpoŝto ne estas valida", - "EMAIL_ALREADY_REGISTERED": "Tiu retpoŝto estas jam registrita", - "DATE_OF_BIRTH_UNDERAGE": "Vi povas esti {{years}} jaroj aŭ pli aĝa", - "CONSENT_REQUIRED": "Vi devi konsenti Kondiĉo de Servo kaj Politiko de privateco.", - "USERNAME_TOO_MANY_USERS": "Pli multaj uzantoj havas tiu salutnomo, bonvolu provi ankoraŭ" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 57d48f0f380a19ae6b76ac48d2723b1f9b68bb4b Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:19 -0400 Subject: [PATCH 05/76] New translations auth.json (Ukrainian) --- api/locales/uk/auth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/locales/uk/auth.json b/api/locales/uk/auth.json index 76c4e500..e19547a0 100644 --- a/api/locales/uk/auth.json +++ b/api/locales/uk/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-Mail або телефон не знайдено", - "INVALID_PASSWORD": "Невірний пароль", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Реєстрація нового користувача вимкнута", - "INVITE_ONLY": "Ви повинні бути запрошені до реєстрації", + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", "EMAIL_INVALID": "Invalid Email", - "EMAIL_ALREADY_REGISTERED": "Цю адресу електронної пошти вже зареєстровано", - "DATE_OF_BIRTH_UNDERAGE": "Ви повинні бути {{years}} роками або старше", - "CONSENT_REQUIRED": "Ви повинні погодитися з Правилами користування сервісом і політикою конфіденційності.", - "USERNAME_TOO_MANY_USERS": "Надто багато користувачів з таким іменем користувача, будь ласка, спробуйте інше" + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From cd68d12f3080f89ab9c40bd8b17789f30b2bceed Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:19 -0400 Subject: [PATCH 06/76] New translations auth.json (Chinese Simplified) --- api/locales/zh/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/zh/auth.json b/api/locales/zh/auth.json index b802ba22..e19547a0 100644 --- a/api/locales/zh/auth.json +++ b/api/locales/zh/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "找不到電子郵件或電話", - "INVALID_PASSWORD": "無效的密碼", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "新用戶註冊已禁用", - "INVITE_ONLY": "必須邀請您才能註冊", - "EMAIL_INVALID": "無效電子郵件", - "EMAIL_ALREADY_REGISTERED": "該電郵地址已註冊", - "DATE_OF_BIRTH_UNDERAGE": "您必須年滿 {{years}} 歲", - "CONSENT_REQUIRED": "您必須同意服務條款和隱私政策。", - "USERNAME_TOO_MANY_USERS": "此用戶名太多,請嘗試使用其他用戶名" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 770ef11d3dc614c9e23938461bf064507ebb9b0c Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:21 -0400 Subject: [PATCH 07/76] New translations auth.json (Vietnamese) --- api/locales/vi/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/vi/auth.json b/api/locales/vi/auth.json index 81c2cfa9..e19547a0 100644 --- a/api/locales/vi/auth.json +++ b/api/locales/vi/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-mail hoặc số điện thoại không tồn tại", - "INVALID_PASSWORD": "Sai mật khẩu", - "ACCOUNT_DISABLED": "Tài khoản đã bị vô hiệu hóa" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Hệ thống hiện không cho phép tài khoản mới", - "INVITE_ONLY": "Bạn cần được mời để tạo tài khoản", - "EMAIL_INVALID": "Email không hợp lệ", - "EMAIL_ALREADY_REGISTERED": "Email đã tồn tại", - "DATE_OF_BIRTH_UNDERAGE": "Bạn phải từ {{years}} tuổi trở lên", - "CONSENT_REQUIRED": "Bạn phải đồng ý với Điều khoản Dịch vụ và Chính sách Bảo Mật.", - "USERNAME_TOO_MANY_USERS": "Quá nhiều tài khoản trùng với username bạn chọn, xin vui lòng chọn username khác" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From edab787d4b07075bbf645959efc7a80257b9385e Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:24 -0400 Subject: [PATCH 08/76] New translations auth.json (Croatian) --- api/locales/hr/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/hr/auth.json b/api/locales/hr/auth.json index 0f2c8456..e19547a0 100644 --- a/api/locales/hr/auth.json +++ b/api/locales/hr/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Email ili broj mobitela nije pronađen", - "INVALID_PASSWORD": "Pogrešna lozinka", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Registracija novog korisnika je onemogućena", - "INVITE_ONLY": "Morate biti pozvani da se registrirate", - "EMAIL_INVALID": "Nevažeći email", - "EMAIL_ALREADY_REGISTERED": "Email je već registriran", - "DATE_OF_BIRTH_UNDERAGE": "Morate imati {{years}} godina ili više", - "CONSENT_REQUIRED": "Morate se složiti s uvjetima pružanja usluge i pravila o privatnosti.", - "USERNAME_TOO_MANY_USERS": "Previše korisnika ima ovo korisničko ime, molimo vas da pokušate sa drugim" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 3bc03754b76ee5fc5eee640f359bff3e0b4319f7 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:25 -0400 Subject: [PATCH 09/76] New translations auth.json (Hindi) --- api/locales/hi/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/hi/auth.json b/api/locales/hi/auth.json index 00c7586b..e19547a0 100644 --- a/api/locales/hi/auth.json +++ b/api/locales/hi/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "ईमेल या फ़ोन नहीं मिला", - "INVALID_PASSWORD": "अमान्य पासवर्ड", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "नया उपयोगकर्ता पंजीकरण अक्षम है", - "INVITE_ONLY": "आपको पंजीकरण के लिए आमंत्रण किया गया है", - "EMAIL_INVALID": "अमान्य ई-मेल", - "EMAIL_ALREADY_REGISTERED": "ईमेल पहले से ही पंजीकृत है.", - "DATE_OF_BIRTH_UNDERAGE": "आपकी उम्र [[years]] वर्ष होनी चाहिए", - "CONSENT_REQUIRED": "आपको सेवाओं और गोपनीयता नीति से सहमत होना होगा", - "USERNAME_TOO_MANY_USERS": "बहुत से उपयोगकर्ताओं के पास यह उपयोगकर्ता नाम है, कृपया दूसरा प्रयास करें" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 9d3ed67815d6ffa118329fa68c1e5f06540593d4 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:26 -0400 Subject: [PATCH 10/76] New translations auth.json (Swedish) --- api/locales/sv/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/sv/auth.json b/api/locales/sv/auth.json index c94b0810..e19547a0 100644 --- a/api/locales/sv/auth.json +++ b/api/locales/sv/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-post eller telefon hittades inte", - "INVALID_PASSWORD": "Ogiltigt lösenord", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Registrering av nya användare är inaktiverat", - "INVITE_ONLY": "Du måste vara inbjuden för att registrera dig", - "EMAIL_INVALID": "Ogiltig e-post", - "EMAIL_ALREADY_REGISTERED": "E-postadressen är redan registrerad", - "DATE_OF_BIRTH_UNDERAGE": "Du måste vara {{years}} år eller äldre", - "CONSENT_REQUIRED": "Du måste godkänna användarvillkoren och sekretesspolicyn.", - "USERNAME_TOO_MANY_USERS": "För många användare har detta användarnamn, försök med ett annat" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 353549b11ebe1dbce0bf355720c3710e1e62b137 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:27 -0400 Subject: [PATCH 11/76] New translations common.json (Romanian) --- api/locales/ro/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/ro/common.json b/api/locales/ro/common.json index eec6d0d5..8bb9c042 100644 --- a/api/locales/ro/common.json +++ b/api/locales/ro/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Acest câmp este necesar", - "BASE_TYPE_STRING": "Acest câmp trebuie să fie un şir de caractere", - "BASE_TYPE_NUMBER": "Acest câmp trebuie să fie un număr", - "BASE_TYPE_BIGINT": "Acest câmp trebuie să fie mare", - "BASE_TYPE_BOOLEAN": "Acest câmp trebuie să fie un boolean", - "BASE_TYPE_CHOICES": "Acest câmp trebuie să fie unul din ({{types}})", - "BASE_TYPE_CLASS": "Acest câmp trebuie să fie o instanță de {{type}}", - "BASE_TYPE_OBJECT": "Acest câmp trebuie să fie un obiect", - "BASE_TYPE_ARRAY": "Acest câmp trebuie să fie un array", - "UNKOWN_FIELD": "Cheie necunoscută: {{key}}", - "BASE_TYPE_CONSTANT": "Acest câmp trebuie să fie {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Adresa de email nu este bine formatata", - "DATE_TYPE_PARSE": "Nu s-a putut analiza {{date}}. Ar trebui să fie ISO8601", - "BASE_TYPE_BAD_LENGTH": "Trebuie să fie între {{length}} lungime" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 4b9b56cb4cef68b767891110ede8f228ba481cc7 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:28 -0400 Subject: [PATCH 12/76] New translations common.json (French) --- api/locales/fr/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/fr/common.json b/api/locales/fr/common.json index 33c56eb9..8bb9c042 100644 --- a/api/locales/fr/common.json +++ b/api/locales/fr/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Ce champ est obligatoire", - "BASE_TYPE_STRING": "Ce champ doit être une chaîne de caractères", - "BASE_TYPE_NUMBER": "Ce champ doit être un nombre", - "BASE_TYPE_BIGINT": "Ce champ doit être un bigint", - "BASE_TYPE_BOOLEAN": "Ce champ doit être un boolean", - "BASE_TYPE_CHOICES": "Ce champ doit être l'un des ({{types}})", - "BASE_TYPE_CLASS": "Ce champ doit être une instance de {{type}}", - "BASE_TYPE_OBJECT": "Ce champ doit être un objet", - "BASE_TYPE_ARRAY": "Ce champ doit être un tableau", - "UNKOWN_FIELD": "Clé inconnue: {{key}}", - "BASE_TYPE_CONSTANT": "Ce champ doit être {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Adresse e-mail mal formaté", - "DATE_TYPE_PARSE": "Impossible d'analyser {{date}}. Doit être ISO8601", - "BASE_TYPE_BAD_LENGTH": "Doit être entre {{length}} de longueur" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 25762e400420a48863e1e4baa203e0b887685f3f Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:29 -0400 Subject: [PATCH 13/76] New translations common.json (Spanish) --- api/locales/es/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/es/common.json b/api/locales/es/common.json index f0a48bd4..8bb9c042 100644 --- a/api/locales/es/common.json +++ b/api/locales/es/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Este campo es obligatorio", - "BASE_TYPE_STRING": "Este campo debe ser un texto", - "BASE_TYPE_NUMBER": "Este campo debe ser un número", - "BASE_TYPE_BIGINT": "Este campo debe ser un tamaño grande", - "BASE_TYPE_BOOLEAN": "Este campo debe ser un boolean", - "BASE_TYPE_CHOICES": "Este campo debe ser uno de ({{types}})", - "BASE_TYPE_CLASS": "Este campo debe ser una instancia de {{type}}", - "BASE_TYPE_OBJECT": "Este campo debe ser un objeto", - "BASE_TYPE_ARRAY": "Este campo debe ser una matriz", - "UNKOWN_FIELD": "Clave desconocida: {{key}}", - "BASE_TYPE_CONSTANT": "Este campo debe ser {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "No es una dirección de email bien formada", - "DATE_TYPE_PARSE": "No se pudo analizar {{date}}. Debe ser ISO8601", - "BASE_TYPE_BAD_LENGTH": "Debe estar entre {{length}} de longitud" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 48d2bcae536332f695e51ef811d4472c53afefaf Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:30 -0400 Subject: [PATCH 14/76] New translations common.json (Arabic) --- api/locales/ar/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/ar/common.json b/api/locales/ar/common.json index 09a4915a..8bb9c042 100644 --- a/api/locales/ar/common.json +++ b/api/locales/ar/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "هذا الحقل مطلوب", - "BASE_TYPE_STRING": "يجب أن يكون هذا الحقل سلسلة من الأحرف", - "BASE_TYPE_NUMBER": "يجب أن يكون هذا الحقل رقم", - "BASE_TYPE_BIGINT": "يجب أن يكون هذا الحقل أكبر", - "BASE_TYPE_BOOLEAN": "يجب أن يكون هذا الحقل منطقيا", - "BASE_TYPE_CHOICES": "يجب أن يكون هذا الحقل واحدا من ({{types}})", - "BASE_TYPE_CLASS": "يجب أن يكون هذا الحقل مثيل {{type}}", - "BASE_TYPE_OBJECT": "يجب أن يكون هذا الحقل كائناً", - "BASE_TYPE_ARRAY": "يجب أن يكون هذا الحقل مصفوفة", - "UNKOWN_FIELD": "مفتاح غير معروف: {{key}}", - "BASE_TYPE_CONSTANT": "يجب أن يكون هذا الحقل {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "عنوان البريد الإلكتروني ليس مشكّل جيدا", - "DATE_TYPE_PARSE": "لا يمكن تحليل {{date}}. يجب أن يكون ISO8601", - "BASE_TYPE_BAD_LENGTH": "يجب أن يكون بين {{length}} في الطول" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 972971159f3beb0414ac5ddd58f665dbd2c7244c Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:31 -0400 Subject: [PATCH 15/76] New translations common.json (Belarusian) --- api/locales/be/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/be/common.json b/api/locales/be/common.json index 1b3115cc..8bb9c042 100644 --- a/api/locales/be/common.json +++ b/api/locales/be/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Гэта поле з'яўляецца абавязковым", - "BASE_TYPE_STRING": "Гэта поле павінна быць string", - "BASE_TYPE_NUMBER": "Гэта поле павінна быць number", - "BASE_TYPE_BIGINT": "Гэта поле павінна быць bigint", - "BASE_TYPE_BOOLEAN": "Гэта поле павінна быць boolean", - "BASE_TYPE_CHOICES": "Гэта поле павінна быць адным з ({{types}})", - "BASE_TYPE_CLASS": "Гэта поле павінна быць асобнікам {{type}}", - "BASE_TYPE_OBJECT": "Гэта поле павінна быць аб'ектам", - "BASE_TYPE_ARRAY": "Гэта поле павінна быць масівам", - "UNKOWN_FIELD": "Невядомае поле: {{key}}", - "BASE_TYPE_CONSTANT": "Гэта поле павінна быць {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Няправільны фармат адрасы электроннай пошты", - "DATE_TYPE_PARSE": "Немагчыма разабраць {{date}}. Яна павінна быць у ISO8601", - "BASE_TYPE_BAD_LENGTH": "Павінна быць паміж {{length}} у даўжыню" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 28e22d76a53898923faa81b5b5acd417735a9b90 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:32 -0400 Subject: [PATCH 16/76] New translations common.json (Bulgarian) --- api/locales/bg/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/bg/common.json b/api/locales/bg/common.json index dca90717..8bb9c042 100644 --- a/api/locales/bg/common.json +++ b/api/locales/bg/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Това поле е задължително", - "BASE_TYPE_STRING": "Това поле трябва да е низ", - "BASE_TYPE_NUMBER": "Това поле трябва да е число", - "BASE_TYPE_BIGINT": "Това поле трябва да е голямо", - "BASE_TYPE_BOOLEAN": "Това поле трябва да бъде булево", - "BASE_TYPE_CHOICES": "Това поле трябва да бъде едно от ({{types}})", - "BASE_TYPE_CLASS": "Това поле трябва да бъде екземпляр на {{type}}", - "BASE_TYPE_OBJECT": "Това поле трябва да бъде обект", - "BASE_TYPE_ARRAY": "Това поле трябва да бъде масив", - "UNKOWN_FIELD": "Непознат ключ: {{key}}", - "BASE_TYPE_CONSTANT": "Това поле трябва да е {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Невалиден имейл адрес", - "DATE_TYPE_PARSE": "Не може да се анализира {{date}}. Трябва да е ISO8601", - "BASE_TYPE_BAD_LENGTH": "Трябва да е с дължина между {{length}}" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From ed4f286852ec54c34b1e50055081312246b076d0 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:33 -0400 Subject: [PATCH 17/76] New translations common.json (Czech) --- api/locales/cs/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/cs/common.json b/api/locales/cs/common.json index 61d70a40..8bb9c042 100644 --- a/api/locales/cs/common.json +++ b/api/locales/cs/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Toto pole je povinné", - "BASE_TYPE_STRING": "Toto pole musí být řetězec", - "BASE_TYPE_NUMBER": "Toto pole musí být číslo", - "BASE_TYPE_BIGINT": "Toto pole musí být velké", - "BASE_TYPE_BOOLEAN": "Toto pole musí být logická hodnota", - "BASE_TYPE_CHOICES": "Toto pole musí být jedno z ({{types}})", - "BASE_TYPE_CLASS": "Toto pole musí být instancí {{type}}", - "BASE_TYPE_OBJECT": "Toto pole musí být objekt", - "BASE_TYPE_ARRAY": "Toto pole musí být pole", - "UNKOWN_FIELD": "Neznámý klíč: {{key}}", - "BASE_TYPE_CONSTANT": "Toto pole musí být {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Není dobře vytvořená e-mailová adresa", - "DATE_TYPE_PARSE": "Nelze naparsovat {{date}}. Mělo by být ISO8601", - "BASE_TYPE_BAD_LENGTH": "Musí být mezi {{length}} délkou" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From e4e023eb4a5320e1d6c3f9a7f2d55455879577e9 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:34 -0400 Subject: [PATCH 18/76] New translations common.json (Danish) --- api/locales/da/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/da/common.json b/api/locales/da/common.json index d307d064..8bb9c042 100644 --- a/api/locales/da/common.json +++ b/api/locales/da/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Dette felt er påkrævet", - "BASE_TYPE_STRING": "Dette felt skal være en streng", - "BASE_TYPE_NUMBER": "Dette felt skal være et tal", - "BASE_TYPE_BIGINT": "Dette felt skal være en bigint", - "BASE_TYPE_BOOLEAN": "Dette felt skal være en boolsk", - "BASE_TYPE_CHOICES": "Dette felt skal være et af ({{types}})", - "BASE_TYPE_CLASS": "Dette felt skal være en instans på {{type}}", - "BASE_TYPE_OBJECT": "Dette felt skal være et objekt", - "BASE_TYPE_ARRAY": "Dette felt skal være et array", - "UNKOWN_FIELD": "Ukendt nøgle: {{key}}", - "BASE_TYPE_CONSTANT": "Dette felt skal være {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Ikke en velformet e-mailadresse", - "DATE_TYPE_PARSE": "Kunne ikke fortolke {{date}}. Bør være ISO8601", - "BASE_TYPE_BAD_LENGTH": "Skal være mellem {{length}} i længden" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 5512cc0981aa1bc4d96e282c214e34af1db190af Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:36 -0400 Subject: [PATCH 19/76] New translations auth.json (French) --- api/locales/fr/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/fr/auth.json b/api/locales/fr/auth.json index eb9eef98..e19547a0 100644 --- a/api/locales/fr/auth.json +++ b/api/locales/fr/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-Mail ou Téléphone introuvable", - "INVALID_PASSWORD": "Mot de passe invalide", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "L'inscription aux nouveaux utilisateurs est désactivée", - "INVITE_ONLY": "Vous devez être invité à s'inscrire", - "EMAIL_INVALID": "Adresse e-mail invalide", - "EMAIL_ALREADY_REGISTERED": "L'adresse e-mail est déjà enregistrée", - "DATE_OF_BIRTH_UNDERAGE": "Vous devez avoir {{years}} ans ou plus", - "CONSENT_REQUIRED": "Vous devez accepter les conditions d'utilisation et la politique de confidentialité.", - "USERNAME_TOO_MANY_USERS": "Trop d'utilisateurs ont ce nom d'utilisateur, veuillez en essayer un autre" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 19565874a84e7713cfbecb580edefae900afe6fe Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:37 -0400 Subject: [PATCH 20/76] New translations auth.json (Finnish) --- api/locales/fi/auth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/locales/fi/auth.json b/api/locales/fi/auth.json index ba099f28..e19547a0 100644 --- a/api/locales/fi/auth.json +++ b/api/locales/fi/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Sähköpostia tai puhelinta ei löydy", - "INVALID_PASSWORD": "Virheellinen Salasana", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Uuden käyttäjän rekisteröinti pois käytöstä", - "INVITE_ONLY": "Sinut on kutsuttava rekisteröitymään", + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", "EMAIL_INVALID": "Invalid Email", - "EMAIL_ALREADY_REGISTERED": "Sähköposti on jo rekisteröity", - "DATE_OF_BIRTH_UNDERAGE": "Sinun täytyy olla {{years}} vuotta tai vanhempi", - "CONSENT_REQUIRED": "Sinun on hyväksyttävä käyttöehdot ja tietosuojakäytäntö.", - "USERNAME_TOO_MANY_USERS": "Liian monilla käyttäjillä on tämä käyttäjänimi, yritä toista" + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 0114a8d977968a666ffeb969c12366463cf5940f Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:38 -0400 Subject: [PATCH 21/76] New translations auth.json (Spanish) --- api/locales/es/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/es/auth.json b/api/locales/es/auth.json index b7f96f80..e19547a0 100644 --- a/api/locales/es/auth.json +++ b/api/locales/es/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-Mail o teléfono no encontrado", - "INVALID_PASSWORD": "Contraseña Incorrecta", - "ACCOUNT_DISABLED": "Esta cuenta está desactivada" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "El registro de un nuevo usuario no se encuentra habilitado", - "INVITE_ONLY": "Tenés que ser invitado para poder registrarte", - "EMAIL_INVALID": "Email inválido", - "EMAIL_ALREADY_REGISTERED": "Este E-mail ya está registrado", - "DATE_OF_BIRTH_UNDERAGE": "Necesitás tener {{years}} años o más", - "CONSENT_REQUIRED": "Tenés que aceptar los Términos de Servicio y la Política de Privacidad.", - "USERNAME_TOO_MANY_USERS": "Demasiados usuarios tienen este nombre de usuario, por favor intentá con otro" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 5f49e6eb86cf49f78b9e9c86882fca984bf53259 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:40 -0400 Subject: [PATCH 22/76] New translations auth.json (Arabic) --- api/locales/ar/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/ar/auth.json b/api/locales/ar/auth.json index d60a0b35..e19547a0 100644 --- a/api/locales/ar/auth.json +++ b/api/locales/ar/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "البريد الإلكتروني أو الهاتف غير موجود", - "INVALID_PASSWORD": "كلمة المرور غير صالحة", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "تم تعطيل تسجيل المستخدم الجديد", - "INVITE_ONLY": "يجب دعوتك للتسجيل", - "EMAIL_INVALID": "البريد الإلكتروني خاطئ", - "EMAIL_ALREADY_REGISTERED": "البريد الإلكتروني مسجل بالفعل", - "DATE_OF_BIRTH_UNDERAGE": "يجب أن تكون {{years}} سنة أو أكثر", - "CONSENT_REQUIRED": "يجب أن توافق على شروط الخدمة وسياسة الخصوصية.", - "USERNAME_TOO_MANY_USERS": "عدد كبير جدا من المستخدمين لديهم اسم المستخدم هذا، الرجاء محاولة اسم آخر" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 3d986838136f49b4e3ea92380cb32692bf02c134 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:41 -0400 Subject: [PATCH 23/76] New translations auth.json (Belarusian) --- api/locales/be/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/be/auth.json b/api/locales/be/auth.json index b9ac5e2e..e19547a0 100644 --- a/api/locales/be/auth.json +++ b/api/locales/be/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Дадзены адрас электроннай пошты ці тэлефон не знойдзены", - "INVALID_PASSWORD": "Няправільны пароль", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Рэгістрацыя новага карыстальніка адключана", - "INVITE_ONLY": "Вас павінны запрасіць, каб зарэгістравацца", - "EMAIL_INVALID": "Няправільны адрас электроннай пошты", - "EMAIL_ALREADY_REGISTERED": "Дадзены адрас электроннай пошты ўжо зарэгістраваны", - "DATE_OF_BIRTH_UNDERAGE": "Вам павінна быць не менш за {{years}} гадоў або больш", - "CONSENT_REQUIRED": "Вы павінны пагадзіцца з Умовамі прадастаўлення паслуг і Палітыкай прыватнасці.", - "USERNAME_TOO_MANY_USERS": "Занадта шмат карыстальнікаў маюць гэтае імя карыстальніка, калі ласка, паспрабуйце іншае" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 21c067349ca30278510d1d76f21573efb98ab695 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:42 -0400 Subject: [PATCH 24/76] New translations auth.json (Bulgarian) --- api/locales/bg/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/bg/auth.json b/api/locales/bg/auth.json index 1dfd3568..e19547a0 100644 --- a/api/locales/bg/auth.json +++ b/api/locales/bg/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Невалиден имейл адрес или телефонен номер", - "INVALID_PASSWORD": "Невалидна парола", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Регистрацията на нов потребител е деактивирана", - "INVITE_ONLY": "Вие трябва да бъдете поканени, за да можете да се регистрирате", - "EMAIL_INVALID": "Невалиден имейл", - "EMAIL_ALREADY_REGISTERED": "Имейлът вече е регистриран", - "DATE_OF_BIRTH_UNDERAGE": "Трябва да сте навършили {{years}} или повече години", - "CONSENT_REQUIRED": "Трябва да се съгласите с Общите условия и Политиката за поверителност.", - "USERNAME_TOO_MANY_USERS": "Твърде много потребители имат това потребителско име, моля опитайте друго" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 9e3fac7881de473d3d791d4a0400de910f09d296 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:43 -0400 Subject: [PATCH 25/76] New translations auth.json (Czech) --- api/locales/cs/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/cs/auth.json b/api/locales/cs/auth.json index 59fa4fcf..e19547a0 100644 --- a/api/locales/cs/auth.json +++ b/api/locales/cs/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-Mail nebo telefon nenalezen", - "INVALID_PASSWORD": "Neplatné heslo", - "ACCOUNT_DISABLED": "Tento účet je vypnutý" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Registrace nového uživatele je zakázána", - "INVITE_ONLY": "Musíte být pozváni k registraci", - "EMAIL_INVALID": "Neplatný E-mail", - "EMAIL_ALREADY_REGISTERED": "E-mail je již registrován", - "DATE_OF_BIRTH_UNDERAGE": "Musíš být {{years}} let nebo starší", - "CONSENT_REQUIRED": "Musíte souhlasit s obchodními podmínkami a zásadami ochrany osobních údajů.", - "USERNAME_TOO_MANY_USERS": "Příliš mnoho uživatelů má toto uživatelské jméno, zkuste prosím jiné" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 573e38f05418ffda09be43162ae28542259bb0bc Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:44 -0400 Subject: [PATCH 26/76] New translations auth.json (Danish) --- api/locales/da/auth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/locales/da/auth.json b/api/locales/da/auth.json index 87465404..e19547a0 100644 --- a/api/locales/da/auth.json +++ b/api/locales/da/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-mail eller telefon ikke fundet", - "INVALID_PASSWORD": "Ugyldig Adgangskode", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Ny brugerregistrering er deaktiveret", - "INVITE_ONLY": "Du skal inviteres til at registrere dig", + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", "EMAIL_INVALID": "Invalid Email", - "EMAIL_ALREADY_REGISTERED": "E-mail er allerede registreret", - "DATE_OF_BIRTH_UNDERAGE": "Du skal være {{years}} år eller ældre", - "CONSENT_REQUIRED": "Du skal acceptere Servicevilkår og privatlivspolitik.", - "USERNAME_TOO_MANY_USERS": "For mange brugere har dette brugernavn, prøv venligst et andet" + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 45a93f5800b0e41b8c8f19f3391df24ccb60041d Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:45 -0400 Subject: [PATCH 27/76] New translations auth.json (Greek) --- api/locales/el/auth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/locales/el/auth.json b/api/locales/el/auth.json index 9315d590..e19547a0 100644 --- a/api/locales/el/auth.json +++ b/api/locales/el/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Το e-mail ή το τηλέφωνο δεν βρέθηκε", - "INVALID_PASSWORD": "Μη Έγκυρος Κωδικός", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Η εγγραφή νέου χρήστη είναι απενεργοποιημένη", - "INVITE_ONLY": "Πρέπει να προσκληθείτε να εγγραφείτε", + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", "EMAIL_INVALID": "Invalid Email", - "EMAIL_ALREADY_REGISTERED": "Το email έχει ήδη καταχωρηθεί", - "DATE_OF_BIRTH_UNDERAGE": "Πρέπει να είστε {{years}} ετών ή μεγαλύτεροι", - "CONSENT_REQUIRED": "Πρέπει να συμφωνήσετε με τους Όρους Παροχής Υπηρεσιών και την Πολιτική Απορρήτου.", - "USERNAME_TOO_MANY_USERS": "Πάρα πολλοί χρήστες έχουν αυτό το όνομα χρήστη, παρακαλώ δοκιμάστε ένα άλλο" + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 492b76beb9d7f62b8255e25767ce7968c21f96ff Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:47 -0400 Subject: [PATCH 28/76] New translations auth.json (Slovak) --- api/locales/sk/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/sk/auth.json b/api/locales/sk/auth.json index 52d96c70..e19547a0 100644 --- a/api/locales/sk/auth.json +++ b/api/locales/sk/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-mail alebo Telefón nebol nájdený", - "INVALID_PASSWORD": "Neplatné Heslo", - "ACCOUNT_DISABLED": "Tento účet je deaktivovaný" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Registrácia nového používateľa je zakázaná", - "INVITE_ONLY": "Na registráciu musíte byť pozvaní", - "EMAIL_INVALID": "Neplatný Email", - "EMAIL_ALREADY_REGISTERED": "Email je už zaregistrovaný", - "DATE_OF_BIRTH_UNDERAGE": "Musíte mať {{years}} alebo viac rokov", - "CONSENT_REQUIRED": "Musíte súhlasiť s Podmienkami používania služby a Zásadami ochrany osobných údajov.", - "USERNAME_TOO_MANY_USERS": "Toto používateľské meno má príliš veľa používateľov, skúste iné" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From c87e3e6fc7ac2c6416de0483ef0592cb80bb90da Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:48 -0400 Subject: [PATCH 29/76] New translations auth.json (Hungarian) --- api/locales/hu/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/hu/auth.json b/api/locales/hu/auth.json index cf2f7d06..e19547a0 100644 --- a/api/locales/hu/auth.json +++ b/api/locales/hu/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Nincs ilyen E-Mail vagy Telefon", - "INVALID_PASSWORD": "Érvénytelen jelszó", - "ACCOUNT_DISABLED": "Ez a fiók le van tiltva" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Új felhasználók regisztrációja nem engedélyezett", - "INVITE_ONLY": "Csak meghívottak regisztrálhatnak", - "EMAIL_INVALID": "Érvénytelen Email", - "EMAIL_ALREADY_REGISTERED": "Az Email már regisztrálva van", - "DATE_OF_BIRTH_UNDERAGE": "{{years}} éves vagy idősebbnek kell lenned", - "CONSENT_REQUIRED": "El kell fogadnod a Felhasználási Feltételeket és az Adatvédelmi Nyilatkozatot.", - "USERNAME_TOO_MANY_USERS": "Túl sok felhasználó használja ezt a nevet, kérlek próbálj egy másikat" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 61d64816036683290ec88b717bc9b465179c6338 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:49 -0400 Subject: [PATCH 30/76] New translations auth.json (Italian) --- api/locales/it/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/it/auth.json b/api/locales/it/auth.json index 3ba387e9..e19547a0 100644 --- a/api/locales/it/auth.json +++ b/api/locales/it/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-Mail o numero di telefono non trovato", - "INVALID_PASSWORD": "Password Non Valida", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "La registrazione di nuovi utenti è disabilitata", - "INVITE_ONLY": "Devi essere stato invitato per registrarti", - "EMAIL_INVALID": "Indirizzo e-mail non valido", - "EMAIL_ALREADY_REGISTERED": "Email già registrata", - "DATE_OF_BIRTH_UNDERAGE": "Devi avere almeno {{years}} anni", - "CONSENT_REQUIRED": "È necessario accettare i Termini di Servizio e l'Informativa sulla privacy.", - "USERNAME_TOO_MANY_USERS": "Troppi utenti hanno questo nickname, per favore provane un altro" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 31a21cb0c9e134ee465c4eb4342ef3d0da3b39b8 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:50 -0400 Subject: [PATCH 31/76] New translations auth.json (Japanese) --- api/locales/ja/auth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/locales/ja/auth.json b/api/locales/ja/auth.json index 7a131bb7..e19547a0 100644 --- a/api/locales/ja/auth.json +++ b/api/locales/ja/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "メールまたは電話が見つかりません", - "INVALID_PASSWORD": "無効なパスワード", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "新しいユーザー登録は無効です", - "INVITE_ONLY": "登録するには招待する必要があります", + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", "EMAIL_INVALID": "Invalid Email", - "EMAIL_ALREADY_REGISTERED": "メールアドレスは既に登録されています", - "DATE_OF_BIRTH_UNDERAGE": "{{years}} 歳以上である必要があります", - "CONSENT_REQUIRED": "利用規約およびプライバシーポリシーに同意する必要があります。", - "USERNAME_TOO_MANY_USERS": "このユーザー名を持つユーザーが多すぎます。別のユーザーをお試しください。" + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 080cf3c3402f525356dbde32bca78acb4f134e24 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:51 -0400 Subject: [PATCH 32/76] New translations auth.json (Korean) --- api/locales/ko/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/ko/auth.json b/api/locales/ko/auth.json index 683ba78a..e19547a0 100644 --- a/api/locales/ko/auth.json +++ b/api/locales/ko/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "이메일 또는 전화번호를 찾을 수 없습니다", - "INVALID_PASSWORD": "비밀번호가 틀렸습니다", - "ACCOUNT_DISABLED": "이 계정은 비활성화되었습니다" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "신규 사용자의 등록이 비활성화되었습니다", - "INVITE_ONLY": "초대받은 사람만 가입할 수 있습니다", - "EMAIL_INVALID": "이메일이 유효하지 않습니다", - "EMAIL_ALREADY_REGISTERED": "이미 등록된 이메일입니다", - "DATE_OF_BIRTH_UNDERAGE": "최소 {{years}} 이상이어야 합니다", - "CONSENT_REQUIRED": "서비스 약관 및 개인정보 취급방침에 동의하셔야 합니다.", - "USERNAME_TOO_MANY_USERS": "이 사용자명을 쓰는 사용자가 너무 많습니다. 다른 사용자명을 시도하세요" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 8301b4328589fa5d77798c5a6587976b6e2634fa Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:52 -0400 Subject: [PATCH 33/76] New translations auth.json (Lithuanian) --- api/locales/lt/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/lt/auth.json b/api/locales/lt/auth.json index 20c1ac29..e19547a0 100644 --- a/api/locales/lt/auth.json +++ b/api/locales/lt/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "El. Paštas ar telefonas nerastas", - "INVALID_PASSWORD": "Neteisingas slaptažodis", - "ACCOUNT_DISABLED": "Ši paskyra išjungta" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Naujų vartotojų registracija išjungta", - "INVITE_ONLY": "Jūs turite būti pakviesti registruotis", - "EMAIL_INVALID": "Netinkamas el. pašto adresas", - "EMAIL_ALREADY_REGISTERED": "El. pašto adresas jau užregistruotas", - "DATE_OF_BIRTH_UNDERAGE": "Jūs turite būti {{years}} metų ar vyresni", - "CONSENT_REQUIRED": "Jūs turite sutikti su paslaugos teikimo sąlygomis ir privatumo politika.", - "USERNAME_TOO_MANY_USERS": "Per daug vartotojų turi šį vartotojo vardą, prašome naudoti kitą" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From c35206d01d5baf18943e8da9615098c2750786be Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:52 -0400 Subject: [PATCH 34/76] New translations auth.json (Dutch) --- api/locales/nl/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/nl/auth.json b/api/locales/nl/auth.json index f45dd377..e19547a0 100644 --- a/api/locales/nl/auth.json +++ b/api/locales/nl/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "E-mailadres of telefoon niet gevonden", - "INVALID_PASSWORD": "Ongeldig wachtwoord", - "ACCOUNT_DISABLED": "Dit account is verwijderd." + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Registratie voor nieuwe gebruikers is uitgeschakeld", - "INVITE_ONLY": "U moet worden uitgenodigd om te registreren", - "EMAIL_INVALID": "Email is ongeldig.", - "EMAIL_ALREADY_REGISTERED": "Dit e-mailadres is al geregistreerd", - "DATE_OF_BIRTH_UNDERAGE": "Je moet {{years}} jaar of ouder zijn", - "CONSENT_REQUIRED": "U moet akkoord gaan met de Algemene Voorwaarden en het Privacybeleid.", - "USERNAME_TOO_MANY_USERS": "Te veel gebruikers hebben deze gebruikersnaam, probeer een andere" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From bc557a6887655776056e51474fbad9afa03b5365 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:53 -0400 Subject: [PATCH 35/76] New translations auth.json (Norwegian) --- api/locales/no/auth.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api/locales/no/auth.json b/api/locales/no/auth.json index 2c0ea29e..e19547a0 100644 --- a/api/locales/no/auth.json +++ b/api/locales/no/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Fant ikke e-postadresse eller telefon", - "INVALID_PASSWORD": "Ugyldig passord", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Ny brukerregistrering er deaktivert", - "INVITE_ONLY": "Du må bli invitert for å registrere deg", + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", "EMAIL_INVALID": "Invalid Email", - "EMAIL_ALREADY_REGISTERED": "E-postadressen er allerede registrert", - "DATE_OF_BIRTH_UNDERAGE": "Du må være {{years}} eller eldre", - "CONSENT_REQUIRED": "Du må godta vilkårene for bruk og personvernerklæringen.", - "USERNAME_TOO_MANY_USERS": "For mange brukere har dette brukernavnet, prøv et annet" + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 022a448981425b6c53d9126f092744839db26fe7 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:56 -0400 Subject: [PATCH 36/76] New translations auth.json (Russian) --- api/locales/ru/auth.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/api/locales/ru/auth.json b/api/locales/ru/auth.json index 26b3f5a7..e19547a0 100644 --- a/api/locales/ru/auth.json +++ b/api/locales/ru/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Данный адрес электронной почты или телефон не найден", - "INVALID_PASSWORD": "Неверный пароль", - "ACCOUNT_DISABLED": "Этот аккаунт отключён" + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", + "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Регистрация нового пользователя отключена", - "INVITE_ONLY": "Вы должны быть приглашены для регистрации", - "EMAIL_INVALID": "Неверный адрес электронной почты", - "EMAIL_ALREADY_REGISTERED": "Данный адрес электронной почты уже зарегистрирован", - "DATE_OF_BIRTH_UNDERAGE": "Вам должно быть {{years}} лет или старше", - "CONSENT_REQUIRED": "Вы должны согласиться с Условиями обслуживания и Политикой конфиденциальности.", - "USERNAME_TOO_MANY_USERS": "Слишком много пользователей имеют это имя пользователя, пожалуйста, попробуйте другое" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From 63aaf0fb2dd4c23533cbdff03f45e8cb673b8af2 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:56 -0400 Subject: [PATCH 37/76] New translations common.json (German) --- api/locales/de/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/de/common.json b/api/locales/de/common.json index 39f38c49..8bb9c042 100644 --- a/api/locales/de/common.json +++ b/api/locales/de/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Dieses Feld ist erforderlich", - "BASE_TYPE_STRING": "Dieses Feld muss ein String sein", - "BASE_TYPE_NUMBER": "Dieses Feld muss eine Zahl sein", - "BASE_TYPE_BIGINT": "Dieses Feld muss ein bigint sein", - "BASE_TYPE_BOOLEAN": "Dieses Feld muss ein boolean sein", - "BASE_TYPE_CHOICES": "Dieses Feld muss eines von ({{types}}) sein", - "BASE_TYPE_CLASS": "Dieses Feld muss {{type}} sein", - "BASE_TYPE_OBJECT": "Dieses Feld muss ein Objekt sein", - "BASE_TYPE_ARRAY": "Dieses Feld muss ein Array sein", - "UNKOWN_FIELD": "Unbekanntes Feld: {{key}}", - "BASE_TYPE_CONSTANT": "Dieses Feld muss {{value}} sein", - "EMAIL_TYPE_INVALID_EMAIL": "Keine gültige E-Mail-Adresse", - "DATE_TYPE_PARSE": "Konnte {{date}} nicht lesen. Muss ISO8601 entsprechen", - "BASE_TYPE_BAD_LENGTH": "Muss zwischen {{length}} lang sein" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From b7bf4ef2f5412f75440789addaab4b4be04a2845 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:41:57 -0400 Subject: [PATCH 38/76] New translations common.json (Greek) --- api/locales/el/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/el/common.json b/api/locales/el/common.json index f4857cdc..8bb9c042 100644 --- a/api/locales/el/common.json +++ b/api/locales/el/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Αυτό το πεδίο είναι υποχρεωτικό", - "BASE_TYPE_STRING": "Αυτό το πεδίο πρέπει να είναι μια συμβολοσειρά", - "BASE_TYPE_NUMBER": "Αυτό το πεδίο πρέπει να είναι αριθμός", - "BASE_TYPE_BIGINT": "Αυτό το πεδίο πρέπει να είναι μεγαλοπρεπής", - "BASE_TYPE_BOOLEAN": "Αυτό το πεδίο πρέπει να είναι boolean", - "BASE_TYPE_CHOICES": "Αυτό το πεδίο πρέπει να είναι ένα από{{types}})", - "BASE_TYPE_CLASS": "Αυτό το πεδίο πρέπει να είναι ένα παράδειγμα {{type}}", - "BASE_TYPE_OBJECT": "Αυτό το πεδίο πρέπει να είναι αντικείμενο", - "BASE_TYPE_ARRAY": "Αυτό το πεδίο πρέπει να είναι ένας πίνακας", - "UNKOWN_FIELD": "Άγνωστο κλειδί: {{key}}", - "BASE_TYPE_CONSTANT": "Αυτό το πεδίο πρέπει να είναι {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Δεν είναι καλά σχηματισμένη διεύθυνση ηλεκτρονικού ταχυδρομείου", - "DATE_TYPE_PARSE": "Αδυναμία ανάλυσης του {{date}}. Πρέπει να είναι ISO8601", - "BASE_TYPE_BAD_LENGTH": "Πρέπει να είναι μεταξύ {{length}} σε μήκος" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From d9646ea51b61fe193aa1663a09e4fff68935dea2 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:05 -0400 Subject: [PATCH 39/76] New translations common.json (Esperanto) --- api/locales/eo/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/eo/common.json b/api/locales/eo/common.json index 76a72960..8bb9c042 100644 --- a/api/locales/eo/common.json +++ b/api/locales/eo/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Tio kampo estas bezona", - "BASE_TYPE_STRING": "Tio kampo devas string", - "BASE_TYPE_NUMBER": "Tio kampo devas numbero", - "BASE_TYPE_BIGINT": "Tio kampo devas bigint", - "BASE_TYPE_BOOLEAN": "Tio kampo devas bulea", - "BASE_TYPE_CHOICES": "Tio kampo devas unu de ({{types}})", - "BASE_TYPE_CLASS": "Tio kampo devas kazo de {{type}}", - "BASE_TYPE_OBJECT": "Tio kampo devas objekto", - "BASE_TYPE_ARRAY": "Tio kampo devas tabelo", - "UNKOWN_FIELD": "Nekonata ŝlosilo: {{key}}", - "BASE_TYPE_CONSTANT": "Tio kampo devas {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Formado de retpoŝto estas nevalida", - "DATE_TYPE_PARSE": "Nevalida dato {{date}}. Devas ISO8601", - "BASE_TYPE_BAD_LENGTH": "Devas sub {{length}} en longo" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 1646f7096fd1c38f8f3d1409592ce1c21b7b611d Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:12 -0400 Subject: [PATCH 40/76] New translations common.json (Hindi) --- api/locales/hi/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/hi/common.json b/api/locales/hi/common.json index 0117eeee..8bb9c042 100644 --- a/api/locales/hi/common.json +++ b/api/locales/hi/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "यह फ़ील्ड आवश्यक है", - "BASE_TYPE_STRING": "यह फ़ील्ड एक स्ट्रिंग होनी चाहिए", - "BASE_TYPE_NUMBER": "यह फ़ील्ड एक संख्या होनी चाहिए", - "BASE_TYPE_BIGINT": "यह फ़ील्ड एक बिगिन्ट होनी चाहिए", - "BASE_TYPE_BOOLEAN": "यह फ़ील्ड एक बूलियन होनी चाहिए", - "BASE_TYPE_CHOICES": "यह फ़ील्ड एक प्रकार का [[[types]]] होना चाहिए", - "BASE_TYPE_CLASS": "यह फ़ील्ड एक प्रकार का [[[types]]] होना चाहिए", - "BASE_TYPE_OBJECT": "यह फ़ील्ड एक ऑब्जेक्ट होनी चाहिए", - "BASE_TYPE_ARRAY": "यह फ़ील्ड एक ऐरे होनी चाहिए", - "UNKOWN_FIELD": "अज्ञात कुंजी: [[key]]", - "BASE_TYPE_CONSTANT": "यह क्षेत्र {{value}} होना चाहिए", - "EMAIL_TYPE_INVALID_EMAIL": "खराब ईमेल एड्रेस", - "DATE_TYPE_PARSE": "{{date}} की पदव्‍याख्‍या नहीं हो पाई है। ISO8601 होना चाहिए", - "BASE_TYPE_BAD_LENGTH": "लंबाई {{length}} के बीच में होनी चाहिए" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 0eb928fff830f1d3933d5fdcb31ae14b1988ac9d Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:13 -0400 Subject: [PATCH 41/76] New translations common.json (Finnish) --- api/locales/fi/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/fi/common.json b/api/locales/fi/common.json index 80a73715..8bb9c042 100644 --- a/api/locales/fi/common.json +++ b/api/locales/fi/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Tämä kenttä on pakollinen", - "BASE_TYPE_STRING": "Tämän kentän on oltava merkkijono", - "BASE_TYPE_NUMBER": "Tämän kentän on oltava numero", - "BASE_TYPE_BIGINT": "Tämän kentän on oltava isoin", - "BASE_TYPE_BOOLEAN": "Tämän kentän on oltava totuus", - "BASE_TYPE_CHOICES": "Tämän kentän on oltava yksi ({{types}})", - "BASE_TYPE_CLASS": "Tämän kentän on oltava {{type}} instanssi", - "BASE_TYPE_OBJECT": "Tämän kentän on oltava objekti", - "BASE_TYPE_ARRAY": "Tämän kentän on oltava array", - "UNKOWN_FIELD": "Tuntematon avain: {{key}}", - "BASE_TYPE_CONSTANT": "Tämän kentän on oltava {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Sähköpostiosoite ei ole hyvin muodostettu", - "DATE_TYPE_PARSE": "Ei voitu jäsentää {{date}}. Pitäisi olla ISO8601", - "BASE_TYPE_BAD_LENGTH": "Pituuden on oltava välillä {{length}}" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From ef303a929e69e9e39e46d63c15ce9c3dddacf292 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:14 -0400 Subject: [PATCH 42/76] New translations common.json (Russian) --- api/locales/ru/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/ru/common.json b/api/locales/ru/common.json index aff9677b..8bb9c042 100644 --- a/api/locales/ru/common.json +++ b/api/locales/ru/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Это поле является обязательным", - "BASE_TYPE_STRING": "Это поле должно быть string", - "BASE_TYPE_NUMBER": "Это поле должно быть number", - "BASE_TYPE_BIGINT": "Это поле должно быть bigint", - "BASE_TYPE_BOOLEAN": "Это поле должно быть boolean", - "BASE_TYPE_CHOICES": "Это поле должно быть одним из ({{types}})", - "BASE_TYPE_CLASS": "Это поле должно быть экземпляром {{type}}", - "BASE_TYPE_OBJECT": "Это поле должно быть объектом", - "BASE_TYPE_ARRAY": "Это поле должно быть массивом", - "UNKOWN_FIELD": "Неизвестное поле: {{key}}", - "BASE_TYPE_CONSTANT": "Это поле должно быть {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Неправильный формат адреса электронной почты", - "DATE_TYPE_PARSE": "Не удалось разобрать {{date}}. Дата должна быть в ISO8601", - "BASE_TYPE_BAD_LENGTH": "Длина должна быть между {{length}} в длину" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 701b8fcb8daeacc172484870ca7aea92a8a13d90 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:16 -0400 Subject: [PATCH 43/76] New translations common.json (Hungarian) --- api/locales/hu/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/hu/common.json b/api/locales/hu/common.json index 43bd2722..8bb9c042 100644 --- a/api/locales/hu/common.json +++ b/api/locales/hu/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Ez a mező kötelező", - "BASE_TYPE_STRING": "Ennek a mezőnek string-nek kell lennie", - "BASE_TYPE_NUMBER": "Ennek a mezőnek számnak kell lennie", - "BASE_TYPE_BIGINT": "Ennek a mezőnek bigint-nek kell lennie", - "BASE_TYPE_BOOLEAN": "Ennek a mezőnek boolean-nek kell lennie", - "BASE_TYPE_CHOICES": "Ennek a mezőnek {{types}} típusúnak kell lennie", - "BASE_TYPE_CLASS": "Ennek a mezőnek {{type}} típusúnak kell lennie", - "BASE_TYPE_OBJECT": "Ennek a mezőnek object-nek kell lennie", - "BASE_TYPE_ARRAY": "Ennek a mezőnek array-nek kell lennie", - "UNKOWN_FIELD": "Ismeretlen kulcs: {{key}}", - "BASE_TYPE_CONSTANT": "A mezőnek {{value}} kell lennie", - "EMAIL_TYPE_INVALID_EMAIL": "Nem jól megformázott email cím", - "DATE_TYPE_PARSE": "Nem sikerült elemezni {{date}}. ISO8901-nak kéne lennie", - "BASE_TYPE_BAD_LENGTH": "{{length}} között kell lennie hosszban" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From ece13d2adaa8bd4177fce62490a430fba1ae9ead Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:16 -0400 Subject: [PATCH 44/76] New translations common.json (Italian) --- api/locales/it/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/it/common.json b/api/locales/it/common.json index 1faa3df0..8bb9c042 100644 --- a/api/locales/it/common.json +++ b/api/locales/it/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Questo campo è obbligatorio", - "BASE_TYPE_STRING": "Questo campo deve essere una stringa", - "BASE_TYPE_NUMBER": "Questo campo deve essere un numero", - "BASE_TYPE_BIGINT": "Questo campo deve essere un numero intero", - "BASE_TYPE_BOOLEAN": "Questo campo deve essere un numero booleano", - "BASE_TYPE_CHOICES": "Questo campo deve essere uno di ({{types}})", - "BASE_TYPE_CLASS": "Questo campo deve essere un'istanza di {{type}}", - "BASE_TYPE_OBJECT": "Questo campo deve essere un oggetto", - "BASE_TYPE_ARRAY": "Questo campo deve essere un array", - "UNKOWN_FIELD": "Chiave non riconosciuta: {{key}}", - "BASE_TYPE_CONSTANT": "Questo campo deve essere {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Questo indirizzo e-mail non è in un formato valido", - "DATE_TYPE_PARSE": "Impossibile analizzare {{date}}. Dovrebbe essere ISO8601", - "BASE_TYPE_BAD_LENGTH": "Deve essere compreso tra {{length}} in lunghezza" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From fddcfacc1754f3167fa091293d62cde48999db57 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:18 -0400 Subject: [PATCH 45/76] New translations common.json (Japanese) --- api/locales/ja/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/ja/common.json b/api/locales/ja/common.json index 687c04e2..8bb9c042 100644 --- a/api/locales/ja/common.json +++ b/api/locales/ja/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "このフィールドは必須項目です", - "BASE_TYPE_STRING": "このフィールドは文字列でなければなりません", - "BASE_TYPE_NUMBER": "このフィールドは数値でなければなりません", - "BASE_TYPE_BIGINT": "このフィールドはbigintでなければなりません", - "BASE_TYPE_BOOLEAN": "このフィールドはブール値でなければなりません", - "BASE_TYPE_CHOICES": "このフィールドは ({{types}} ) のいずれかでなければなりません", - "BASE_TYPE_CLASS": "このフィールドは {{type}} のインスタンスでなければなりません", - "BASE_TYPE_OBJECT": "このフィールドはオブジェクトでなければなりません", - "BASE_TYPE_ARRAY": "このフィールドは配列でなければなりません", - "UNKOWN_FIELD": "不明なキー: {{key}}", - "BASE_TYPE_CONSTANT": "このフィールドは {{value}} でなければなりません", - "EMAIL_TYPE_INVALID_EMAIL": "メールアドレスが正しくありません", - "DATE_TYPE_PARSE": "{{date}}を解析できませんでした。ISO8601である必要があります", - "BASE_TYPE_BAD_LENGTH": "{{length}} 以内でなければなりません" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From e68631eb32cd4786b8b49cc782f15c53c214b96a Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:18 -0400 Subject: [PATCH 46/76] New translations common.json (Korean) --- api/locales/ko/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/ko/common.json b/api/locales/ko/common.json index bb521b37..8bb9c042 100644 --- a/api/locales/ko/common.json +++ b/api/locales/ko/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "필수로 기입해야 합니다", - "BASE_TYPE_STRING": "문자열을 입력해야 합니다", - "BASE_TYPE_NUMBER": "숫자를 입력해야 합니다", - "BASE_TYPE_BIGINT": "bigint를 입력해야 합니다", - "BASE_TYPE_BOOLEAN": "논리값을 입력해야 합니다", - "BASE_TYPE_CHOICES": "값의 유형이 ({{types}}) 중 하나여야 합니다", - "BASE_TYPE_CLASS": "값의 유형이 {{type}}(이)여야 합니다", - "BASE_TYPE_OBJECT": "객체를 입력해야 합니다", - "BASE_TYPE_ARRAY": "배열을 입력해야 합니다", - "UNKOWN_FIELD": "알 수 없는 키: {{key}}", - "BASE_TYPE_CONSTANT": "{{value}}(을)를 입력해야 합니다", - "EMAIL_TYPE_INVALID_EMAIL": "올바른 이메일 주소 형식이 아닙니다", - "DATE_TYPE_PARSE": "{{date}} 형식을 분석할 수 없습니다. ISO8601을 따라야 합니다", - "BASE_TYPE_BAD_LENGTH": "길이가 {{length}} 사이여야 합니다" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 4c3ddcf85bbea34ebd74b36cbf530923ad0ab902 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:20 -0400 Subject: [PATCH 47/76] New translations common.json (Lithuanian) --- api/locales/lt/common.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/locales/lt/common.json b/api/locales/lt/common.json index bc9ad022..8bb9c042 100644 --- a/api/locales/lt/common.json +++ b/api/locales/lt/common.json @@ -1,6 +1,6 @@ { "field": { - "BASE_TYPE_REQUIRED": "Šis laukelis privalomas", + "BASE_TYPE_REQUIRED": "This field is required", "BASE_TYPE_STRING": "This field must be a string", "BASE_TYPE_NUMBER": "This field must be a number", "BASE_TYPE_BIGINT": "This field must be a bigint", @@ -11,7 +11,7 @@ "BASE_TYPE_ARRAY": "This field must be an array", "UNKOWN_FIELD": "Unknown key: {{key}}", "BASE_TYPE_CONSTANT": "This field must be {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Neteisingai suformuotas el. pašto adresas", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } From b8e33eef50d0f3a7c42278d12989b9558cebd4b7 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:21 -0400 Subject: [PATCH 48/76] New translations common.json (Dutch) --- api/locales/nl/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/nl/common.json b/api/locales/nl/common.json index f18c1dcb..8bb9c042 100644 --- a/api/locales/nl/common.json +++ b/api/locales/nl/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Dit veld is verplicht", - "BASE_TYPE_STRING": "Dit veld moet een tekenreeks zijn", - "BASE_TYPE_NUMBER": "Dit veld moet een getal zijn", - "BASE_TYPE_BIGINT": "Dit veld moet een bigint zijn", - "BASE_TYPE_BOOLEAN": "Dit veld moet een Booleaanse waarde zijn", - "BASE_TYPE_CHOICES": "Dit veld moet een van ({{types}} ) zijn", - "BASE_TYPE_CLASS": "Dit veld moet een exemplaar zijn van {{type}}", - "BASE_TYPE_OBJECT": "Dit veld moet een object zijn", - "BASE_TYPE_ARRAY": "Dit veld moet een array zijn", - "UNKOWN_FIELD": "Onbekend sleutel: {{key}}", - "BASE_TYPE_CONSTANT": "Dit veld moet {{value}} zijn", - "EMAIL_TYPE_INVALID_EMAIL": "Niet een geldig e-mailadres", - "DATE_TYPE_PARSE": "Kan {{date}}niet parsen. Moet ISO8601 zijn", - "BASE_TYPE_BAD_LENGTH": "Moet tussen {{length}} in lengte zijn" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From a1e47e594588703d92c099cfe99ff02bfabf90ca Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:21 -0400 Subject: [PATCH 49/76] New translations common.json (Norwegian) --- api/locales/no/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/no/common.json b/api/locales/no/common.json index ab58a24e..8bb9c042 100644 --- a/api/locales/no/common.json +++ b/api/locales/no/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Dette feltet er obligatorisk", - "BASE_TYPE_STRING": "Dette feltet må være en streng", - "BASE_TYPE_NUMBER": "Dette feltet må være et tall", - "BASE_TYPE_BIGINT": "Dette feltet må være en stor", - "BASE_TYPE_BOOLEAN": "Dette feltet må være en boolsk verdi", - "BASE_TYPE_CHOICES": "Dette feltet må være ett av ({{types}})", - "BASE_TYPE_CLASS": "Dette feltet må være en forekomst av {{type}}", - "BASE_TYPE_OBJECT": "Dette feltet må være et objekt", - "BASE_TYPE_ARRAY": "Dette feltet må være en liste", - "UNKOWN_FIELD": "Ukjent nøkkel: {{key}}", - "BASE_TYPE_CONSTANT": "Dette feltet må være {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Ikke et gyldig e-postadresse format", - "DATE_TYPE_PARSE": "Kunne ikke analysere {{date}}. Skal være ISO8601", - "BASE_TYPE_BAD_LENGTH": "Må være mellom {{length}} i lengde" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From e816dd2098177735e129d438125ba8df1d3a24ec Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:24 -0400 Subject: [PATCH 50/76] New translations common.json (Slovak) --- api/locales/sk/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/sk/common.json b/api/locales/sk/common.json index c7435665..8bb9c042 100644 --- a/api/locales/sk/common.json +++ b/api/locales/sk/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Toto pole je povinné", - "BASE_TYPE_STRING": "Toto pole musí byť slovo alebo veta", - "BASE_TYPE_NUMBER": "Toto pole musí byť číslo", - "BASE_TYPE_BIGINT": "Toto pole musí byť binárna číslica", - "BASE_TYPE_BOOLEAN": "Toto pole musí byť buď áno, alebo nie", - "BASE_TYPE_CHOICES": "Toto pole musí byť jedným z ({{types}})", - "BASE_TYPE_CLASS": "Toto pole musí byť inštanciou z {{type}}", - "BASE_TYPE_OBJECT": "Toto pole musí byť objekt", - "BASE_TYPE_ARRAY": "Toto pole musí byť pole", - "UNKOWN_FIELD": "Neznámy kľúč: {{key}}", - "BASE_TYPE_CONSTANT": "Toto pole musí byť {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Nie je správne formulovaná emailová adresa", - "DATE_TYPE_PARSE": "Nepodarilo sa analyzovať {{date}}. Malo by byť ISO8601", - "BASE_TYPE_BAD_LENGTH": "Musí mať dĺžku medzi {{length}}" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 1a216481e3589fe2ec4ae61f9ef203e1037a392b Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:24 -0400 Subject: [PATCH 51/76] New translations common.json (Croatian) --- api/locales/hr/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/hr/common.json b/api/locales/hr/common.json index 4afc5794..8bb9c042 100644 --- a/api/locales/hr/common.json +++ b/api/locales/hr/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Ovo polje je obavezno", - "BASE_TYPE_STRING": "Ovo polje mora biti niz", - "BASE_TYPE_NUMBER": "Ovo polje mora biti broj", - "BASE_TYPE_BIGINT": "Ovo polje mora biti bigint", - "BASE_TYPE_BOOLEAN": "Ovo polje mora biti boolean", - "BASE_TYPE_CHOICES": "Ovo polje mora biti jedno od ({{types}})", - "BASE_TYPE_CLASS": "Ovo polje mora biti primjer od {{type}}", - "BASE_TYPE_OBJECT": "Ovo polje mora biti objekt", - "BASE_TYPE_ARRAY": "Ovo polje mora biti niz", - "UNKOWN_FIELD": "Nepoznati ključ: {{key}}", - "BASE_TYPE_CONSTANT": "Ovo polje mora biti {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Nije dobro oblikovana Email adresa", - "DATE_TYPE_PARSE": "Nije moguće raščlaniti {{date}}. Treba biti ISO8601", - "BASE_TYPE_BAD_LENGTH": "Mora biti između {{length}} u duljini" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 09a963666151504b63cf623dfadc8750bce3b3b2 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:26 -0400 Subject: [PATCH 52/76] New translations common.json (Swedish) --- api/locales/sv/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/sv/common.json b/api/locales/sv/common.json index 03ef05bc..8bb9c042 100644 --- a/api/locales/sv/common.json +++ b/api/locales/sv/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Detta fält är obligatoriskt", - "BASE_TYPE_STRING": "Detta fält måste vara en sträng", - "BASE_TYPE_NUMBER": "Detta fält måste vara ett nummer", - "BASE_TYPE_BIGINT": "Detta fält måste vara av typen bigint", - "BASE_TYPE_BOOLEAN": "Detta fält måste vara booleskt", - "BASE_TYPE_CHOICES": "Detta fält måste vara av typen av ett av följande ({{types}})", - "BASE_TYPE_CLASS": "Det här fältet måste vara en instans av {{type}}", - "BASE_TYPE_OBJECT": "Detta fält måste vara ett objekt", - "BASE_TYPE_ARRAY": "Detta fält måste vara en lista", - "UNKOWN_FIELD": "Okänd nyckel: {{key}}", - "BASE_TYPE_CONSTANT": "Det här fältet måste vara {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "E-postadressen har inte korrekt format", - "DATE_TYPE_PARSE": "Kunde inte tolka {{date}}. Bör vara ISO8601", - "BASE_TYPE_BAD_LENGTH": "Måste vara mellan {{length}} i längd" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From d6300ee11b7f6a51c7f595b1de0739e0062ecfe2 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:27 -0400 Subject: [PATCH 53/76] New translations common.json (Turkish) --- api/locales/tr/common.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api/locales/tr/common.json b/api/locales/tr/common.json index 8d8dafe0..1f99c1d5 100644 --- a/api/locales/tr/common.json +++ b/api/locales/tr/common.json @@ -3,12 +3,12 @@ "BASE_TYPE_REQUIRED": "Bu alan gereklidir", "BASE_TYPE_STRING": "Bu alan bir metin (string) olmalı", "BASE_TYPE_NUMBER": "Bu alan bir sayı olmalı", - "BASE_TYPE_BIGINT": "Bu alan büyük integer (bkz. bigint) değeri olmalıdır", - "BASE_TYPE_BOOLEAN": "Bu alan mantıksal değer (boolean) olmalıdır", - "BASE_TYPE_CHOICES": "Bu alan ({{types}}) lardan biri olmak zorunda", + "BASE_TYPE_BIGINT": "Bu alan uzun tamsayı değeri olmalıdır", + "BASE_TYPE_BOOLEAN": "Bu alan doğru/yanlış olmalıdır", + "BASE_TYPE_CHOICES": "Bu alan ({{types}}) tiplerinden biri olmalı", "BASE_TYPE_CLASS": "Bu alan {{type}} türünden olmalı", - "BASE_TYPE_OBJECT": "Bu alan bir obje olmalı", - "BASE_TYPE_ARRAY": "Bu alan bir dizi (array) olmalı", + "BASE_TYPE_OBJECT": "Bu alan bir nesne olmalı", + "BASE_TYPE_ARRAY": "Bu alan bir dizi olmalı", "UNKOWN_FIELD": "Bilinmeyen anahtar: {{key}}", "BASE_TYPE_CONSTANT": "Bu alan {{value}} olmalı", "EMAIL_TYPE_INVALID_EMAIL": "Geçerli bir e-posta adresi değil", From 5e05cb77ef5293af7c73c4ba8548773f2680e551 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:28 -0400 Subject: [PATCH 54/76] New translations common.json (Ukrainian) --- api/locales/uk/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/uk/common.json b/api/locales/uk/common.json index 5871e20b..8bb9c042 100644 --- a/api/locales/uk/common.json +++ b/api/locales/uk/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Це поле обов'язкове для заповнення", - "BASE_TYPE_STRING": "Це поле має бути рядком", - "BASE_TYPE_NUMBER": "Це поле має бути числом", - "BASE_TYPE_BIGINT": "Це поле має бути великим", - "BASE_TYPE_BOOLEAN": "Це поле має бути логічним", - "BASE_TYPE_CHOICES": "Це поле має бути одним з ({{types}})", - "BASE_TYPE_CLASS": "Це поле повинно бути екземпляром {{type}}", - "BASE_TYPE_OBJECT": "Це поле має бути об'єктом", - "BASE_TYPE_ARRAY": "Це поле має бути масивом", - "UNKOWN_FIELD": "Невідомий ключ: {{key}}", - "BASE_TYPE_CONSTANT": "Це поле має бути {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Неправильно сформована електронна адреса", - "DATE_TYPE_PARSE": "Не вдається розібрати {{date}}. має бути ISO8601", - "BASE_TYPE_BAD_LENGTH": "Повинно бути між {{length}} в довжині" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From d081002bb0a8247fef28bad7e143df4519814d4a Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:30 -0400 Subject: [PATCH 55/76] New translations common.json (Vietnamese) --- api/locales/vi/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/vi/common.json b/api/locales/vi/common.json index d968f617..8bb9c042 100644 --- a/api/locales/vi/common.json +++ b/api/locales/vi/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Mục này là bắt buộc", - "BASE_TYPE_STRING": "Trường này phải là một chuỗi", - "BASE_TYPE_NUMBER": "Mục này phải là một số", - "BASE_TYPE_BIGINT": "Trường này phải là một chuỗi", - "BASE_TYPE_BOOLEAN": "Mục này phải chọn đúng hoặc sai", - "BASE_TYPE_CHOICES": "Mục này phải là một trong ({{types}})", - "BASE_TYPE_CLASS": "Mục này phải là một ví dụ của {{type}}", - "BASE_TYPE_OBJECT": "Mục này phải là một đối tượng", - "BASE_TYPE_ARRAY": "Mục này phải là một danh sách", - "UNKOWN_FIELD": "Khóa không xác định: {{key}}", - "BASE_TYPE_CONSTANT": "Mục này phải là {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Không phải là một địa chỉ email hợp lệ", - "DATE_TYPE_PARSE": "Không thể phân tích cú pháp {{date}}. Phải là ISO8601", - "BASE_TYPE_BAD_LENGTH": "Phải có độ dài từ {{length}}" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From dd2fbad2dcedd2891a40f4a049d63ef2210ce2c4 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:45 -0400 Subject: [PATCH 56/76] New translations common.json (Serbo-Croatian) --- api/locales/sh/common.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/locales/sh/common.json b/api/locales/sh/common.json index 4afc5794..8bb9c042 100644 --- a/api/locales/sh/common.json +++ b/api/locales/sh/common.json @@ -1,18 +1,18 @@ { "field": { - "BASE_TYPE_REQUIRED": "Ovo polje je obavezno", - "BASE_TYPE_STRING": "Ovo polje mora biti niz", - "BASE_TYPE_NUMBER": "Ovo polje mora biti broj", - "BASE_TYPE_BIGINT": "Ovo polje mora biti bigint", - "BASE_TYPE_BOOLEAN": "Ovo polje mora biti boolean", - "BASE_TYPE_CHOICES": "Ovo polje mora biti jedno od ({{types}})", - "BASE_TYPE_CLASS": "Ovo polje mora biti primjer od {{type}}", - "BASE_TYPE_OBJECT": "Ovo polje mora biti objekt", - "BASE_TYPE_ARRAY": "Ovo polje mora biti niz", - "UNKOWN_FIELD": "Nepoznati ključ: {{key}}", - "BASE_TYPE_CONSTANT": "Ovo polje mora biti {{value}}", - "EMAIL_TYPE_INVALID_EMAIL": "Nije dobro oblikovana Email adresa", - "DATE_TYPE_PARSE": "Nije moguće raščlaniti {{date}}. Treba biti ISO8601", - "BASE_TYPE_BAD_LENGTH": "Mora biti između {{length}} u duljini" + "BASE_TYPE_REQUIRED": "This field is required", + "BASE_TYPE_STRING": "This field must be a string", + "BASE_TYPE_NUMBER": "This field must be a number", + "BASE_TYPE_BIGINT": "This field must be a bigint", + "BASE_TYPE_BOOLEAN": "This field must be a boolean", + "BASE_TYPE_CHOICES": "This field must be one of ({{types}})", + "BASE_TYPE_CLASS": "This field must be an instance of {{type}}", + "BASE_TYPE_OBJECT": "This field must be an object", + "BASE_TYPE_ARRAY": "This field must be an array", + "UNKOWN_FIELD": "Unknown key: {{key}}", + "BASE_TYPE_CONSTANT": "This field must be {{value}}", + "EMAIL_TYPE_INVALID_EMAIL": "Not a well-formed email address", + "DATE_TYPE_PARSE": "Could not parse {{date}}. Should be ISO8601", + "BASE_TYPE_BAD_LENGTH": "Must be between {{length}} in length" } } From 8d998fc07e035ff91e6a9515b15381a8b3942ce5 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 24 Oct 2021 12:42:46 -0400 Subject: [PATCH 57/76] New translations auth.json (Serbo-Croatian) --- api/locales/sh/auth.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/api/locales/sh/auth.json b/api/locales/sh/auth.json index 0f2c8456..e19547a0 100644 --- a/api/locales/sh/auth.json +++ b/api/locales/sh/auth.json @@ -1,16 +1,16 @@ { "login": { - "INVALID_LOGIN": "Email ili broj mobitela nije pronađen", - "INVALID_PASSWORD": "Pogrešna lozinka", + "INVALID_LOGIN": "E-Mail or Phone not found", + "INVALID_PASSWORD": "Invalid Password", "ACCOUNT_DISABLED": "This account is disabled" }, "register": { - "REGISTRATION_DISABLED": "Registracija novog korisnika je onemogućena", - "INVITE_ONLY": "Morate biti pozvani da se registrirate", - "EMAIL_INVALID": "Nevažeći email", - "EMAIL_ALREADY_REGISTERED": "Email je već registriran", - "DATE_OF_BIRTH_UNDERAGE": "Morate imati {{years}} godina ili više", - "CONSENT_REQUIRED": "Morate se složiti s uvjetima pružanja usluge i pravila o privatnosti.", - "USERNAME_TOO_MANY_USERS": "Previše korisnika ima ovo korisničko ime, molimo vas da pokušate sa drugim" + "REGISTRATION_DISABLED": "New user registration is disabled", + "INVITE_ONLY": "You must be invited to register", + "EMAIL_INVALID": "Invalid Email", + "EMAIL_ALREADY_REGISTERED": "Email is already registered", + "DATE_OF_BIRTH_UNDERAGE": "You need to be {{years}} years or older", + "CONSENT_REQUIRED": "You must agree to the Terms of Service and Privacy Policy.", + "USERNAME_TOO_MANY_USERS": "Too many users have this username, please try another" } } From b7d2467ca2ae6967858c2ab8933526ba4b970f97 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Wed, 10 Nov 2021 19:35:28 +0300 Subject: [PATCH 58/76] Added phase numbers to build --- bundle/scripts/build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js index ad00d47f..affd7892 100644 --- a/bundle/scripts/build.js +++ b/bundle/scripts/build.js @@ -38,8 +38,8 @@ dirs.forEach((a) => { ); }); -console.log("Copying src files done"); -console.log("Compiling src files ..."); +console.log("[1/2] Copying src files done"); +console.log("[2/2] Compiling src files ..."); console.log( execSync( From c33672058d8e41dd7d864c0f5fc8d3a81b82a65f Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Wed, 10 Nov 2021 19:44:11 +0300 Subject: [PATCH 59/76] API versions 6 & 7 with minor logging additions --- api/src/Server.ts | 2 ++ bundle/src/start.ts | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/src/Server.ts b/api/src/Server.ts index a6887fd4..c16bac5c 100644 --- a/api/src/Server.ts +++ b/api/src/Server.ts @@ -85,6 +85,8 @@ export class FosscordServer extends Server { }); this.app = app; + app.use("/api/v6", api); + app.use("/api/v7", api); app.use("/api/v8", api); app.use("/api/v9", api); app.use("/api", api); // allow unversioned requests diff --git a/bundle/src/start.ts b/bundle/src/start.ts index 4445fde6..f683d3e3 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -38,11 +38,12 @@ if (cluster.isMaster) { })` )} -Current commit: ${ +Commit Hash: ${ commit !== null ? `${cyan(commit)} (${yellow(commit.slice(0, 7))})` : "Unknown (Git cannot be found)" } +Cores: ${cyan(cores)} `) ); @@ -65,7 +66,7 @@ Current commit: ${ let delay = process.env.DATABASE?.includes("://") ? 0 : i * 1000; setTimeout(() => { cluster.fork(); - console.log(`[Process] worker ${i} started.`); + console.log(`[Process] worker ${cyan(i)} started.`); }, delay); } From e83b50da8ab3c98a654e2e404d3208045266a2b8 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 11 Nov 2021 11:29:08 +0300 Subject: [PATCH 60/76] Put autoregister scripts on a seperate asset file --- api/assets/autoRegister.js | 57 ++++++++++++++++++++++++++++++++++++ api/client_test/index.html | 59 +------------------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 api/assets/autoRegister.js diff --git a/api/assets/autoRegister.js b/api/assets/autoRegister.js new file mode 100644 index 00000000..29f93370 --- /dev/null +++ b/api/assets/autoRegister.js @@ -0,0 +1,57 @@ + // Auto register guest account: + const prefix = [ + "mysterious", + "adventurous", + "courageous", + "precious", + "cynical", + "despicable", + "suspicious", + "gorgeous", + "lovely", + "stunning", + "based", + "keyed", + "ratioed", + "twink", + "phoned" + ]; + const suffix = [ + "Anonymous", + "Lurker", + "User", + "Enjoyer", + "Hunk", + "Top", + "Bottom", + "Sub", + "Coolstar", + "Wrestling", + "TylerTheCreator", + "Ad" + ]; + + Array.prototype.random = function () { + return this[Math.floor(Math.random() * this.length)]; + }; + + function _generateName() { + return `${prefix.random()}${suffix.random()}`; + } + + const token = JSON.parse(localStorage.getItem("token")); + if (!token && location.pathname !== "/login" && location.pathname !== "/register") { + fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, { + method: "POST", + headers: { "content-type": "application/json" }, + body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)} + }) + .then((x) => x.json()) + .then((x) => { + localStorage.setItem("token", `"${x.token}"`); + if (!window.localStorage) { + // client already loaded -> need to reload to apply the newly registered user token + location.reload(); + } + }); + } diff --git a/api/client_test/index.html b/api/client_test/index.html index a68b191a..7e40d573 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -47,64 +47,6 @@ `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` ); - // Auto register guest account: - const prefix = [ - "mysterious", - "adventurous", - "courageous", - "precious", - "cynical", - "despicable", - "suspicious", - "gorgeous", - "lovely", - "stunning", - "based", - "keyed", - "ratioed", - "twink", - "phoned" - ]; - const suffix = [ - "Anonymous", - "Lurker", - "User", - "Enjoyer", - "Hunk", - "Top", - "Bottom", - "Sub", - "Coolstar", - "Wrestling", - "TylerTheCreator", - "Ad" - ]; - - Array.prototype.random = function () { - return this[Math.floor(Math.random() * this.length)]; - }; - - function _generateName() { - return `${prefix.random()}${suffix.random()}`; - } - - const token = JSON.parse(localStorage.getItem("token")); - if (!token && location.pathname !== "/login" && location.pathname !== "/register") { - fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)} - }) - .then((x) => x.json()) - .then((x) => { - localStorage.setItem("token", `"${x.token}"`); - if (!window.localStorage) { - // client already loaded -> need to reload to apply the newly registered user token - location.reload(); - } - }); - } - const supportedLocales = [ "bg", "cs", @@ -144,6 +86,7 @@ localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); } + From 4e795a14151437872ae0980d2fb0fb69b6a902be Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 11 Nov 2021 11:31:03 +0300 Subject: [PATCH 61/76] minor capitulation --- bundle/src/start.ts | 2 +- bundle/src/stats.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle/src/start.ts b/bundle/src/start.ts index f683d3e3..8725ba61 100644 --- a/bundle/src/start.ts +++ b/bundle/src/start.ts @@ -81,7 +81,7 @@ Cores: ${cyan(cores)} cluster.on("exit", (worker: any, code: any, signal: any) => { console.log( `[Worker] ${red( - `died with pid: ${worker.process.pid} , restarting ...` + `died with PID: ${worker.process.pid} , restarting ...` )}` ); cluster.fork(); diff --git a/bundle/src/stats.ts b/bundle/src/stats.ts index 9bd9131e..8d87f9d9 100644 --- a/bundle/src/stats.ts +++ b/bundle/src/stats.ts @@ -6,7 +6,7 @@ export function initStats() { console.log(`[Path] running in ${__dirname}`); console.log(`[CPU] ${osu.cpu.model()} Cores x${osu.cpu.count()}`); console.log(`[System] ${os.platform()} ${os.arch()}`); - console.log(`[Process] running with pid: ${process.pid}`); + console.log(`[Process] running with PID: ${process.pid}`); if (process.getuid && process.getuid() === 0) { console.warn( red( From 22084bae4e5c35412342e5e6015611faeb6fddd3 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 11 Nov 2021 11:49:56 +0300 Subject: [PATCH 62/76] move checLocale and other js tp checkLocale --- api/assets/checkLocale.js | 47 +++++++++++++++++++++++++++++++++++++ api/client_test/index.html | 48 +------------------------------------- 2 files changed, 48 insertions(+), 47 deletions(-) create mode 100644 api/assets/checkLocale.js diff --git a/api/assets/checkLocale.js b/api/assets/checkLocale.js new file mode 100644 index 00000000..016d66c8 --- /dev/null +++ b/api/assets/checkLocale.js @@ -0,0 +1,47 @@ + const localStorage = window.localStorage; + // TODO: remote auth + // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, ""); + localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT); + localStorage.setItem( + "DeveloperOptionsStore", + `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` + ); + + const supportedLocales = [ + "bg", + "cs", + "da", + "de", + "el", + "en-GB", + "es-ES", + "fi", + "fr", + "hi", + "hr", + "hu", + "it", + "ja", + "ko", + "lt", + "nl", + "no", + "pl", + "pt-BR", + "ro", + "ru", + "sv-SE", + "th", + "tr", + "uk", + "vi", + "zh-CN", + "zh-TW" + ]; + + const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); + if (settings && !supportedLocales.includes(settings.locale)) { + // fix client locale wrong and client not loading at all + settings.locale = "en-US"; + localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); + } \ No newline at end of file diff --git a/api/client_test/index.html b/api/client_test/index.html index 7e40d573..92499034 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -38,55 +38,9 @@ ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0" }; GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST; - const localStorage = window.localStorage; - // TODO: remote auth - // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, ""); - localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT); - localStorage.setItem( - "DeveloperOptionsStore", - `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` - ); - - const supportedLocales = [ - "bg", - "cs", - "da", - "de", - "el", - "en-GB", - "es-ES", - "fi", - "fr", - "hi", - "hr", - "hu", - "it", - "ja", - "ko", - "lt", - "nl", - "no", - "pl", - "pt-BR", - "ro", - "ru", - "sv-SE", - "th", - "tr", - "uk", - "vi", - "zh-CN", - "zh-TW" - ]; - - const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); - if (settings && !supportedLocales.includes(settings.locale)) { - // fix client locale wrong and client not loading at all - settings.locale = "en-US"; - localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); - } + From d57cd783ac664c95c5d915d9399033c671c1bfbb Mon Sep 17 00:00:00 2001 From: The Arcane Brony Date: Wed, 20 Oct 2021 17:54:54 +0200 Subject: [PATCH 63/76] Add plugin & css support, add styling to differentiate from discord.com --- .gitignore | 2 + api/assets/autoRegister.js | 57 --------------- api/assets/preload-plugins/autoRegister.js | 62 ++++++++++++++++ api/client_test/index.html | 27 ++++++- bundle/scripts/build.js | 84 +++++++++++----------- 5 files changed, 132 insertions(+), 100 deletions(-) delete mode 100644 api/assets/autoRegister.js create mode 100644 api/assets/preload-plugins/autoRegister.js diff --git a/.gitignore b/.gitignore index 6e6de8d2..ca5886e1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ tsconfig.tsbuildinfo files/ .env config.json + +.vscode/settings.json diff --git a/api/assets/autoRegister.js b/api/assets/autoRegister.js deleted file mode 100644 index 29f93370..00000000 --- a/api/assets/autoRegister.js +++ /dev/null @@ -1,57 +0,0 @@ - // Auto register guest account: - const prefix = [ - "mysterious", - "adventurous", - "courageous", - "precious", - "cynical", - "despicable", - "suspicious", - "gorgeous", - "lovely", - "stunning", - "based", - "keyed", - "ratioed", - "twink", - "phoned" - ]; - const suffix = [ - "Anonymous", - "Lurker", - "User", - "Enjoyer", - "Hunk", - "Top", - "Bottom", - "Sub", - "Coolstar", - "Wrestling", - "TylerTheCreator", - "Ad" - ]; - - Array.prototype.random = function () { - return this[Math.floor(Math.random() * this.length)]; - }; - - function _generateName() { - return `${prefix.random()}${suffix.random()}`; - } - - const token = JSON.parse(localStorage.getItem("token")); - if (!token && location.pathname !== "/login" && location.pathname !== "/register") { - fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)} - }) - .then((x) => x.json()) - .then((x) => { - localStorage.setItem("token", `"${x.token}"`); - if (!window.localStorage) { - // client already loaded -> need to reload to apply the newly registered user token - location.reload(); - } - }); - } diff --git a/api/assets/preload-plugins/autoRegister.js b/api/assets/preload-plugins/autoRegister.js new file mode 100644 index 00000000..bb0b903d --- /dev/null +++ b/api/assets/preload-plugins/autoRegister.js @@ -0,0 +1,62 @@ +// Auto register guest account: +const prefix = [ + "mysterious", + "adventurous", + "courageous", + "precious", + "cynical", + "flamer ", + "despicable", + "suspicious", + "gorgeous", + "impeccable", + "lovely", + "stunning", + "keyed", + "phoned", + "glorious", + "amazing", + "strange", + "arcane" +]; +const suffix = [ + "Anonymous", + "Boy", + "Lurker", + "Keyhitter", + "User", + "Enjoyer", + "Hunk", + "Coolstar", + "Wrestling", + "TylerTheCreator", + "Ad", + "Gamer", + "Games", + "Programmer" +]; + +Array.prototype.random = function () { + return this[Math.floor(Math.random() * this.length)]; +}; + +function _generateName() { + return `${prefix.random()}${suffix.random()}`; +} + +var token = JSON.parse(localStorage.getItem("token")); +if (!token && location.pathname !== "/login" && location.pathname !== "/register") { + fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, { + method: "POST", + headers: { "content-type": "application/json" }, + body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)} + }) + .then((x) => x.json()) + .then((x) => { + localStorage.setItem("token", `"${x.token}"`); + if (!window.localStorage) { + // client already loaded -> need to reload to apply the newly registered user token + location.reload(); + } + }); +} diff --git a/api/client_test/index.html b/api/client_test/index.html index 92499034..2ff0b469 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -4,6 +4,10 @@ Discord Test Client + + + + @@ -38,12 +42,33 @@ ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0" }; GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST; + const localStorage = window.localStorage; + // TODO: remote auth + // window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, ""); + localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT); + localStorage.setItem( + "DeveloperOptionsStore", + `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` + ); + + + const token = JSON.parse(localStorage.getItem("token")); + if(token) { + document.querySelector("#logincss").remove(); + } + + const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); + if (settings && settings.locale.length <= 2) { + // fix client locale wrong and client not loading at all + settings.locale = "en-US"; + localStorage.setItem("UserSettingsStore", JSON.stringify(settings)); + } - + diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js index affd7892..c00c2eaa 100644 --- a/bundle/scripts/build.js +++ b/bundle/scripts/build.js @@ -9,57 +9,57 @@ const dirs = ["api", "util", "cdn", "gateway", "bundle"]; const verbose = argv.includes("verbose") || argv.includes("v"); if (argv.includes("clean")) { - dirs.forEach((a) => { - var d = "../" + a + "/dist"; - if (fse.existsSync(d)) { - fse.rmSync(d, { recursive: true }); - if (verbose) console.log(`Deleted ${d}!`); - } - }); + dirs.forEach((a) => { + var d = "../" + a + "/dist"; + if (fse.existsSync(d)) { + fse.rmSync(d, { recursive: true }); + if (verbose) console.log(`Deleted ${d}!`); + } + }); } fse.copySync( - path.join(__dirname, "..", "..", "api", "assets"), - path.join(__dirname, "..", "dist", "api", "assets") + path.join(__dirname, "..", "..", "api", "assets"), + path.join(__dirname, "..", "dist", "api", "assets") ); fse.copySync( - path.join(__dirname, "..", "..", "api", "client_test"), - path.join(__dirname, "..", "dist", "api", "client_test") + path.join(__dirname, "..", "..", "api", "client_test"), + path.join(__dirname, "..", "dist", "api", "client_test") ); fse.copySync( - path.join(__dirname, "..", "..", "api", "locales"), - path.join(__dirname, "..", "dist", "api", "locales") + path.join(__dirname, "..", "..", "api", "locales"), + path.join(__dirname, "..", "dist", "api", "locales") ); dirs.forEach((a) => { - fse.copySync("../" + a + "/src", "dist/" + a + "/src"); - if (verbose) - console.log( - `Copied ${"../" + a + "/dist"} -> ${"dist/" + a + "/src"}!` - ); + fse.copySync("../" + a + "/src", "dist/" + a + "/src"); + if (verbose) + console.log(`Copied ${"../" + a + "/dist"} -> ${"dist/" + a + "/src"}!`); }); -console.log("[1/2] Copying src files done"); -console.log("[2/2] Compiling src files ..."); +console.log("Copying src files done"); +if (!argv.includes("copyonly")) { + console.log("Compiling src files ..."); -console.log( - execSync( - 'node "' + - path.join( - __dirname, - "..", - "node_modules", - "typescript", - "lib", - "tsc.js" - ) + - '" -p "' + - path.join(__dirname, "..") + - '"', - { - cwd: path.join(__dirname, ".."), - shell: true, - env: process.env, - encoding: "utf8", - } - ) -); + console.log( + execSync( + 'node "' + + path.join( + __dirname, + "..", + "node_modules", + "typescript", + "lib", + "tsc.js" + ) + + '" -p "' + + path.join(__dirname, "..") + + '"', + { + cwd: path.join(__dirname, ".."), + shell: true, + env: process.env, + encoding: "utf8", + } + ) + ); +} From 29411814309ea392436a9fc5239bf4c8344c8393 Mon Sep 17 00:00:00 2001 From: The Arcane Brony Date: Fri, 22 Oct 2021 09:26:01 +0200 Subject: [PATCH 64/76] Global prettierrc, format build.js --- .prettierrc | 7 ++-- bundle/scripts/build.js | 73 ++++++++++++++++------------------------- 2 files changed, 33 insertions(+), 47 deletions(-) diff --git a/.prettierrc b/.prettierrc index 8dc2e726..7d715cba 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,7 @@ { "tabWidth": 4, - "useTabs": true -} + "useTabs": true, + "printWidth": 140, + "trailingComma": "none", + "useTabs": true +} \ No newline at end of file diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js index c00c2eaa..549e340f 100644 --- a/bundle/scripts/build.js +++ b/bundle/scripts/build.js @@ -9,57 +9,40 @@ const dirs = ["api", "util", "cdn", "gateway", "bundle"]; const verbose = argv.includes("verbose") || argv.includes("v"); if (argv.includes("clean")) { - dirs.forEach((a) => { - var d = "../" + a + "/dist"; - if (fse.existsSync(d)) { - fse.rmSync(d, { recursive: true }); - if (verbose) console.log(`Deleted ${d}!`); - } - }); + dirs.forEach((a) => { + var d = "../" + a + "/dist"; + if (fse.existsSync(d)) { + fse.rmSync(d, { recursive: true }); + if (verbose) console.log(`Deleted ${d}!`); + } + }); } -fse.copySync( - path.join(__dirname, "..", "..", "api", "assets"), - path.join(__dirname, "..", "dist", "api", "assets") -); -fse.copySync( - path.join(__dirname, "..", "..", "api", "client_test"), - path.join(__dirname, "..", "dist", "api", "client_test") -); -fse.copySync( - path.join(__dirname, "..", "..", "api", "locales"), - path.join(__dirname, "..", "dist", "api", "locales") -); +fse.copySync(path.join(__dirname, "..", "..", "api", "assets"), path.join(__dirname, "..", "dist", "api", "assets")); +fse.copySync(path.join(__dirname, "..", "..", "api", "client_test"), path.join(__dirname, "..", "dist", "api", "client_test")); +fse.copySync(path.join(__dirname, "..", "..", "api", "locales"), path.join(__dirname, "..", "dist", "api", "locales")); dirs.forEach((a) => { - fse.copySync("../" + a + "/src", "dist/" + a + "/src"); - if (verbose) - console.log(`Copied ${"../" + a + "/dist"} -> ${"dist/" + a + "/src"}!`); + fse.copySync("../" + a + "/src", "dist/" + a + "/src"); + if (verbose) console.log(`Copied ${"../" + a + "/dist"} -> ${"dist/" + a + "/src"}!`); }); console.log("Copying src files done"); if (!argv.includes("copyonly")) { - console.log("Compiling src files ..."); + console.log("Compiling src files ..."); - console.log( - execSync( - 'node "' + - path.join( - __dirname, - "..", - "node_modules", - "typescript", - "lib", - "tsc.js" - ) + - '" -p "' + - path.join(__dirname, "..") + - '"', - { - cwd: path.join(__dirname, ".."), - shell: true, - env: process.env, - encoding: "utf8", - } - ) - ); + console.log( + execSync( + 'node "' + + path.join(__dirname, "..", "node_modules", "typescript", "lib", "tsc.js") + + '" -p "' + + path.join(__dirname, "..") + + '"', + { + cwd: path.join(__dirname, ".."), + shell: true, + env: process.env, + encoding: "utf8" + } + ) + ); } From ac8588f20f6f4111e0bc9c85bb7769abf1200801 Mon Sep 17 00:00:00 2001 From: The Arcane Brony Date: Fri, 22 Oct 2021 09:56:36 +0200 Subject: [PATCH 65/76] Attempt to fix auto register --- api/client_test/index.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/api/client_test/index.html b/api/client_test/index.html index 2ff0b469..b19d5f0d 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -51,11 +51,12 @@ `{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}` ); - - const token = JSON.parse(localStorage.getItem("token")); - if(token) { - document.querySelector("#logincss").remove(); - } + setInterval(() => { + var token = JSON.parse(localStorage.getItem("token")); + if (token) { + document.querySelector("#logincss").remove(); + } + }, 1000); const settings = JSON.parse(localStorage.getItem("UserSettingsStore")); if (settings && settings.locale.length <= 2) { From 062fe0769578e41895024534d8b2eae2bbbd9959 Mon Sep 17 00:00:00 2001 From: The Arcane Brony Date: Thu, 11 Nov 2021 22:14:33 +0100 Subject: [PATCH 66/76] Fix autoregister, add inline plugins --- .vscode/settings.json | 4 ++++ api/assets/dff87c953f43b561d71fbcfe8a93a79a.png | 0 2 files changed, 4 insertions(+) create mode 100644 .vscode/settings.json create mode 100644 api/assets/dff87c953f43b561d71fbcfe8a93a79a.png diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..46e4e52f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "awooga.originalColorCustomizations": {}, + "workbench.colorCustomizations": {} +} \ No newline at end of file diff --git a/api/assets/dff87c953f43b561d71fbcfe8a93a79a.png b/api/assets/dff87c953f43b561d71fbcfe8a93a79a.png new file mode 100644 index 00000000..e69de29b From ce1e10620c7f0ffbfdd56999a2b44dc8854bc7bd Mon Sep 17 00:00:00 2001 From: The Arcane Brony Date: Thu, 11 Nov 2021 22:17:21 +0100 Subject: [PATCH 67/76] Inline plugin support --- api/client_test/index.html | 6 +++--- api/package-lock.json | Bin 658099 -> 658149 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/client_test/index.html b/api/client_test/index.html index b19d5f0d..0b3a775a 100644 --- a/api/client_test/index.html +++ b/api/client_test/index.html @@ -4,9 +4,9 @@ Discord Test Client - - - + + + diff --git a/api/package-lock.json b/api/package-lock.json index e8ebd5bfc752b18cd0871537b461a5e4243dbf6e..a4ad6b2b9ebfe710fb022d77451a433fc2413790 100644 GIT binary patch delta 102 zcmdlyRpaSYjSY>Qg2jb7nI);lN>&O=ai)3(dPdVPxUlCoKjUnF#>oi8OhC*G#4JF} h3dC&NpK-F^u)?Bm!4fu+_ERqGK+LiIlndv}qX2}0C8_`b delta 64 zcmaDlRb%s1jSY>QlbKlrn^$wTujXU~VkRJF24WT Date: Thu, 11 Nov 2021 22:32:46 +0100 Subject: [PATCH 68/76] Fix dependencies --- bundle/package-lock.json | Bin 480093 -> 588582 bytes bundle/package.json | 1 - 2 files changed, 1 deletion(-) diff --git a/bundle/package-lock.json b/bundle/package-lock.json index 2a743b787413c35490bc6ba979e491eb969c1648..6775470da5b2a079a3a6a42b4f9b8f8671a299cc 100644 GIT binary patch delta 22254 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 delta 13902 zcmai5cX(CBw*U4yyQTMD3F*B+s38#$LJI-uH7XD~K?DI60!j-lvPl-5ponyWAV;ZD zE?}VqMJW;z#fG%NMMdiS%}mZoAGYbXyLu@j&!*jEu1QOTYNK3-T`cl0uGxTsQjAh zUOLR=Y$+LFs&=3+15E)`UTO-md_BUn&5e2=F?m})nQA&`#~K^q{GYm0)soQi>?mQ3<6eT}htU6gQ*X z)lq-~z|Gj}e1mFrr40k>^iLFxj79FLHVmP3(nSfUeuMBQSyP;i!7k25vR4z^X+J7+ zS7f8JcM1dQZ}?_=8*6-m8G=AcPEvvmzifA-$Tym82N=bX5mb{6#wJvEIJW$Ut&kslpw!SWe}W1{iBmEm+dUh$-ySixaHX`J#N zT_{jGQ(nAsLV&r33kcP6CPA@C&nyxahZ-}|RBDo_#2cY4>@8m;EAs@HQI;A{2bw55 zjoU4`3IaHLJ6fIPObOz7iHeJHt939(3bhKuDo*#Jin+oRFG zkaW(RI#iXNlylEOlt#d(cJ-+P0EN1PmA;BM%{wN8D{lwEKPPrN+|C%%pM&@3B#ew; zovL$$>;c5}b#AB{6ijTynIbquEETs`B53AV#f28V zq%0BKLTyHFL@4E^D{TxXAD#SPl^6w$CXRx)?ud6Z#!arXG}v9;z!{SZ6lGaQHFL(eGr;*Svr&gH) zh?!%o{uDP>ne_~xGr>O+bvB~DS| z=|Yz3Nl#V);@2s#RP!PwhAQn;cgz0Qltw1npRJ9h=?Q8G!;;Lln^W8y%53)3hc4+- zf}y?RZRD2d40$qT&Qn55G9@3Qc$YU7EL41G-EIWvl^I}}<8GZI#nYMgsA0d(R2GOs zLzgKjlh~liocPw z<~~&q(7h?oQH^Q9Z(fPw#Mo&gSOt1l8si{&8o3+oIYuMn-C>+XJb2Lu3j~LAIk@q7 zXCr!Zqf#dslXdALB}t%q>Iy8kJ_x22RZ25s{2G^%RjNBc z(w3!4uE1Dx#>H5-E!d`TCnMlt0Ihq6k!6~Le0v$j6bQdrs4m9?JfFCyx>4C15QeLK zT#53$K$y7&Rq{iw);`A4PkbnGmFz~f;gTXXqqA9R05hu-)3t~3#ol_ttpvR~eUD|N zyp8^rFw$2mhuGfNv}%JANu@q|Z}AjzPgm&iU9=oeu9zLE*jMjQ1^!rbSr4b;z#aYd zKFm*COJCP?nqG$Wx;Kro@9E+67n8&$Xj1>tSmDl~1lQvK`fK!Typz;k#>7C8uS_gGs-m^fGowd6Ndp3r$K2k!BU0iXF;Q2hn!yniWm4A@RX zrC2(FPUq=ERH7Bf1>M!+K-uR?D@JY@ReT9m);32m8uAC{fG=@uQVTxkJhN`LyRh@&V_3F<(4WID;4*7_K+GjX z*4U!Hi`c!~3Z8W3lGq(jF0J7aK~69;!&#bv;ArA1g+pU7Vf&j@DM$SyeAliQtok7_zND^Ft;5L#c zRs3pY<;ZWSOGtKMRCrC9B0#=qgDX?T*H)05*Oe%?@z10|4mXuSbwo3P(k2dV&t%#E zw)OZ^O?9HGcDSGAO;&UZQiPL4^Y1EaY)T%-7>Kc;TDiJXU?KGFr>NX_+tFi1{p+8^ zkz@OizpgfCRo9)d?MUDE(Cz7_u6E>@SWPu-PvNxQ-|R|7@1xsc8LvU@)5xmQU=)y4 zs&Y`bH>hg7mdnm+BvXG5E&Tx|{PoJ zY5{u+qgUM36Joc*LrtLhK>#kcH~UhVr}{B}wG8be^)yq+SaO&JO5@QdUnbgsyah#fqcV*Tu%*;aV`QoG7)YgOfCO8k?sfYs3ml zF_ineDTuP>YCaZ+iPB0*2oQG@_5=RTLJzr}RF(1))r;gCp?O%2B&mrKjs679(5?=e zFD*$?+f%1hwS!ojF-uFLq$a8z<)*1oLVu1;)V>1O-%Zrs^l4KyO|`ePdo$jiCLS>R zP}3OMgOWF?G9|ZAed*Cm3=`08dC{3>;KcgmM6+i#*l?ok7AlAHr$1W=QjLi-`$
Jwzkpjg`(~b95V_o~E>XzGOX+$sCEf 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 diff --git a/bundle/package.json b/bundle/package.json index f55599bf..8a49a7ac 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -65,7 +65,6 @@ "assert": "^1.5.0", "async-exit-hook": "^2.0.1", "bcrypt": "^5.0.1", - "better-sqlite3": "^7.4.3", "body-parser": "^1.19.0", "btoa": "^1.2.1", "cheerio": "^1.0.0-rc.10", From 74d6290f3350fc98cbee69262f5aeaa95df93e2c Mon Sep 17 00:00:00 2001 From: The Arcane Brony Date: Sun, 14 Nov 2021 16:30:12 +0100 Subject: [PATCH 69/76] Add user.css --- api/assets/user.css | 1 + 1 file changed, 1 insertion(+) create mode 100644 api/assets/user.css diff --git a/api/assets/user.css b/api/assets/user.css new file mode 100644 index 00000000..a7e5c4f3 --- /dev/null +++ b/api/assets/user.css @@ -0,0 +1 @@ +/* Your custom CSS goes here, enjoy! */ \ No newline at end of file From 54ebf97e7822b479b8953dddc73fe85e9a71ec39 Mon Sep 17 00:00:00 2001 From: uurgothat Date: Wed, 17 Nov 2021 22:28:22 +0300 Subject: [PATCH 70/76] Add instance route --- api/src/middlewares/Authentication.ts | 1 + api/src/routes/policies/instance/domains.ts | 16 ++++++++++++++++ api/src/routes/policies/instance/limits.ts | 11 +++++++++++ api/src/routes/policies/instance/meta.ts | 12 ++++++++++++ util/src/entities/Config.ts | 6 ++++++ 5 files changed, 46 insertions(+) create mode 100644 api/src/routes/policies/instance/domains.ts create mode 100644 api/src/routes/policies/instance/limits.ts create mode 100644 api/src/routes/policies/instance/meta.ts diff --git a/api/src/middlewares/Authentication.ts b/api/src/middlewares/Authentication.ts index 59a181e6..e6df6eeb 100644 --- a/api/src/middlewares/Authentication.ts +++ b/api/src/middlewares/Authentication.ts @@ -11,6 +11,7 @@ export const NO_AUTHORIZATION_ROUTES = [ "/experiments", "/-/readyz", "/-/healthz", + "/policies/instance/", /\/guilds\/\d+\/widget\.(json|png)/ ]; diff --git a/api/src/routes/policies/instance/domains.ts b/api/src/routes/policies/instance/domains.ts new file mode 100644 index 00000000..b68763cc --- /dev/null +++ b/api/src/routes/policies/instance/domains.ts @@ -0,0 +1,16 @@ +import { Router, Request, Response } from "express"; +import { route } from "@fosscord/api"; +import { Config } from "@fosscord/util"; +import { config } from "dotenv" +const router = Router(); +const { cdn } = Config.get(); + +const IdentityForm = { + cdn: cdn.endpointPublic || process.env.CDN || "http://localhost:3001", +} + +router.get("/",route({}), async (req: Request, res: Response) => { + res.json(IdentityForm) +}); + +export default router; diff --git a/api/src/routes/policies/instance/limits.ts b/api/src/routes/policies/instance/limits.ts new file mode 100644 index 00000000..912908b7 --- /dev/null +++ b/api/src/routes/policies/instance/limits.ts @@ -0,0 +1,11 @@ +import { Router, Request, Response } from "express"; +import { route } from "@fosscord/api"; +import { Config } from "@fosscord/util"; +const router = Router(); +const { limits } = Config.get(); + +router.get("/",route({}), async (req: Request, res: Response) => { + res.json(limits) +}); + +export default router; diff --git a/api/src/routes/policies/instance/meta.ts b/api/src/routes/policies/instance/meta.ts new file mode 100644 index 00000000..7a998487 --- /dev/null +++ b/api/src/routes/policies/instance/meta.ts @@ -0,0 +1,12 @@ +import { Router, Request, Response } from "express"; +import { route } from "@fosscord/api"; +import { Config } from "@fosscord/util"; + +const router = Router(); +const { general } = Config.get(); + +router.get("/",route({}), async (req: Request, res: Response) => { + res.json(general) +}); + +export default router; diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index cac5d4da..fd83bc5a 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -49,6 +49,9 @@ export interface ConfigValue { endpointPrivate: string | null; }; general: { + instanceName: string; + instanceDescription: string | null; + frontPage: string | null; instanceId: string; }; limits: { @@ -180,7 +183,10 @@ export const DefaultConfigOptions: ConfigValue = { endpointPublic: null, }, general: { + instanceName: "Fosscord Instance", + instanceDescription: "This is a Fosscord instance made in pre-relase days", instanceId: Snowflake.generate(), + frontPage: null }, limits: { user: { From 74dee34f69dfe138dcde43f09f77bf0329e2b3c8 Mon Sep 17 00:00:00 2001 From: uurgothat Date: Wed, 17 Nov 2021 22:28:41 +0300 Subject: [PATCH 71/76] Minor API stuff --- api/src/routes/guilds/templates/index.ts | 5 ++--- api/src/routes/track.ts | 11 +++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 api/src/routes/track.ts diff --git a/api/src/routes/guilds/templates/index.ts b/api/src/routes/guilds/templates/index.ts index dd906198..98e42d1c 100644 --- a/api/src/routes/guilds/templates/index.ts +++ b/api/src/routes/guilds/templates/index.ts @@ -1,11 +1,10 @@ import { Request, Response, Router } from "express"; -const router: Router = Router(); import { Template, Guild, Role, Snowflake, Config, User, Member } from "@fosscord/util"; -const { enabled, allowTemplateCreation, allowDiscordTemplates, allowRaws } = Config.get().templates; import { route } from "@fosscord/api"; import { DiscordApiErrors } from "@fosscord/util"; import fetch from "node-fetch"; - +const router: Router = Router(); +const { enabled, allowTemplateCreation, allowDiscordTemplates, allowRaws } = Config.get().templates; export interface GuildTemplateCreateSchema { name: string; diff --git a/api/src/routes/track.ts b/api/src/routes/track.ts new file mode 100644 index 00000000..8556a3ad --- /dev/null +++ b/api/src/routes/track.ts @@ -0,0 +1,11 @@ +import { Router, Response, Request } from "express"; +import { route } from "@fosscord/api"; + +const router = Router(); + +router.post("/", route({}), (req: Request, res: Response) => { + // TODO: + res.sendStatus(204); +}); + +export default router; From 159c712c436a3e01166ed5912d69a17c0fee70e6 Mon Sep 17 00:00:00 2001 From: uurgothat Date: Wed, 17 Nov 2021 22:50:25 +0300 Subject: [PATCH 72/76] Add image field --- util/src/entities/Config.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index fd83bc5a..2d4ad252 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -52,6 +52,7 @@ export interface ConfigValue { instanceName: string; instanceDescription: string | null; frontPage: string | null; + image: string | null; instanceId: string; }; limits: { @@ -185,8 +186,9 @@ export const DefaultConfigOptions: ConfigValue = { general: { instanceName: "Fosscord Instance", instanceDescription: "This is a Fosscord instance made in pre-relase days", + frontPage: null, + image: null, instanceId: Snowflake.generate(), - frontPage: null }, limits: { user: { From 7681ea6d8ee7ce3af6a7287b22a60b214d9e0629 Mon Sep 17 00:00:00 2001 From: Thesourtimes Date: Thu, 18 Nov 2021 22:15:05 +0300 Subject: [PATCH 73/76] Fix the minor issues on route --- api/src/middlewares/Authentication.ts | 4 +++- api/src/routes/policies/instance/domains.ts | 14 ++++++++------ .../routes/policies/instance/{meta.ts => index.ts} | 6 +++--- api/src/routes/policies/instance/limits.ts | 4 ++-- util/src/entities/Config.ts | 2 ++ 5 files changed, 18 insertions(+), 12 deletions(-) rename api/src/routes/policies/instance/{meta.ts => index.ts} (82%) diff --git a/api/src/middlewares/Authentication.ts b/api/src/middlewares/Authentication.ts index e6df6eeb..8fbdd2b7 100644 --- a/api/src/middlewares/Authentication.ts +++ b/api/src/middlewares/Authentication.ts @@ -11,7 +11,9 @@ export const NO_AUTHORIZATION_ROUTES = [ "/experiments", "/-/readyz", "/-/healthz", - "/policies/instance/", + "/science", + "/track", + "/policies/instance", /\/guilds\/\d+\/widget\.(json|png)/ ]; diff --git a/api/src/routes/policies/instance/domains.ts b/api/src/routes/policies/instance/domains.ts index b68763cc..20cd07ba 100644 --- a/api/src/routes/policies/instance/domains.ts +++ b/api/src/routes/policies/instance/domains.ts @@ -3,14 +3,16 @@ import { route } from "@fosscord/api"; import { Config } from "@fosscord/util"; import { config } from "dotenv" const router = Router(); -const { cdn } = Config.get(); - -const IdentityForm = { - cdn: cdn.endpointPublic || process.env.CDN || "http://localhost:3001", -} router.get("/",route({}), async (req: Request, res: Response) => { - res.json(IdentityForm) + const { cdn, gateway } = Config.get(); + + const IdentityForm = { + cdn: cdn.endpointPublic || process.env.CDN || "http://localhost:3001", + gateway: gateway.endpointPublic || process.env.GATEWAY || "ws://localhost:3002" + }; + + res.json(IdentityForm); }); export default router; diff --git a/api/src/routes/policies/instance/meta.ts b/api/src/routes/policies/instance/index.ts similarity index 82% rename from api/src/routes/policies/instance/meta.ts rename to api/src/routes/policies/instance/index.ts index 7a998487..e3da014f 100644 --- a/api/src/routes/policies/instance/meta.ts +++ b/api/src/routes/policies/instance/index.ts @@ -1,12 +1,12 @@ import { Router, Request, Response } from "express"; import { route } from "@fosscord/api"; import { Config } from "@fosscord/util"; - const router = Router(); -const { general } = Config.get(); + router.get("/",route({}), async (req: Request, res: Response) => { - res.json(general) + const { general } = Config.get(); + res.json(general); }); export default router; diff --git a/api/src/routes/policies/instance/limits.ts b/api/src/routes/policies/instance/limits.ts index 912908b7..7de1476b 100644 --- a/api/src/routes/policies/instance/limits.ts +++ b/api/src/routes/policies/instance/limits.ts @@ -2,10 +2,10 @@ import { Router, Request, Response } from "express"; import { route } from "@fosscord/api"; import { Config } from "@fosscord/util"; const router = Router(); -const { limits } = Config.get(); router.get("/",route({}), async (req: Request, res: Response) => { - res.json(limits) + const { limits } = Config.get(); + res.json(limits); }); export default router; diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 2d4ad252..d277c88c 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -52,6 +52,7 @@ export interface ConfigValue { instanceName: string; instanceDescription: string | null; frontPage: string | null; + tosPage: string | null; image: string | null; instanceId: string; }; @@ -187,6 +188,7 @@ export const DefaultConfigOptions: ConfigValue = { instanceName: "Fosscord Instance", instanceDescription: "This is a Fosscord instance made in pre-relase days", frontPage: null, + tosPage: null, image: null, instanceId: Snowflake.generate(), }, From 2c93f1f121750e54f7f2c34feaed62b8491f5979 Mon Sep 17 00:00:00 2001 From: Kuna <65683493+Thesourtimes@users.noreply.github.com> Date: Sun, 21 Nov 2021 15:35:51 +0000 Subject: [PATCH 74/76] Update util/src/entities/Config.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Erkin Alp Güney --- util/src/entities/Config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index d277c88c..56f6b741 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -53,6 +53,8 @@ export interface ConfigValue { instanceDescription: string | null; frontPage: string | null; tosPage: string | null; + correspondenceEmail: string | null; + correspondenceUserID: string | null; image: string | null; instanceId: string; }; From 5d2f92427db34ef47fc5042676deab15ef596ce1 Mon Sep 17 00:00:00 2001 From: Kuna <65683493+Thesourtimes@users.noreply.github.com> Date: Sun, 21 Nov 2021 15:35:59 +0000 Subject: [PATCH 75/76] Update util/src/entities/Config.ts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Erkin Alp Güney --- util/src/entities/Config.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 56f6b741..492baa4c 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -191,6 +191,8 @@ export const DefaultConfigOptions: ConfigValue = { instanceDescription: "This is a Fosscord instance made in pre-relase days", frontPage: null, tosPage: null, + correspondenceEmail: "noreply@localhost.local", + correspondenceUserID: null, image: null, instanceId: Snowflake.generate(), }, From 49aae7b16ff6808f676e1ebbc972fb2c4940ac77 Mon Sep 17 00:00:00 2001 From: Samuel <34555296+Flam3rboy@users.noreply.github.com> Date: Sun, 21 Nov 2021 21:03:13 +0100 Subject: [PATCH 76/76] Update index.ts --- api/src/routes/guilds/templates/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/src/routes/guilds/templates/index.ts b/api/src/routes/guilds/templates/index.ts index 98e42d1c..3d922e85 100644 --- a/api/src/routes/guilds/templates/index.ts +++ b/api/src/routes/guilds/templates/index.ts @@ -4,7 +4,6 @@ import { route } from "@fosscord/api"; import { DiscordApiErrors } from "@fosscord/util"; import fetch from "node-fetch"; const router: Router = Router(); -const { enabled, allowTemplateCreation, allowDiscordTemplates, allowRaws } = Config.get().templates; export interface GuildTemplateCreateSchema { name: string; @@ -12,10 +11,11 @@ export interface GuildTemplateCreateSchema { } router.get("/:code", route({}), async (req: Request, res: Response) => { + const { allowDiscordTemplates, allowRaws, enabled } = Config.get().templates; if (!enabled) res.json({ code: 403, message: "Template creation & usage is disabled on this instance." }).sendStatus(403); const { code } = req.params; - + if (code.startsWith("discord:")) { if (!allowDiscordTemplates) return res.json({ code: 403, message: "Discord templates cannot be used on this instance." }).sendStatus(403); const discordTemplateID = code.split("discord:", 2)[1]; @@ -38,6 +38,7 @@ router.get("/:code", route({}), async (req: Request, res: Response) => { }); router.post("/:code", route({ body: "GuildTemplateCreateSchema" }), async (req: Request, res: Response) => { + const { enabled, allowTemplateCreation, allowDiscordTemplates, allowRaws } = Config.get().templates; if (!enabled) return res.json({ code: 403, message: "Template creation & usage is disabled on this instance." }).sendStatus(403); if (!allowTemplateCreation) return res.json({ code: 403, message: "Template creation is disabled on this instance." }).sendStatus(403);