From 91f8cc60853e52754ed09678791061be489b60e4 Mon Sep 17 00:00:00 2001
From: okpierre <1679025+okpierre@users.noreply.github.com>
Date: Thu, 21 Nov 2019 16:12:45 -0500
Subject: [PATCH 1/4]  Update site localization

include profiles for NL
---
 resources/lang/nl/site.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/lang/nl/site.php b/resources/lang/nl/site.php
index de13d2f18..5a656ec04 100644
--- a/resources/lang/nl/site.php
+++ b/resources/lang/nl/site.php
@@ -13,4 +13,5 @@ return [
     'contact'           => 'Contact',
     'contact-us'        => 'Neem contact op',
     'places'            => 'Places',
+    'profiles'          => 'Profielen',
 ];

From f1e3bd44e8beab9ce0f5b5d307cc0cfd772c30c6 Mon Sep 17 00:00:00 2001
From: WonderingDane <me@nilarsen.dk>
Date: Wed, 27 Nov 2019 10:23:31 +0100
Subject: [PATCH 2/4] Added Danish navmenu.php

---
 resources/lang/da/navmenu.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 resources/lang/da/navmenu.php

diff --git a/resources/lang/da/navmenu.php b/resources/lang/da/navmenu.php
new file mode 100644
index 000000000..4cd0ecb9f
--- /dev/null
+++ b/resources/lang/da/navmenu.php
@@ -0,0 +1,17 @@
+<?php
+return [
+	'search'			=> 'S&oslash;g',
+	'home'				=> 'Hvem',
+	'local'				=> 'Lokalt',
+	'network'			=> 'Netv&aelig;rk',
+	'discover'			=> 'Opdag',
+	'viewMyProfile'		=> 'Se min profil',
+	'myProfile'			=> 'Min Profil',
+	'myTimeline'		=> 'Min Tidslinje',
+	'publicTimeline'	=> 'Offentlig Tidslinje',
+	'remoteFollow'		=> 'Remote Follow',
+	'settings'			=> 'Indstillinger',
+	'admin'				=> 'Admin',
+	'logout'			=> 'Log ud',
+	'directMessages'	=> 'Direkte Beskeder',
+];

From 908f57f438e6194885b04594a0a3334191940021 Mon Sep 17 00:00:00 2001
From: WonderingDane <me@nilarsen.dk>
Date: Wed, 27 Nov 2019 10:27:45 +0100
Subject: [PATCH 3/4] Adding missing translations

---
 resources/lang/da/notification.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/lang/da/notification.php b/resources/lang/da/notification.php
index 5410a77e6..f2192f845 100644
--- a/resources/lang/da/notification.php
+++ b/resources/lang/da/notification.php
@@ -2,6 +2,11 @@
 
 return [
 
-  'likedPhoto' => 'syntes om dit billede.',
+  'likedPhoto'          => 'syntes om dit billede.',
+  'likedComment'        => 'Syntes om din kommentar.',
+  'startedFollowingYou' => 'f&oslash;lger dig nu.',
+  'commented'           => 'har kommenteret på dit opslag.',
+  'mentionedYou'        => 'har n&aelig;vnt dig.',
+  'shared'				=> 'har delt dit opslag.',
 
 ];

From eb478ccf760414e2fa1abd8278a6894279458950 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Wed, 27 Nov 2019 19:20:41 -0700
Subject: [PATCH 4/4] Update AccountService, fixes #1834

---
 app/Services/AccountService.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/Services/AccountService.php b/app/Services/AccountService.php
index e14aadf80..2ef8a6215 100644
--- a/app/Services/AccountService.php
+++ b/app/Services/AccountService.php
@@ -14,16 +14,16 @@ class AccountService {
 
 	public static function get($id)
 	{
-		$key = self::CACHE_KEY . ':' . $id;
-		$ttl = now()->addHours(12);
-
-		return Cache::remember($key, $ttl, function() use($id) {
-			$fractal = new Fractal\Manager();
-			$fractal->setSerializer(new ArraySerializer());
-			$profile = Profile::whereNull('status')->findOrFail($id);
-			$resource = new Fractal\Resource\Item($profile, new AccountTransformer());
-			return $fractal->createData($resource)->toArray();
-		});
+		// $key = self::CACHE_KEY . ':' . $id;
+		// $ttl = now()->addSeconds(10);
+		// return Cache::remember($key, $ttl, function() use($id) {
+		// });
+		
+		$fractal = new Fractal\Manager();
+		$fractal->setSerializer(new ArraySerializer());
+		$profile = Profile::whereNull('status')->findOrFail($id);
+		$resource = new Fractal\Resource\Item($profile, new AccountTransformer());
+		return $fractal->createData($resource)->toArray();
 	}
 
 }
\ No newline at end of file