Merge pull request #2 from HDInnovations/master

update source
Globbered · Jan 11, 2021 · db0b6e5 · db0b6e5
2 parents b6496b4 + 7679d1b
commit db0b6e5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/app/Models/Poll.php b/app/Models/Poll.php
@@ -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;
     }

diff --git a/resources/lang/da/auth.php b/resources/lang/da/auth.php
@@ -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
     |--------------------------------------------------------------------------

diff --git a/resources/lang/da/user.php b/resources/lang/da/user.php
@@ -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',
@@ -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',

diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
@@ -31,6 +31,7 @@
     'album'                => 'Album',
     'amount'               => 'Amount',
     'anonymous'            => 'Anonymous',
+    'article'              => 'Article',
     'ascending'            => 'Ascending',
     'author'               => 'Author',
     'balance'              => 'Balance',

diff --git a/resources/lang/en/staff.php b/resources/lang/en/staff.php
@@ -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',

diff --git a/resources/views/emails/deny_application.blade.php b/resources/views/emails/deny_application.blade.php
@@ -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