From 7fa1e1e11c337631565385c2cac5db45064cce14 Mon Sep 17 00:00:00 2001 From: miguel456 Date: Mon, 4 Apr 2022 13:06:01 +0100 Subject: [PATCH] fix: add remaining missing strings --- .../Controllers/Auth/RegisterController.php | 3 ++- config/localizator.php | 2 +- lang/en.json | 16 +++++++++++- lang/en/messages.php | 25 ------------------- lang/pt-br.json | 16 +++++++++++- lang/pt-br/messages.php | 25 ------------------- lang/pt.json | 16 +++++++++++- lang/pt/messages.php | 25 ------------------- resources/views/breadcrumbs/app.blade.php | 4 +-- .../administration/editform.blade.php | 2 +- resources/views/dashboard/dashboard.blade.php | 4 +-- .../user/profile/displayprofile.blade.php | 8 +++--- .../user/profile/userprofile.blade.php | 2 +- .../views/dashboard/user/viewapp.blade.php | 4 +-- resources/views/home.blade.php | 2 +- 15 files changed, 61 insertions(+), 93 deletions(-) delete mode 100644 lang/en/messages.php delete mode 100644 lang/pt-br/messages.php delete mode 100644 lang/pt/messages.php diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index cdc596a..7f7bbb7 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -109,7 +109,8 @@ class RegisterController extends Controller 'acceptTerms' => ['required', 'accepted'], 'password' => $password, ], [ - 'uuid.required' => 'Please enter a valid (and Premium) Minecraft username! We do not support cracked users.', + 'uuid.required' => __('Please enter a valid (and Premium) Minecraft username! We do not support cracked users.'), + 'acceptTerms.required' => __('Please accept the Community Guidelines, Terms of Service and Privacy Policy to continue.') ]); } diff --git a/config/localizator.php b/config/localizator.php index 1da5cfa..9dbf321 100644 --- a/config/localizator.php +++ b/config/localizator.php @@ -40,7 +40,7 @@ return [ * Add here any custom defined functions. * NOTE: The translation string should always be the first argument. */ - 'functions' => ['__', 'trans', '@lang'] + 'functions' => ['__', 'trans_choice', 'trans', '@lang'] ], /** diff --git a/lang/en.json b/lang/en.json index e6b7a73..bd64901 100644 --- a/lang/en.json +++ b/lang/en.json @@ -186,6 +186,7 @@ "Dashboard": "Dashboard", "Date": "Date", "Decision & Moderation Tools": "Decision & Moderation Tools", + "Decline application": "Decline application", "Declined": "Declined", "Declined by an admin or withdrawn by the requester": "Declined by an admin or withdrawn by the requester", "Delete": "Delete", @@ -212,6 +213,7 @@ "Discord Handle": "Discord Handle", "Discord Role ID": "Discord Role ID", "Discord role ID": "Discord role ID", + "Discord tag: :discordTag": "Discord tag: :discordTag", "Dispatch approval event": "Dispatch approval event", "Dispatches an approval event for the selected application": "Dispatches an approval event for the selected application", "Dispatches a rejection event for the selected application": "Dispatches a rejection event for the selected application", @@ -226,8 +228,10 @@ "Duration": "Duration", "e.g. Spamming": "e.g. Spamming", "Edit": "Edit", + "Edit account": "Edit account", "Edit Account": "Edit Account", "Edit form": "Edit form", + "Editing :formTitle...": "Editing :formTitle...", "Editor": "Editor", "Edit Team": "Edit Team", "Edit vacancies": "Edit vacancies", @@ -240,6 +244,7 @@ "Ended": "Ended", "entries": "entries", "ENV": "ENV", + "Error": "Error", "European?": "European?", "Event dispatched; Candidate approval sequence initiated.": "Event dispatched; Candidate approval sequence initiated.", "Event dispatched; Candidate rejection sequence initiated.": "Event dispatched; Candidate rejection sequence initiated.", @@ -296,7 +301,9 @@ "Housekeeping jobs usually run once every day, but if one of them has failed for some reason, you can manually run them here.": "Housekeeping jobs usually run once every day, but if one of them has failed for some reason, you can manually run them here.", "How to request a leave of absence": "How to request a leave of absence", "Human Resources": "Human Resources", + "I am 13 years of age or older and have read and agree with the Community Guidelines<\/a>, Privacy Policy<\/a> and Terms of Service<\/a> set forth.": "I am 13 years of age or older and have read and agree with the Community Guidelines<\/a>, Privacy Policy<\/a> and Terms of Service<\/a> set forth.", "If an interview is scheduled, you'll need to open your application here and confirm the time, date, and location assigned for you.": "If an interview is scheduled, you'll need to open your application here and confirm the time, date, and location assigned for you.", + "If the setting \"Require Valid Game License\" is activated, editing this field may have unintended consequences. Proceed with caution.": "If the setting \"Require Valid Game License\" is activated, editing this field may have unintended consequences. Proceed with caution.", "If this form has been updated, new fields and updated questions will not show up here!": "If this form has been updated, new fields and updated questions will not show up here!", "If you'd like to learn more about our community, make sure to visit our main website<\/a>!": "If you'd like to learn more about our community, make sure to visit our main website<\/a>!", "If you're seeing this message in error, please contact your system administrator.": "If you're seeing this message in error, please contact your system administrator.", @@ -365,6 +372,7 @@ "Mojang Logo (Minecraft)": "Mojang Logo (Minecraft)", "Mojang UUID (deprecated)": "Mojang UUID (deprecated)", "Move to next stage": "Move to next stage", + "Multi-factor authentication is enabled for your account.": "Multi-factor authentication is enabled for your account.", "Must contain numerical characters": "Must contain numerical characters", "Must contain special characters": "Must contain special characters", "Must contain upper and lower case characters": "Must contain upper and lower case characters", @@ -426,6 +434,7 @@ "permanently.": "permanently.", "Permission group": "Permission group", "Platform": "Platform", + "Please accept the Community Guidelines, Terms of Service and Privacy Policy to continue.": "Please accept the Community Guidelines, Terms of Service and Privacy Policy to continue.", "Please allow up to three days for your application to be processed. Your application will be reviewed by every team member, and will move up in stages.": "Please allow up to three days for your application to be processed. Your application will be reviewed by every team member, and will move up in stages.", "Please authenticate": "Please authenticate", "Please change update your password now. You won't be able to use the site until you do this.": "Please change update your password now. You won't be able to use the site until you do this.", @@ -437,6 +446,7 @@ "Please confirm that you want to suspend this account. You'll need to add a reason and expiration date to confirm this.": "Please confirm that you want to suspend this account. You'll need to add a reason and expiration date to confirm this.", "Please contact your administrator if you believe this was in error.": "Please contact your administrator if you believe this was in error.", "Please do not tamper with the URLs. To report a bug, please contact an administrator.": "Please do not tamper with the URLs. To report a bug, please contact an administrator.", + "Please enter a valid (and Premium) Minecraft username! We do not support cracked users.": "Please enter a valid (and Premium) Minecraft username! We do not support cracked users.", "Please fill out the form below. Keep all answers concise and complete. Please keep in mind that the age requirement is at least :ageUpperLimitSettingValue years old.": "Please fill out the form below. Keep all answers concise and complete. Please keep in mind that the age requirement is at least :ageUpperLimitSettingValue years old.", "Please note: Applications CANNOT be modified once they're submitted!": "Please note: Applications CANNOT be modified once they're submitted!", "Please type the above text": "Please type the above text", @@ -520,6 +530,7 @@ "Sign-in": "Sign-in", "Sign in": "Sign in", "Sign in here": "Sign in here", + "Sign in to your account": "Sign in to your account", "Sign out": "Sign out", "Sign up": "Sign up", "Sign up for an account": "Sign up for an account", @@ -544,6 +555,7 @@ "Submit for approval": "Submit for approval", "Submitted": "Submitted", "Submitted at": "Submitted at", + "Success": "Success", "Successfully logged out other devices. Remember to change your password if you think you've been compromised.": "Successfully logged out other devices. Remember to change your password if you think you've been compromised.", "Supported apps you can install:": "Supported apps you can install:", "Suspend": "Suspend", @@ -615,6 +627,7 @@ "This query didn't return any results.": "This query didn't return any results.", "This request reached its predicted end date": "This request reached its predicted end date", "This setting controls whether people can join the team freely.": "This setting controls whether people can join the team freely.", + "This user has been suspended.": "This user has been suspended.", "This user has been suspended by the admins. Admins suspend accounts for a variety of reasons, including spam.": "This user has been suspended by the admins. Admins suspend accounts for a variety of reasons, including spam.", "This user will receive an email notification asking them to join your team.": "This user will receive an email notification asking them to join your team.", "This vacancy does not have any details yet.": "This vacancy does not have any details yet.", @@ -732,5 +745,6 @@ "Your upcoming interviews": "Your upcoming interviews", "Your vote has been counted!": "Your vote has been counted!", "You will also need to agree to the terms of a LOA. Additionally, you may also specify whether you'll be available to chat occasionally during your absence, but not perform your full duties.": "You will also need to agree to the terms of a LOA. Additionally, you may also specify whether you'll be available to chat occasionally during your absence, but not perform your full duties.", - "Zoom": "Zoom" + "Zoom": "Zoom", + "{1} There is :count open position!|[2,*] There are :count open positions!": "{1} There is :count open position!|[2,*] There are :count open positions!" } \ No newline at end of file diff --git a/lang/en/messages.php b/lang/en/messages.php deleted file mode 100644 index 0295e11..0000000 --- a/lang/en/messages.php +++ /dev/null @@ -1,25 +0,0 @@ - '', - 'dashboard' => '', - 'details_m_title' => '', - 'edt_action' => '', - 'global_error' => '', - 'global_success' => '', - 'open' => '', - 'ppolicy' => '', - 'profile' => [ - 'discord_tag' => '', - 'edituser' => '', - 'edituser_consequence' => '', - ], - 'reusable' => [ - 'confirm' => '', - ], - 'signin_cta' => '', - 'terms' => '', - 'view_app' => [ - 'denyapp' => '', - ], -]; diff --git a/lang/pt-br.json b/lang/pt-br.json index d4852c8..53cc7bd 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -186,6 +186,7 @@ "Dashboard": "", "Date": "", "Decision & Moderation Tools": "", + "Decline application": "", "Declined": "", "Declined by an admin or withdrawn by the requester": "", "Delete": "", @@ -212,6 +213,7 @@ "Discord Handle": "", "Discord Role ID": "", "Discord role ID": "", + "Discord tag: :discordTag": "", "Dispatch approval event": "", "Dispatches an approval event for the selected application": "", "Dispatches a rejection event for the selected application": "", @@ -226,8 +228,10 @@ "Duration": "", "e.g. Spamming": "", "Edit": "", + "Edit account": "", "Edit Account": "", "Edit form": "", + "Editing :formTitle...": "", "Editor": "", "Edit Team": "", "Edit vacancies": "", @@ -240,6 +244,7 @@ "Ended": "", "entries": "", "ENV": "", + "Error": "", "European?": "", "Event dispatched; Candidate approval sequence initiated.": "", "Event dispatched; Candidate rejection sequence initiated.": "", @@ -296,7 +301,9 @@ "Housekeeping jobs usually run once every day, but if one of them has failed for some reason, you can manually run them here.": "", "How to request a leave of absence": "", "Human Resources": "", + "I am 13 years of age or older and have read and agree with the Community Guidelines<\/a>, Privacy Policy<\/a> and Terms of Service<\/a> set forth.": "", "If an interview is scheduled, you'll need to open your application here and confirm the time, date, and location assigned for you.": "", + "If the setting \"Require Valid Game License\" is activated, editing this field may have unintended consequences. Proceed with caution.": "", "If this form has been updated, new fields and updated questions will not show up here!": "", "If you'd like to learn more about our community, make sure to visit our main website<\/a>!": "", "If you're seeing this message in error, please contact your system administrator.": "", @@ -365,6 +372,7 @@ "Mojang Logo (Minecraft)": "", "Mojang UUID (deprecated)": "", "Move to next stage": "", + "Multi-factor authentication is enabled for your account.": "", "Must contain numerical characters": "", "Must contain special characters": "", "Must contain upper and lower case characters": "", @@ -426,6 +434,7 @@ "permanently.": "", "Permission group": "", "Platform": "", + "Please accept the Community Guidelines, Terms of Service and Privacy Policy to continue.": "", "Please allow up to three days for your application to be processed. Your application will be reviewed by every team member, and will move up in stages.": "", "Please authenticate": "", "Please change update your password now. You won't be able to use the site until you do this.": "", @@ -437,6 +446,7 @@ "Please confirm that you want to suspend this account. You'll need to add a reason and expiration date to confirm this.": "", "Please contact your administrator if you believe this was in error.": "", "Please do not tamper with the URLs. To report a bug, please contact an administrator.": "", + "Please enter a valid (and Premium) Minecraft username! We do not support cracked users.": "", "Please fill out the form below. Keep all answers concise and complete. Please keep in mind that the age requirement is at least :ageUpperLimitSettingValue years old.": "", "Please note: Applications CANNOT be modified once they're submitted!": "", "Please type the above text": "", @@ -520,6 +530,7 @@ "Sign-in": "", "Sign in": "", "Sign in here": "", + "Sign in to your account": "", "Sign out": "", "Sign up": "", "Sign up for an account": "", @@ -544,6 +555,7 @@ "Submit for approval": "", "Submitted": "", "Submitted at": "", + "Success": "", "Successfully logged out other devices. Remember to change your password if you think you've been compromised.": "", "Supported apps you can install:": "", "Suspend": "", @@ -615,6 +627,7 @@ "This query didn't return any results.": "", "This request reached its predicted end date": "", "This setting controls whether people can join the team freely.": "", + "This user has been suspended.": "", "This user has been suspended by the admins. Admins suspend accounts for a variety of reasons, including spam.": "", "This user will receive an email notification asking them to join your team.": "", "This vacancy does not have any details yet.": "", @@ -732,5 +745,6 @@ "Your upcoming interviews": "", "Your vote has been counted!": "", "You will also need to agree to the terms of a LOA. Additionally, you may also specify whether you'll be available to chat occasionally during your absence, but not perform your full duties.": "", - "Zoom": "" + "Zoom": "", + "{1} There is :count open position!|[2,*] There are :count open positions!": "" } \ No newline at end of file diff --git a/lang/pt-br/messages.php b/lang/pt-br/messages.php deleted file mode 100644 index 0295e11..0000000 --- a/lang/pt-br/messages.php +++ /dev/null @@ -1,25 +0,0 @@ - '', - 'dashboard' => '', - 'details_m_title' => '', - 'edt_action' => '', - 'global_error' => '', - 'global_success' => '', - 'open' => '', - 'ppolicy' => '', - 'profile' => [ - 'discord_tag' => '', - 'edituser' => '', - 'edituser_consequence' => '', - ], - 'reusable' => [ - 'confirm' => '', - ], - 'signin_cta' => '', - 'terms' => '', - 'view_app' => [ - 'denyapp' => '', - ], -]; diff --git a/lang/pt.json b/lang/pt.json index d4852c8..53cc7bd 100644 --- a/lang/pt.json +++ b/lang/pt.json @@ -186,6 +186,7 @@ "Dashboard": "", "Date": "", "Decision & Moderation Tools": "", + "Decline application": "", "Declined": "", "Declined by an admin or withdrawn by the requester": "", "Delete": "", @@ -212,6 +213,7 @@ "Discord Handle": "", "Discord Role ID": "", "Discord role ID": "", + "Discord tag: :discordTag": "", "Dispatch approval event": "", "Dispatches an approval event for the selected application": "", "Dispatches a rejection event for the selected application": "", @@ -226,8 +228,10 @@ "Duration": "", "e.g. Spamming": "", "Edit": "", + "Edit account": "", "Edit Account": "", "Edit form": "", + "Editing :formTitle...": "", "Editor": "", "Edit Team": "", "Edit vacancies": "", @@ -240,6 +244,7 @@ "Ended": "", "entries": "", "ENV": "", + "Error": "", "European?": "", "Event dispatched; Candidate approval sequence initiated.": "", "Event dispatched; Candidate rejection sequence initiated.": "", @@ -296,7 +301,9 @@ "Housekeeping jobs usually run once every day, but if one of them has failed for some reason, you can manually run them here.": "", "How to request a leave of absence": "", "Human Resources": "", + "I am 13 years of age or older and have read and agree with the Community Guidelines<\/a>, Privacy Policy<\/a> and Terms of Service<\/a> set forth.": "", "If an interview is scheduled, you'll need to open your application here and confirm the time, date, and location assigned for you.": "", + "If the setting \"Require Valid Game License\" is activated, editing this field may have unintended consequences. Proceed with caution.": "", "If this form has been updated, new fields and updated questions will not show up here!": "", "If you'd like to learn more about our community, make sure to visit our main website<\/a>!": "", "If you're seeing this message in error, please contact your system administrator.": "", @@ -365,6 +372,7 @@ "Mojang Logo (Minecraft)": "", "Mojang UUID (deprecated)": "", "Move to next stage": "", + "Multi-factor authentication is enabled for your account.": "", "Must contain numerical characters": "", "Must contain special characters": "", "Must contain upper and lower case characters": "", @@ -426,6 +434,7 @@ "permanently.": "", "Permission group": "", "Platform": "", + "Please accept the Community Guidelines, Terms of Service and Privacy Policy to continue.": "", "Please allow up to three days for your application to be processed. Your application will be reviewed by every team member, and will move up in stages.": "", "Please authenticate": "", "Please change update your password now. You won't be able to use the site until you do this.": "", @@ -437,6 +446,7 @@ "Please confirm that you want to suspend this account. You'll need to add a reason and expiration date to confirm this.": "", "Please contact your administrator if you believe this was in error.": "", "Please do not tamper with the URLs. To report a bug, please contact an administrator.": "", + "Please enter a valid (and Premium) Minecraft username! We do not support cracked users.": "", "Please fill out the form below. Keep all answers concise and complete. Please keep in mind that the age requirement is at least :ageUpperLimitSettingValue years old.": "", "Please note: Applications CANNOT be modified once they're submitted!": "", "Please type the above text": "", @@ -520,6 +530,7 @@ "Sign-in": "", "Sign in": "", "Sign in here": "", + "Sign in to your account": "", "Sign out": "", "Sign up": "", "Sign up for an account": "", @@ -544,6 +555,7 @@ "Submit for approval": "", "Submitted": "", "Submitted at": "", + "Success": "", "Successfully logged out other devices. Remember to change your password if you think you've been compromised.": "", "Supported apps you can install:": "", "Suspend": "", @@ -615,6 +627,7 @@ "This query didn't return any results.": "", "This request reached its predicted end date": "", "This setting controls whether people can join the team freely.": "", + "This user has been suspended.": "", "This user has been suspended by the admins. Admins suspend accounts for a variety of reasons, including spam.": "", "This user will receive an email notification asking them to join your team.": "", "This vacancy does not have any details yet.": "", @@ -732,5 +745,6 @@ "Your upcoming interviews": "", "Your vote has been counted!": "", "You will also need to agree to the terms of a LOA. Additionally, you may also specify whether you'll be available to chat occasionally during your absence, but not perform your full duties.": "", - "Zoom": "" + "Zoom": "", + "{1} There is :count open position!|[2,*] There are :count open positions!": "" } \ No newline at end of file diff --git a/lang/pt/messages.php b/lang/pt/messages.php deleted file mode 100644 index 0295e11..0000000 --- a/lang/pt/messages.php +++ /dev/null @@ -1,25 +0,0 @@ - '', - 'dashboard' => '', - 'details_m_title' => '', - 'edt_action' => '', - 'global_error' => '', - 'global_success' => '', - 'open' => '', - 'ppolicy' => '', - 'profile' => [ - 'discord_tag' => '', - 'edituser' => '', - 'edituser_consequence' => '', - ], - 'reusable' => [ - 'confirm' => '', - ], - 'signin_cta' => '', - 'terms' => '', - 'view_app' => [ - 'denyapp' => '', - ], -]; diff --git a/resources/views/breadcrumbs/app.blade.php b/resources/views/breadcrumbs/app.blade.php index 7914acd..87108cb 100755 --- a/resources/views/breadcrumbs/app.blade.php +++ b/resources/views/breadcrumbs/app.blade.php @@ -9,13 +9,13 @@ @if (session()->has('error')) @elseif (session()->has('success')) @endif diff --git a/resources/views/dashboard/administration/editform.blade.php b/resources/views/dashboard/administration/editform.blade.php index 264b48c..a7df65b 100755 --- a/resources/views/dashboard/administration/editform.blade.php +++ b/resources/views/dashboard/administration/editform.blade.php @@ -47,7 +47,7 @@
-

{{__('messages.edt_action')}} {{ $title }}...

+

{{__('Editing :formTitle...', ['formTitle' => $title])}}

diff --git a/resources/views/dashboard/dashboard.blade.php b/resources/views/dashboard/dashboard.blade.php index 6155c8a..00c7b1f 100755 --- a/resources/views/dashboard/dashboard.blade.php +++ b/resources/views/dashboard/dashboard.blade.php @@ -3,7 +3,7 @@ @section('title', config('app.name')) @section('content_header') -

{{config('app.name')}} / {{__('messages.dashboard')}}

+

{{config('app.name')}} / {{__('Dashboard')}}

@stop @section('js') @@ -113,7 +113,7 @@
- {{__('messages.open')}} + {{__('Open')}} diff --git a/resources/views/dashboard/user/profile/displayprofile.blade.php b/resources/views/dashboard/user/profile/displayprofile.blade.php index a1a46ea..7966172 100755 --- a/resources/views/dashboard/user/profile/displayprofile.blade.php +++ b/resources/views/dashboard/user/profile/displayprofile.blade.php @@ -24,7 +24,7 @@ {{__('This account has been suspended :suspensionTypeValue', ['suspensionTypeValue' => ($suspensionInfo['isPermanent']) ? __('permanently.') : __('until :date.', ['date' => $suspensionInfo['bannedUntil']])]) }} -

{{__('This user has been suspended by the admins. Admins suspend accounts for a variety of reasons, including spam.')}}

+

{{__('This user has been suspended.')}}

{{$suspensionInfo['reason']}} @@ -112,7 +112,7 @@ @endif - + @if($demoActive)

@@ -225,7 +225,7 @@ - + @if($demoActive)
@@ -246,7 +246,7 @@

- {{__('messages.profile.edituser_consequence')}} + {{__('If the setting "Require Valid Game License" is activated, editing this field may have unintended consequences. Proceed with caution.')}}

diff --git a/resources/views/dashboard/user/profile/userprofile.blade.php b/resources/views/dashboard/user/profile/userprofile.blade.php index c2f1264..d9f1652 100755 --- a/resources/views/dashboard/user/profile/userprofile.blade.php +++ b/resources/views/dashboard/user/profile/userprofile.blade.php @@ -67,7 +67,7 @@
- + diff --git a/resources/views/dashboard/user/viewapp.blade.php b/resources/views/dashboard/user/viewapp.blade.php index 609b4db..cc29daf 100755 --- a/resources/views/dashboard/user/viewapp.blade.php +++ b/resources/views/dashboard/user/viewapp.blade.php @@ -65,7 +65,7 @@
@csrf @method('PATCH') - +
@@ -222,7 +222,7 @@
- +
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 05093d9..b3f67b2 100755 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -9,7 +9,7 @@ @foreach($positions as $position) - + @if (is_null($position->vacancyFullDescription))