webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Laravel 7.x Shift (#3011)

Browse Source 
* Apply Laravel coding style
* Shift bindings
* Shift core files
* Shift to Throwable
* Add laravel/ui dependency
* Shift Eloquent methods
* Shift config files
* Shift Laravel dependencies
* Shift cleanup
* Shift test config and references
* Applied styleci changes
* Applied fixes post shift to laravel 7

Co-authored-by: Shift <shift@laravelshift.com>
This commit is contained in:
Dan Brown
2021-10-26 22:04:18 +01:00
committed by GitHub
parent 42f0ba1875
commit f77236aa38
225 changed files with 1618 additions and 1804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/ko/errors.php
View File

@ -28,7 +28,7 @@ return [
'oidc_no_email_address' => 'Could not find an email address, for this user, in the data provided by the external authentication system',
'oidc_fail_authed' => 'Login using :system failed, system did not provide successful authorization',
'social_no_action_defined' => '무슨 활동인지 알 수 없습니다.',
'social_login_bad_response' => ":socialAccount에 로그인할 수 없습니다. : \\n:error",
'social_login_bad_response' => ':socialAccount에 로그인할 수 없습니다. : \\n:error',
'social_account_in_use' => ':socialAccount(을)를 가진 사용자가 있습니다. :socialAccount로 로그인하세요.',
'social_account_email_in_use' => ':email(을)를 가진 사용자가 있습니다. 쓰고 있는 계정을 :socialAccount에 연결하세요.',
'social_account_existing' => ':socialAccount(와)과 연결 상태입니다.',