liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: editor locale redirect + welcome page localization

Browse Source
This commit is contained in:
Nick
2019-07-13 20:27:31 -04:00
parent d546695143
commit 6974811658
7 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/views/legacy/login.pug
View File

@@ -2,7 +2,7 @@ extends master.pug
block body
#root
.login-deprecated Your browser is outdated. Upgrade to a #[a(href='https://bestvpn.org/outdatedbrowser/en', rel='nofollow') modern browser].
.login-deprecated!= t('outdatedBrowserWarning', { modernBrowser: '<a href="https://bestvpn.org/outdatedbrowser/en" rel="nofollow">' + t('modernBrowser') + '</a>', interpolation: { escapeValue: false } })
.login
.login-dialog
if err
@@ -12,12 +12,12 @@ block body
select(name='strategy')
each str in formStrategies
option(value=str.key, selected)= str.title
input(type='text', name='user', placeholder='Username / Email')
input(type='password', name='pass', placeholder='Password')
button(type='submit') Login
input(type='text', name='user', placeholder=t('auth:fields.emailUser'))
input(type='password', name='pass', placeholder=t('auth:fields.password'))
button(type='submit')= t('auth:actions.login')
if socialStrategies.length
.login-social
h2 or login using...
h2= t('auth:orLoginUsingStrategy')
each str in socialStrategies
a.login-social-icon(href='/login/' + str.key, class=str.color)
!= str.icon

4
server/views/legacy/page.pug
View File

@@ -10,7 +10,7 @@ block body
#root
.header
span.header-title= siteConfig.title
span.header-deprecated Your browser is outdated. Upgrade to a #[a(href='https://bestvpn.org/outdatedbrowser/en', rel='nofollow') modern browser].
span.header-deprecated!= t('outdatedBrowserWarning', { modernBrowser: '<a href="https://bestvpn.org/outdatedbrowser/en" rel="nofollow">' + t('modernBrowser') + '</a>', interpolation: { escapeValue: false } })
span.header-login
if !isAuthenticated
a(href='/login', title='Login')
@@ -43,7 +43,7 @@ block body
div!= page.render
if page.toc.length
.toc
.toc-title Table of Contents
.toc-title= t('page.toc')
each tocItem, tocIdx in page.toc
a.toc-tile(href='#' + tocItem.anchor)
i.material-icons arrow_right

2
server/views/welcome.pug
View File

@@ -8,6 +8,6 @@ block body
img.animated.fadeIn(src='/svg/logo-wikijs.svg', alt='Wiki.js')
.headline= t('welcome.title')
.subheading.mt-3= t('welcome.subtitle')
v-btn.mt-5(color='primary', href='/e/home', large)
v-btn.mt-5(color='primary', href='/e/' + locale + '/home', large)
v-icon(left) add
span= t('welcome.createhome')