Merge pull request #1843 from pixelfed/staging

Staging

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();
 	}
 
 }

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',
+];

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ølger dig nu.',
+  'commented'           => 'har kommenteret på dit opslag.',
+  'mentionedYou'        => 'har nævnt dig.',
+  'shared'				=> 'har delt dit opslag.',
 
 ];

resources/lang/nl/site.php

@@ -13,4 +13,5 @@ return [
     'contact'           => 'Contact',
     'contact-us'        => 'Neem contact op',
     'places'            => 'Places',
+    'profiles'          => 'Profielen',
 ];