Merge branch 'feature/make-404-default-in-english' into 'master'

Show 404 page in English by default

Closes #38

See merge request pleroma/admin-fe!42
This commit is contained in:
Maxim Filippov 2019-09-14 17:43:31 +00:00
commit eeb68bafee

View file

@ -9,12 +9,9 @@
</div> </div>
<div class="bullshit"> <div class="bullshit">
<div class="bullshit__oops">OOPS!</div> <div class="bullshit__oops">OOPS!</div>
<div class="bullshit__info">版权所有
<a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
</div>
<div class="bullshit__headline">{{ message }}</div> <div class="bullshit__headline">{{ message }}</div>
<div class="bullshit__info">请检查您输入的网址是否正确请点击以下按钮返回主页或者发送错误报告</div> <div class="bullshit__info">Please make sure you URL is correct</div>
<router-link to="/" class="bullshit__return-home">返回首页</router-link> <router-link to="/" class="bullshit__return-home">Go to the home page</router-link>
</div> </div>
</div> </div>
</div> </div>
@ -26,7 +23,7 @@ export default {
name: 'Page404', name: 'Page404',
computed: { computed: {
message() { message() {
return '网管说这个页面你不能进......' return 'There is nothing here'
} }
} }
} }
@ -198,7 +195,7 @@ export default {
&__return-home { &__return-home {
display: block; display: block;
float: left; float: left;
width: 110px; width: 165px;
height: 36px; height: 36px;
background: #1482f0; background: #1482f0;
border-radius: 100px; border-radius: 100px;