diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 7319863..7e2ae11 100644 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -33,10 +33,28 @@ return [ 'my_acc' => 'My Account', 'confirm' => 'Please Confirm', 'confirm_plain' => 'Confirm', + 'confirm_click' => 'Click to Confirm', 'date' => 'Date', 'datetime' => 'Time & Date', 'location' => 'Location', - 'none_yet' => 'None yet' + 'none_yet' => 'None yet', + 'reason' => 'Reason', + 'days' => 'Days', + 'weeks' => 'Weeks', + 'months' => 'Months', + 'years' => 'Years', + 'yes' => 'Yes', + 'no' => 'No', + 'roles' => 'Roles', + 'member_since' => 'Member since :date', + 'lookup' => 'Lookup :ipAddress', + 'abt' => 'About', + 'acc' => 'Account', + 'settings' => 'Settings', + 'profile' => 'My Profile', + 'code' => 'code', + 'here' => 'here', + 'auth_req' => 'Please authenticate' ], @@ -363,6 +381,118 @@ EOT, 'no_pending_review' => 'There are no applications pending review', 'no_pending_review_exp' => 'Check the other queues for any applications! Applications will be shown here as soon as their interview is completed. You\'ll be able to view meeting notes and vote based on your observations.', + ], + + // ============= PROFILE & USER MESSAGES =============== + + 'profile' => [ + + 'title' => ':name\'s profile', + 'profile' => 'Profile', + 'users' => 'Users', + 'account_banned' => 'Account banned', + 'account_banned_exp' => 'This user has been banned by the moderators.', + 'ban_confirm' => 'Please confirm that you want to ban this user account. You\'ll need to add a reason and expiration date to confirm this. Bans don\'t transfer to connected Minecraft networks (yet).', + 'leave_empty' => 'Leave empty for a permanent ban', + 'duration' => 'Duration', + 'p_duration' => 'Punishment duration', + 'p_duration_exp' => 'e.g. Spamming', + 'ban' => 'Ban', + + 'terminate_notice' => 'You are about to terminate a staff member', + 'terminate_notice_warning' => 'Terminating a staff member will remove their privileges on the team management site and Network. + They will be notified of their termination. Make sure to have discussed this with them first.', + 'terminate_notice_consequence' => 'THIS PROCESS IS IRREVERSIBLE AND IMMEDIATE', + 'terminate_txt' => 'Terminate Staff Member', + + 'delete_acc_warn' => 'WARNING: This is a potentially destructive action!', + 'delete_acc_consequence' => 'Deleting a user\'s account is an irreversible process. Historic and current applications, votes, and profile content, as well as any personally identifiable information will be immediately erased.', + 'type_to_confirm' => 'Type to confirm:', + 'type_placeholder' => 'Please type the above', + + 'delete_acc' => 'Delete Account', + 'edit_acc' => 'Edit Account', + + 'ban_acc' => 'Ban Account', + 'unban_acc' => 'Unban Account', + + 'search_result' => 'Search results', + + 'origin_cc' => 'Origin country', + 'state_prov' => 'State/Province', + 'district' => 'District (if any)', + 'city' => 'City', + 'zipcode' => 'Zipcode', + 'coords' => 'Coordinates', + 'european' => 'European?', + 'isp' => 'ISP', // Internet service provider + 'org' => 'Organization (if any)', + 'ctype' => 'C. Type', // Internet Connection type + 'timezone' => 'Timezone', + 'noresults' => 'This query returned no results.', + + 'edituser' => 'Edit PII and Roles', // PII: Personally identifiable information + 'edituser_consequence' => 'Warning! This is a sensitive setting! Changing this could have unintended consequences!', + 'acc_management' => 'Account Management (Admin)', + 'discord_tag' => 'User\'s Discord Tag: :discordTag', + 'account_settings' => 'Account Settings', + + '2fa_welcome' => 'We\'re glad you decided to increase your account\'s security!', + 'supported_apps' => 'Supported apps you can install: ', + 'scan_code' => 'Scan the :scannable code with your preferred app, and then copy the code here.', + 'otp' => 'One-time code', + '2fa_enable' => 'Enable 2FA', + '2fa_remove_consequence' => 'Removing two-factor authentication will reduce the security of your account.', + '2fa_password_confirm' => 'Confirm your password to continue', + '2fa_password_confirm_exp' => 'To prevent unauthorized changes, a password is always required for sensitive operations.', + '2fa_disable_consent' => '"I understand the possible consequences of disabling two factor authentication"', + '2fa_remove' => 'Remove 2FA', + + 'security_lgotherdev' => 'For your security, you\'ll need to re-enter your password before logging out other devices. If you believe your account has been compromised, please change your password instead, as that will automatically log out anyone else who might using your account, and prevent them from signing back in.', + 'password_reenter' => 'Re-enter your password', + + 'acc_security' => 'Account Security', + '2fa' => 'Two Factor Authentication', + 'sessions' => 'Sessions', + 'contact_settings' => 'Contact Settings (E-Mail)', + + 'change_password' => 'Change Password', + 'change_password_exp' => 'Change your password here. This will log you out from all existing sessions for your security.', + + 'old_pass' => 'Old Password', + 'forgot_pw' => 'Forgot your password? Reset it :link', + 'new_pw' => 'New Password', + + '2fa_enable_success' => 'Hooray! 2FA is setup correctly for your account. A code will be asked each time you login.', + '2fa_avail' => 'Two-factor auth is available for your account.', + '2fa_avail_exp' => ' Enabling this security option greatly increases your account\'s security in case your password ever gets stolen.', + + 'session_manager' => 'Session Manager', + 'terminate_others' => 'Terminating other sessions is generally a good idea if your account has been compromised.', + 'current_session' => 'Your current session: logged in from :ipAddress', + 'flush_session' => 'Flush sessions', + 'personal_data_change' => 'Need to change personal data? You can do so here.', + 'current_email' => 'Current Email Address', + 'new_email' => 'New Email Address', + 'current_password' => 'Current Password', + 'security_nochangepw' => 'For security reasons, you cannot make important account changes without confirming your password. You\'ll also need to verify your new email.', + 'change_email' => 'Change Email Address', + + 'basic_info' => 'Basic Information', + 'fl_name' => 'First / Last Name', + 'shortbio' => 'Short Bio', + 'about_me' => 'About Me', + 'pref_media' => 'Preferences & Media', + 'avatar_source' => 'Retrieve avatar from: ', + 'social_media' => 'Social Media', + + 'github_user' => 'Github Username', + 'twitter_user' => 'Twitter Username', + 'insta_user' => 'Instagram Username', + 'discord_user' => 'Discord Handle', + + 'update_prfl' => 'Update Profile' + ] diff --git a/resources/views/dashboard/user/profile/displayprofile.blade.php b/resources/views/dashboard/user/profile/displayprofile.blade.php index 0d0711a..be1b3d0 100644 --- a/resources/views/dashboard/user/profile/displayprofile.blade.php +++ b/resources/views/dashboard/user/profile/displayprofile.blade.php @@ -1,10 +1,10 @@ @extends('adminlte::page') -@section('title', 'Raspberry Network | ' . $profile->user->name . '\'s profile') +@section('title', config('app.name') . ' | ' . __('messages.profile.title', ['name' => $profile->user->name])) @section('content_header') -

Users / Profile / {{ $profile->user->name }}

+

{{__('messages.profile.users')}} / {{__('messages.profile.profile')}} / {{ $profile->user->name }}

@stop @@ -22,9 +22,9 @@
- Account banned + {{__('messages.profile.account_banned')}} -

This user has been banned by the moderators.

+

{{__('messages.profile.account_banned_exp')}}

{{$profile->user->bans->reason}} @@ -38,18 +38,18 @@ -

Please confirm that you want to ban this user account. You'll need to add a reason and expiration date to confirm this. Bans don't transfer to connected Minecraft networks (yet).

+

{{__('messages.profile.ban_confirm')}}

@csrf - - + +
- +
- +
-

Leave empty for a permanent ban

+

{{__('messages.profile.leave_empty')}}

@@ -67,7 +67,7 @@ - + @@ -76,13 +76,12 @@ @if (!Auth::user()->is($profile->user) && $profile->user->isStaffMember()) -

You are about to terminate a staff member

+

{{__('messages.profile.terminate_notice')}}

- Terminating a staff member will remove their privileges on the team management site and Network. - They will be notified of their termination. Make sure to have discussed this with them first. + {{__('messages.profile.terminate_notice_warning')}}

- THIS PROCESS IS IRREVERSIBLE AND IMMEDIATE + {{__('messages.profile.terminate_notice_consequence')}}

@@ -91,7 +90,7 @@ @csrf @method('PATCH') - + @@ -102,30 +101,30 @@ -

WARNING: This is a potentially destructive action!

+

{{__('messages.profile.delete_acc_warn')}}

-

Deleting a user's account is an irreversible process. Historic and current applications, votes, and profile content, as well as any personally identifiable information will be immediately erased.

+

{{__('messages.profile.delete_acc_consequence')}}

$profile->user->id])}}> @csrf @method('DELETE') - - + +
- +
-

Search results

+

{{__('messages.profile.search_result')}}

@if (!isset($ipInfo->message)) @@ -134,58 +133,58 @@ - Origin Country + {{__('messages.profile.origin_cc')}} {{$ipInfo->country_name ?? 'N/A'}} - State/Province + {{__('messages.profile.state_prov')}} {{$ipInfo->state_prov ?? 'None'}} - District (if any) + {{__('messages.profile.district')}} {{$ipInfo->district ?? 'N/A'}} - City + {{__('messages.profile.city')}} {{$ipInfo->city ?? 'N/A'}} - Zipcode + {{__('messages.profile.zipcode')}} {{$ipInfo->zipcode ?? 'N/A'}} - Coordinates + {{__('messages.profile.coords')}} {{$ipInfo->latitude ?? 0}}, {{$ipInfo->longitude ?? 0}} - European? - {{($ipInfo->is_eu) ? 'Yes' : 'No'}} + {{__('messages.profile.european')}} + {{($ipInfo->is_eu) ? __('messages.reusable.yes') : __('messages.reusable.no')}} - ISP + {{__('messages.profile.isp')}} {{$ipInfo->isp ?? 'N/A'}} - Organization (if any) + {{__('messages.profile.org')}} {{$ipInfo->organization ?? 'N/A'}} - C. Type + {{__('messages.profile.ctype')}} {{$ipInfo->connection_type ?? 'N/A'}} - Timezone + {{__('messages.profile.timezone')}} {{$ipInfo->time_zone->name ?? 'N/A'}} @@ -196,7 +195,7 @@ @else
- This query returned no results + {{__('messages.profile.noresults')}}

{{$ipInfo->message}}

@@ -207,27 +206,27 @@ - +
@csrf @method('PATCH') - + - +

- Warning! This is a sensitive setting! Changing this could have unintended consequences! + {{__('messages.profile.edituser_consequence')}}

- + @@ -250,7 +249,7 @@ - + @@ -291,15 +290,15 @@ @endif

{{$profile->profileShortBio}}

-

Member since {{$since}}

+

{{__('messages.reusable.member_since', ['date' => $since])}}

@if (Auth::user()->hasRole('admin')) - + @endif @if ($profile->user->is(Auth::user())) @elseif (Auth::user()->hasRole('admin') && $profile->user->isStaffMember()) - + @endif @@ -326,7 +325,7 @@
@@ -335,19 +334,19 @@
@if (!$profile->user->isBanned()) -
+
@else @method('DELETE') @csrf - + @endif -
+
-
+
@@ -369,7 +368,7 @@
- + @@ -389,7 +388,7 @@
-

About

+

{{__('messages.reusable.abt')}}

diff --git a/resources/views/dashboard/user/profile/useraccount.blade.php b/resources/views/dashboard/user/profile/useraccount.blade.php index d9fd90c..407fe3a 100644 --- a/resources/views/dashboard/user/profile/useraccount.blade.php +++ b/resources/views/dashboard/user/profile/useraccount.blade.php @@ -1,10 +1,10 @@ @extends('adminlte::page') -@section('title', 'Raspberry Network | Account Settings') +@section('title', config('app.name') . ' | ' . __('messages.profile.account_settings')) @section('content_header') -

My Profile / Account / Settings

+

{{__('messages.reusable.profile')}} / {{__('messages.reusable.acc')}} / {{__('messages.reusable.settings')}}

@stop @@ -25,14 +25,14 @@ -

We're glad you decided to increase your account's security!

+

{{__('messages.profile.2fa_welcome')}}

-

Supported apps you can install:

+

{{__('messages.profile.supported_apps')}}

-

Scan the QR code below with your preferred app, and then copy the code here.

+

{{__('messages.profile.scan_code', ['scannable', 'QR'])}}

@@ -52,7 +52,7 @@
@csrf @method('PATCH') - + @@ -65,7 +65,7 @@ - + @@ -77,19 +77,19 @@ -

Are you sure? Removing two-factor authentication will reduce the security of your account.

+

{{__('messages.application_m.modal_confirm')}} {{__('messages.profile.2fa_remove_consequence')}}

@csrf @method('PATCH') - + -

To prevent unauthorized changes, a password is always required for sensitive operations.

+

{{__('messages.profile.2fa_password_confirm_exp')}}

- - Click to confirm + + {{__('messages.reusable.confirm_click')}}
@@ -97,7 +97,7 @@ - + @@ -109,24 +109,24 @@ @@ -140,10 +140,10 @@
-

Welcome back, {{Auth::user()->name}}

+

{{__('messages.welcome_back')}} {{Auth::user()->name}}

{{Auth::user()->email}}

- View @ NameMC + {{__('messages.reusable.view')}} @ NameMC
@@ -159,69 +159,69 @@
-
Change Password
-

Change your password here. This will log you out from all existing sessions for your security.

+
{{__('messages.profile.change_password')}}
+

{{__('messages.profile.change_password_exp')}}

@csrf @method('PATCH') - + -

Forgot your password? Reset it here

+

{{__('messages.forgot_pw', ['link' => '' . __('messages.reusable.here') . ''])}}

- + - +
- +
-
Two-factor Authentication
+
{{__('messages.profile.2fa')}}

@if (Auth::user()->has2FA()) -

Hooray! 2FA is setup correctly for your account. A code will be asked each time you login.

- +

{{__('messages.profile.2fa_enable_success')}}

+ @else -

Two-factor auth is available for your account. Enabling this security option greatly increases your account's security in case your password ever gets stolen.

- +

{{__('messages.profile.2fa_avail')}}{{__('messages.profile.2fa_avail_exp')}}

+ @endif
-
Session Manager
-

Terminating other sessions is generally a good idea if your account has been compromised.

-

Your current session: Logged in from {{ $ip }}

- +
{{__('messages.profile.session_manager')}}
+

{{__('messages.profile.terminate_others')}}

+

{{__('messages.profile.current_session', ['ipAddress' => $ip])}}

+
-
Contact Settings
-

Need to change personal data? You can do so here.

+
{{__('messages.profile.contact_settings')}}
+

{{__('messages.profile.personal_data_change')}}

@@ -229,11 +229,11 @@ @method('PATCH')
- + - + @@ -241,13 +241,13 @@
- + -

For security reasons, you cannot make important account changes without confirming your password. You'll also need to verify your new email.

+

{{__('messages.profile.security_nochangepw')}}

- +
diff --git a/resources/views/dashboard/user/profile/userprofile.blade.php b/resources/views/dashboard/user/profile/userprofile.blade.php index f7afd4d..32a18f1 100644 --- a/resources/views/dashboard/user/profile/userprofile.blade.php +++ b/resources/views/dashboard/user/profile/userprofile.blade.php @@ -1,10 +1,10 @@ @extends('adminlte::page') -@section('title', 'Raspberry Network | Profile') +@section('title', config('app.name') . ' | ' . __('messages.profile.profile')) @section('content_header') -

My Profile / Settings

+

{{__('messages.reusable.profile')}} / {{__('messages.reusable.settings')}}

@stop @@ -67,7 +67,7 @@