Skip to content

Commit

Permalink
Sync upstream (3.2)
Browse files Browse the repository at this point in the history
  • Loading branch information
octoberapp committed Jan 11, 2023
1 parent fd94973 commit c957540
Show file tree
Hide file tree
Showing 226 changed files with 1,224 additions and 1,338 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "proprietary",
"require": {
"php": "^8.0.2",
"october/rain": "^3.1",
"october/rain": "^3.2",
"laravel/framework": "^9.0"
},
"require-dev": {
Expand Down
7 changes: 5 additions & 2 deletions config/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

'paths' => [
// Default Laravel Blade template location
// realpath(base_path('resources/views'))
// resource_path('views'),
],

/*
Expand All @@ -29,6 +29,9 @@
|
*/

'compiled' => realpath(storage_path('framework/views')),
'compiled' => env(
'VIEW_COMPILED_PATH',
realpath(storage_path('framework/views'))
),

];
9 changes: 7 additions & 2 deletions modules/backend/lang/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,17 @@
"Date & Time": "التاريخ والوقت",
"Type": "يكتب",
"IP address": "عنوان IP",
"Login": "تسجيل الدخول",
"Login": "تسجيل دخول",
"First name": "الاسم الاول",
"Last name": "اللقب",
"Email": "البريد الإلكتروني",
"A custom schema is used for this file format.": "يتم استخدام مخطط مخصص لتنسيق الملف هذا.",
"Select": "يختار",
"Replace": "يحل محل",
"and": "و"
"and": "و",
"Administration Area": "لوحة الإدارة",
"Please enter your login to restore the password.": "أدخل اسم المستخدم",
"Restore": "استرجاع",
"Reset": "استعادة",
"Forgot password?": "نسيت كلمة المرور؟"
}
9 changes: 1 addition & 8 deletions modules/backend/lang/ar/lang.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?php return [
'auth' => [
'title' => 'لوحة الإدارة',
],
'auth' => [],
'page' => [
'access_denied' => [
'label' => 'ممنوع الوصول',
Expand All @@ -11,13 +9,8 @@
],
'account' => [
'sign_out' => 'تسجيل خروج',
'login' => 'تسجيل دخول',
'reset' => 'استعادة',
'restore' => 'استرجاع',
'login_placeholder' => 'اسم المستخدم',
'password_placeholder' => 'كلمة المرور',
'forgot_password' => 'نسيت كلمة المرور؟',
'enter_login' => 'أدخل اسم المستخدم',
],
'dashboard' => [
'menu_label' => 'لوحة الإدارة',
Expand Down
16 changes: 14 additions & 2 deletions modules/backend/lang/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,24 @@
"Date & Time": "Дата і час",
"Type": "Тып",
"IP address": "IP адрас",
"Login": "Лагін",
"Login": "Увайсці",
"First name": "Імя",
"Last name": "Прозвішча",
"Email": "Электронная пошта",
"A custom schema is used for this file format.": "Для гэтага фармату файла выкарыстоўваецца спецыяльная схема.",
"Select": "Выберыце",
"Replace": "Замяніць",
"and": "і"
"and": "і",
"Administration Area": "Панэль кіравання",
"Password Reset": "Скасаванне паролю",
"Please enter a new password.": "Увядзіце новы пароль",
"Please enter your login to restore the password.": "Увядзіце імя карыстальніка",
"A user could not be found with a login value of ':login'": "Імя карыстальніка \":login\" не было знойдзена",
"If your account was found, a message has been sent to your email address with instructions.": "На Вашу электронную пошту было адпраўлена паведамленне з інструкцыямі",
"Invalid password reset data supplied. Please try again!": "Няправільныя дадзеныя для змены пароля. Паспрабуйце яшчэ!",
"Unable to reset your password!": "Немагчыма змяніць пароль!",
"Password has been reset. You may now sign in.": "Пароль быў зменены, цяпер Вы можаце ўвайсці",
"Restore": "Аднавіць",
"Reset": "Скасаваць",
"Forgot password?": "Забыліся пароль?"
}
21 changes: 2 additions & 19 deletions modules/backend/lang/be/lang.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?php return [
'auth' => [
'title' => 'Панэль кіравання',
],
'auth' => [],
'field' => [
'invalid_type' => 'Выкарыстаны няправільны тып поля: ":type"',
'options_method_invalid_model' => 'Для атрыбуту ":field" не была знойздена адпаведная мадэль. Паспрабуйце яўна вызначыць метад опцый для мадэлі ":model"',
Expand Down Expand Up @@ -29,22 +27,10 @@
],
'account' => [
'sign_out' => 'Выйсці',
'login' => 'Увайсці',
'reset' => 'Скасаваць',
'restore' => 'Аднавіць',
'login_placeholder' => 'Карыстальнік',
'password_placeholder' => 'Пароль',
'forgot_password' => 'Забыліся пароль?',
'enter_email' => 'Увядзіце электронную пошту',
'enter_login' => 'Увядзіце імя карыстальніка',
'email_placeholder' => 'Электронная пошта',
'enter_new_password' => 'Увядзіце новы пароль',
'password_reset' => 'Скасаванне паролю',
'restore_success' => 'На Вашу электронную пошту было адпраўлена паведамленне з інструкцыямі',
'restore_error' => 'Імя карыстальніка ":login" не было знойдзена',
'reset_success' => 'Пароль быў зменены, цяпер Вы можаце ўвайсці',
'reset_error' => 'Няправільныя дадзеныя для змены пароля. Паспрабуйце яшчэ!',
'reset_fail' => 'Немагчыма змяніць пароль!',
'apply' => 'Ужыць',
'cancel' => 'Адмяніць',
'delete' => 'Выдаліць',
Expand Down Expand Up @@ -248,10 +234,7 @@
'recordfinder' => [
'find_record' => 'Знайсці запіс',
],
'pagelist' => [
'page_link' => 'Спасылка на староку',
'select_page' => 'Выберыце старонку...',
],
'pagelist' => [],
'relation' => [
'missing_config' => 'Паводзіны стаўлення не маюць ніводнай канфігурацыі для ":config"',
'missing_definition' => 'Паводзіны стаўлення не маюць вызначэнняў для поля ":field"',
Expand Down
16 changes: 14 additions & 2 deletions modules/backend/lang/bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,24 @@
"Date & Time": "Дата и Час",
"Type": "Тип",
"IP address": "ИП адрес",
"Login": "Влизане",
"Login": "Вход",
"First name": "Име",
"Last name": "Фамилия name",
"Email": "Имейл",
"A custom schema is used for this file format.": "За този файлов формат се използва персонализирана схема.",
"Select": "Изберете",
"Replace": "Сменете",
"and": "и"
"and": "и",
"Administration Area": "Администраторски Панел",
"Password Reset": "Смяна на паролата",
"Please enter a new password.": "Въведи нова парола",
"Please enter your login to restore the password.": "Напиши своя акаунт",
"A user could not be found with a login value of ':login'": "Не е намерен акаунт със име ':login'",
"If your account was found, a message has been sent to your email address with instructions.": "Беше изпратен имейл до вашата поща със инструкций за въстановяване на паролата.",
"Invalid password reset data supplied. Please try again!": "Невалиден данни за нулиране на паролата. Моля, опитайте отново!",
"Unable to reset your password!": "Неуспешно нулиране на паролата!",
"Password has been reset. You may now sign in.": "Вашата парола е успешно нулирана. Сега може да се логнете.",
"Restore": "Възстановяване",
"Reset": "Нулиране",
"Forgot password?": "Забравена парола?"
}
16 changes: 1 addition & 15 deletions modules/backend/lang/bg/lang.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?php return [
'auth' => [
'title' => 'Администраторски Панел',
],
'auth' => [],
'field' => [
'invalid_type' => 'Използвано невалиден тип поле :type.',
'options_method_not_exists' => 'Моделът клас :model трябва да се определя метод :method() връщайки настройки за \':field\' поле.',
Expand All @@ -23,22 +21,10 @@
],
'account' => [
'sign_out' => 'Изход',
'login' => 'Вход',
'reset' => 'Нулиране',
'restore' => 'Възстановяване',
'login_placeholder' => 'вход',
'password_placeholder' => 'парола',
'forgot_password' => 'Забравена парола?',
'enter_email' => 'Напиши своя имейл',
'enter_login' => 'Напиши своя акаунт',
'email_placeholder' => 'имейл',
'enter_new_password' => 'Въведи нова парола',
'password_reset' => 'Смяна на паролата',
'restore_success' => 'Беше изпратен имейл до вашата поща със инструкций за въстановяване на паролата.',
'restore_error' => 'Не е намерен акаунт със име \':login\'',
'reset_success' => 'Вашата парола е успешно нулирана. Сега може да се логнете.',
'reset_error' => 'Невалиден данни за нулиране на паролата. Моля, опитайте отново!',
'reset_fail' => 'Неуспешно нулиране на паролата!',
'apply' => 'Приложи',
'cancel' => 'Отказ',
'delete' => 'Изтрии',
Expand Down
18 changes: 16 additions & 2 deletions modules/backend/lang/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,26 @@
"Date & Time": "Data i Hora",
"Type": "Tipus",
"IP address": "Adreça IP",
"Login": "Login",
"Login": "Accedir",
"First name": "Nom",
"Last name": "Cognom",
"Email": "Email",
"A custom schema is used for this file format.": "S'utilitza un esquema personalitzat per a aquest format de fitxer.",
"Select": "Seleccioneu",
"Replace": "Substitueix",
"and": "i"
"and": "i",
"The details you entered did not match our records. Please double-check and try again.": "Els detalls que has introduït no corresponen als nostres registres. Si us plau revisa'ls i torna-ho a intentar.",
"Administration Area": "Àrea d'Administració",
"Password Reset": "Reiniciar contrasenya",
"Please enter a new password.": "Introdueix una nova contrasenya",
"Please enter your login to restore the password.": "Introdueix el teu usuari",
"A user could not be found with a login value of ':login'": "No es pot trobar l'usuari ':login'",
"If your account was found, a message has been sent to your email address with instructions.": "Hem enviat un missatge al teu correu amb instruccions.",
"Invalid password reset data supplied. Please try again!": "Dades per restablir contrasenya incorrectes. Si us plau intenta-ho de nou!",
"Unable to reset your password!": "No s'ha pogut restablir la contrasenya!",
"Password has been reset. You may now sign in.": "La contrasenya s'ha reiniciat. Ara pots accedir.",
"Restore": "Restaurar",
"Reset": "Reiniciar",
"Stay logged in": "Recordar-me",
"Forgot password?": "Has oblidat la teva contrasenya?"
}
23 changes: 2 additions & 21 deletions modules/backend/lang/ca/lang.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?php return [
'auth' => [
'title' => 'Àrea d\'Administració',
'invalid_login' => 'Els detalls que has introduït no corresponen als nostres registres. Si us plau revisa\'ls i torna-ho a intentar.',
],
'auth' => [],
'field' => [
'invalid_type' => 'El tipus de camp :type utilitzat és invàlid.',
'options_method_invalid_model' => 'L\'atribut \':field\' no resol a un model vàlid. Intenta especificar explícitament el mètode d\'opcions per la classe de model :model.',
Expand Down Expand Up @@ -34,23 +31,10 @@
'account' => [
'signed_in_as' => 'Connectat com :full_name',
'sign_out' => 'Sortir',
'login' => 'Accedir',
'reset' => 'Reiniciar',
'restore' => 'Restaurar',
'login_placeholder' => 'usuari',
'password_placeholder' => 'contrasenya',
'remember_me' => 'Recordar-me',
'forgot_password' => 'Has oblidat la teva contrasenya?',
'enter_email' => 'Introdueix el teu email',
'enter_login' => 'Introdueix el teu usuari',
'email_placeholder' => 'email',
'enter_new_password' => 'Introdueix una nova contrasenya',
'password_reset' => 'Reiniciar contrasenya',
'restore_success' => 'Hem enviat un missatge al teu correu amb instruccions.',
'restore_error' => 'No es pot trobar l\'usuari \':login\'',
'reset_success' => 'La contrasenya s\'ha reiniciat. Ara pots accedir.',
'reset_error' => 'Dades per restablir contrasenya incorrectes. Si us plau intenta-ho de nou!',
'reset_fail' => 'No s\'ha pogut restablir la contrasenya!',
'apply' => 'Aplicar',
'cancel' => 'Cancel·lar',
'delete' => 'Eliminar',
Expand Down Expand Up @@ -280,10 +264,7 @@
'find_record' => 'Trobar registre',
'cancel' => 'Cancel·lar',
],
'pagelist' => [
'page_link' => 'Enllaç a pàgina',
'select_page' => 'Selecciona una pàgina...',
],
'pagelist' => [],
'relation' => [
'missing_config' => 'El comportament Relation no té una configuració per \':config\'.',
'missing_definition' => 'El comportament Relation no té una definició per \':field\'.',
Expand Down
17 changes: 15 additions & 2 deletions modules/backend/lang/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,25 @@
"Date & Time": "Datum & čas",
"Type": "Typ",
"IP address": "IP adresa",
"Login": "Login",
"Login": "Přihlásit se",
"First name": "Jméno",
"Last name": "Příjmení",
"Email": "E-mail",
"A custom schema is used for this file format.": "Pro tento formát souboru se používá vlastní schéma.",
"Select": "Vybrat",
"Replace": "Nahradit",
"and": "a"
"and": "a",
"Administration Area": "Administrace",
"Password Reset": "Obnova hesla",
"Please enter a new password.": "Zadejte nové heslo",
"Please enter your login to restore the password.": "Zadejte váš login",
"A user could not be found with a login value of ':login'": "Uživatel s přihlašovacím jménem ':login' nebyl nalezen",
"If your account was found, a message has been sent to your email address with instructions.": "E-mail byl zaslán na vaší e-mailovou adresu s heslem a instrukcemi k obnově.",
"Invalid password reset data supplied. Please try again!": "Data pro obnovu hesla nejsou správná. Prosím zkuste to znovu!",
"Unable to reset your password!": "Obnova hesla selhala!",
"Password has been reset. You may now sign in.": "Vaše heslo bylo úspěšně obnoveno. Nyní se můžete přihlásit.",
"Restore": "Obnovit",
"Reset": "Resetovat",
"Stay logged in": "Zůstat přihlášený",
"Forgot password?": "Zapomněli jste heslo?"
}
22 changes: 2 additions & 20 deletions modules/backend/lang/cs/lang.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?php return [
'auth' => [
'title' => 'Administrace',
],
'auth' => [],
'field' => [
'invalid_type' => 'Byl použitý špatný typ :type.',
'options_method_invalid_model' => 'Vlastnost \':field\' neodpovídá platnému modelu. Zkuste specifikovat metodu voleb pro modelovou třídu :model explicitně.',
Expand Down Expand Up @@ -29,23 +27,10 @@
],
'account' => [
'sign_out' => 'Odhlásit',
'login' => 'Přihlásit se',
'reset' => 'Resetovat',
'restore' => 'Obnovit',
'login_placeholder' => 'Přihlašovací jméno',
'password_placeholder' => 'Heslo',
'remember_me' => 'Zůstat přihlášený',
'forgot_password' => 'Zapomněli jste heslo?',
'enter_email' => 'Zadejte váš e-mail',
'enter_login' => 'Zadejte váš login',
'email_placeholder' => 'E-mail',
'enter_new_password' => 'Zadejte nové heslo',
'password_reset' => 'Obnova hesla',
'restore_success' => 'E-mail byl zaslán na vaší e-mailovou adresu s heslem a instrukcemi k obnově.',
'restore_error' => 'Uživatel s přihlašovacím jménem \':login\' nebyl nalezen',
'reset_success' => 'Vaše heslo bylo úspěšně obnoveno. Nyní se můžete přihlásit.',
'reset_error' => 'Data pro obnovu hesla nejsou správná. Prosím zkuste to znovu!',
'reset_fail' => 'Obnova hesla selhala!',
'apply' => 'Použít',
'cancel' => 'Zrušit',
'delete' => 'Smazat',
Expand Down Expand Up @@ -271,10 +256,7 @@
'find_record' => 'Najít záznam',
'cancel' => 'Zrušit',
],
'pagelist' => [
'page_link' => 'Odkaz na stránku',
'select_page' => 'vyberte stránku...',
],
'pagelist' => [],
'relation' => [
'missing_config' => 'Chování relace nemá žádné nastavení pro \':config\'.',
'missing_definition' => 'Chování relace neobsahuje definici pro \':field\'.',
Expand Down
16 changes: 14 additions & 2 deletions modules/backend/lang/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,24 @@
"Date & Time": "Dato & Tid",
"Type": "Type",
"IP address": "IP addresse",
"Login": "Login",
"Login": "Log ind",
"First name": "Fornavn",
"Last name": "Efternavn",
"Email": "Email",
"A custom schema is used for this file format.": "Et brugerdefineret skema bruges til dette filformat.",
"Select": "Vælg",
"Replace": "Erstatte",
"and": "og"
"and": "og",
"Administration Area": "Administrationsområde",
"Password Reset": "Nulstil adgangskode",
"Please enter a new password.": "Skriv en ny adgangskode",
"Please enter your login to restore the password.": "Indtast din login-info",
"A user could not be found with a login value of ':login'": "En bruger med login-infoen ':login', kunne ikke findes",
"If your account was found, a message has been sent to your email address with instructions.": "En besked med instruktioner, er blevet sendt til din email adresse.",
"Invalid password reset data supplied. Please try again!": "Ugyldig adgangskode-nulstillings-data angivet. Prøv venligst igen!",
"Unable to reset your password!": "Kunne ikke nulstille din adgangskode!",
"Password has been reset. You may now sign in.": "Adgangskoden er blevet nulstillet. Du kan nu logge ind.",
"Restore": "Genopret",
"Reset": "Reset",
"Forgot password?": "Glemt din adgangskode?"
}
Loading

0 comments on commit c957540

Please sign in to comment.