UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 08:44:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1843 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2019-11-27 19:21:17 -07:00 committed by GitHub
commit 3eb9e00311
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/Services/AccountService.php
View file

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

17
resources/lang/da/navmenu.php Normal file
View file

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

7
resources/lang/da/notification.php
View file

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

1
resources/lang/nl/site.php
View file

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