Skip to content

Commit

Permalink
fixes #595
Browse files Browse the repository at this point in the history
  • Loading branch information
@austintoddj
austintoddj committed Feb 8, 2020
1 parent 200ce90 commit 01ec767
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 22 deletions.
31 changes: 26 additions & 5 deletions public/js/app.js
View file
Expand Up @@ -119134,7 +119134,10 @@ var render = function() {
_vm._s(_vm.trans.app.published) +
" " +
_vm._s(
_vm.moment(post.published_at).fromNow()
_vm
.moment(post.published_at)
.locale(_vm.Canvas.locale)
.fromNow()
) +
"\n "
)
Expand All @@ -119156,7 +119159,12 @@ var render = function() {
"\n\n ― " +
_vm._s(_vm.trans.app.updated) +
" " +
_vm._s(_vm.moment(post.updated_at).fromNow()) +
_vm._s(
_vm
.moment(post.updated_at)
.locale(_vm.Canvas.locale)
.fromNow()
) +
"\n "
)
])
Expand Down Expand Up @@ -119973,7 +119981,10 @@ var render = function() {
_vm._s(_vm.trans.app.created) +
" " +
_vm._s(
_vm.moment(post.created_at).fromNow()
_vm
.moment(post.created_at)
.locale(_vm.Canvas.locale)
.fromNow()
) +
"\n "
)
Expand Down Expand Up @@ -121030,7 +121041,12 @@ var render = function() {
_vm._v(
_vm._s(_vm.trans.app.created) +
" " +
_vm._s(_vm.moment(tag.created_at).fromNow())
_vm._s(
_vm
.moment(tag.created_at)
.locale(_vm.Canvas.locale)
.fromNow()
)
)
])
])
Expand Down Expand Up @@ -121433,7 +121449,12 @@ var render = function() {
_vm._v(
_vm._s(_vm.trans.app.created) +
" " +
_vm._s(_vm.moment(topic.created_at).fromNow())
_vm._s(
_vm
.moment(topic.created_at)
.locale(_vm.Canvas.locale)
.fromNow()
)
)
])
])
Expand Down
2 changes: 1 addition & 1 deletion public/mix-manifest.json
View file
@@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=deac90027166464c1b14",
"/js/app.js": "/js/app.js?id=e578c15599dbb2807af2",
"/css/app.css": "/css/app.css?id=4668da04599dd9819b07",
"/css/app-dark.css": "/css/app-dark.css?id=f59a9e7b0c03bd8033ba",
"/favicon.ico": "/favicon.ico?id=b3aec2f33a001156e320"
Expand Down
4 changes: 2 additions & 2 deletions resources/js/screens/posts/PostIndex.vue
View file
Expand Up @@ -32,14 +32,14 @@
</p>
<p class="text-muted mb-0">
<span v-if="isPublished(post)">
{{ trans.app.published}} {{ moment(post.published_at).fromNow() }}
{{ trans.app.published}} {{ moment(post.published_at).locale(Canvas.locale).fromNow() }}
</span>

<span v-if="isDraft(post)" class="text-danger">{{ trans.app.draft }}</span>

<span v-if="isScheduled(post)" class="text-danger">{{ trans.app.scheduled }}</span>

― {{ trans.app.updated }} {{ moment(post.updated_at).fromNow() }}
― {{ trans.app.updated }} {{ moment(post.updated_at).locale(Canvas.locale).fromNow() }}
</p>
</div>
<div class="ml-auto d-none d-lg-block pl-3">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/stats/StatsIndex.vue
View file
Expand Up @@ -86,7 +86,7 @@
</div>
<div class="ml-auto d-none d-lg-block">
<span class="text-muted mr-3">{{ suffixedNumber(post.views_count) }} {{ trans.app.views }}</span>
{{ trans.app.created }} {{ moment(post.created_at).fromNow() }}
{{ trans.app.created }} {{ moment(post.created_at).locale(Canvas.locale).fromNow() }}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/tags/TagsIndex.vue
View file
Expand Up @@ -25,7 +25,7 @@
</div>
<div class="ml-auto">
<span class="text-muted mr-3">{{ tag.posts_count }} {{ trans.app.posts }}</span>
<span class="d-none d-md-inline-block">{{ trans.app.created }} {{ moment(tag.created_at).fromNow() }}</span>
<span class="d-none d-md-inline-block">{{ trans.app.created }} {{ moment(tag.created_at).locale(Canvas.locale).fromNow() }}</span>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion resources/js/screens/topics/TopicsIndex.vue
View file
Expand Up @@ -25,7 +25,7 @@
</div>
<div class="ml-auto">
<span class="text-muted mr-3">{{ topic.posts_count }} {{ trans.app.posts }}</span>
<span class="d-none d-md-inline-block">{{ trans.app.created }} {{ moment(topic.created_at).fromNow() }}</span>
<span class="d-none d-md-inline-block">{{ trans.app.created }} {{ moment(topic.created_at).locale(Canvas.locale).fromNow() }}</span>
</div>
</div>

Expand Down
23 changes: 12 additions & 11 deletions src/Canvas.php
View file
Expand Up @@ -19,14 +19,15 @@ public static function scriptVariables()
$emailHash = md5(trim(Str::lower(request()->user()->email)));

return [
'lang' => self::compileLanguageFile(config('app.locale')),
'path' => config('canvas.path'),
'timezone' => config('app.timezone'),
'unsplash' => config('canvas.unsplash.access_key'),
'user' => auth()->user()->only(['name', 'email']),
'avatar' => optional($metaData)->avatar && ! empty(optional($metaData)->avatar) ? $metaData->avatar : "https://secure.gravatar.com/avatar/{$emailHash}?s=500",
'darkMode' => optional($metaData)->dark_mode,
'avatar' => optional($metaData)->avatar && !empty(optional($metaData)->avatar) ? $metaData->avatar : "https://secure.gravatar.com/avatar/{$emailHash}?s=500",
'darkMode' => optional($metaData)->dark_mode,
'lang' => self::compileLanguageFile(config('app.locale')),
'locale' => config('app.locale'),
'maxUpload' => config('canvas.upload_filesize'),
'path' => config('canvas.path'),
'timezone' => config('app.timezone'),
'unsplash' => config('canvas.unsplash.access_key'),
'user' => auth()->user()->only(['name', 'email']),
];
}

Expand All @@ -39,11 +40,11 @@ public static function assetsUpToDate(): bool
{
$path = public_path('vendor/canvas/mix-manifest.json');

if (! File::exists($path)) {
throw new RuntimeException(__('canvas::app.assets_are_not_up_to_date').__('canvas::app.to_update_run').' php artisan canvas:publish');
if (!File::exists($path)) {
throw new RuntimeException(__('canvas::app.assets_are_not_up_to_date') . __('canvas::app.to_update_run') . ' php artisan canvas:publish');
}

return File::get($path) === File::get(__DIR__.'/../public/mix-manifest.json');
return File::get($path) === File::get(__DIR__ . '/../public/mix-manifest.json');
}

/**
Expand All @@ -55,7 +56,7 @@ public static function assetsUpToDate(): bool
*/
private static function compileLanguageFile(string $locale): string
{
$langDirectory = dirname(__DIR__, 1).'/resources/lang';
$langDirectory = dirname(__DIR__, 1) . '/resources/lang';
$file = "{$langDirectory}/{$locale}/app.php";
$lines = collect();
$lines->put('app', include $file);
Expand Down

0 comments on commit 01ec767

Please sign in to comment.