Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update source #2

Merged
merged 7 commits into from
Jan 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Models/Poll.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function setTitleAttribute($title)
public function makeSlugFromTitle($title)
{
$slug = \strlen($title) > 20 ? \substr(Str::slug($title), 0, 20) : Str::slug($title);
$count = $this->where('slug', 'LIKE', \sprintf('%%s%', $slug))->count();
$count = $this->where('slug', 'LIKE', '%'.$slug.'%')->count();

return $count ? \sprintf('%s-%s', $slug, $count) : $slug;
}
Expand Down
4 changes: 2 additions & 2 deletions resources/lang/da/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
'veteran' => 'Erfaren med private trackere',
'welcome' => 'Velkommen tilbage!',
'welcome-restore' => 'Velkommen tilbage! Din konto er ikke længere deaktiveret!',
/*

/*
|--------------------------------------------------------------------------
| Two Step Authentication Language Lines
|--------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions resources/lang/da/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
'no-soft-warning' => 'Der er ingen slettede advarsler i databasen for denne bruger!',
'no-warning' => 'Der er ingen advarsler i databasen for denne bruger!',
'not-authorized' => 'Du er ikke autoriseret til at se denne side. Dette medlem foretrækker at være skjult som en ninja!',
'not-satisfied-not-immune' => 'Ikke tilfredstillet/Ikke immun',
'not-satisfied-not-immune' => 'Ikke tilfredstillet/Ikke immun',
'note' => 'Note',
'notification' => 'Notifikation',
'notification-settings' => 'Notifikationsindstillinger',
Expand Down Expand Up @@ -264,7 +264,7 @@
'reset-rss-help' => 'Du bliver nødt til at indlæse alle dine aktive RSS-feeds igen, efter at du har nulstillet RID',
'resurrections' => 'Genoplivninger',
'restore' => 'Gendan',
'satisfied-immune' => 'Tilfredstillende/Immun',
'satisfied-immune' => 'Tilfredstillende/Immun',
'search' => 'Hurtigsøgning via brugernavn/email',
'security' => 'Sikkerhed',
'security-settings' => 'Sikkerhedsindstillinger',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
'album' => 'Album',
'amount' => 'Amount',
'anonymous' => 'Anonymous',
'article' => 'Article',
'ascending' => 'Ascending',
'author' => 'Author',
'balance' => 'Balance',
Expand Down
1 change: 1 addition & 0 deletions resources/lang/en/staff.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
'application-type' => 'Type',
'application-image-proofs'=> 'Image Proofs',
'application-referrer' => 'Referrer',
'article-content' => 'Content',
'bans-log' => 'Bans Log',
'blocks' => 'Blocks',
'bot' => 'Bot',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/emails/deny_application.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@component('mail::message')
# Your {{ config('other.title') }} Application
Your application has been denied for the following reason:
{{ $denied_message }}
{{ $deniedMessage }}
Thanks,
{{ config('other.title') }}
@endcomponent