mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-09-20 07:59:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #468 from codimd/fix/moment-js-locale

Browse source 
[1.x] Fix: Set moment.js locale to users' locale (#275)
This commit is contained in:
David Mehren 2020-08-19 19:36:04 +02:00 committed by GitHub
commit 8cf41ee669
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
locales/en.json
View file

@ -124,5 +124,7 @@
"Limited - Signed-in people can edit (forbid guests)": "Limited - Signed-in people can edit (forbid guests)",
"Locked - Only owner can edit": "Locked - Only owner can edit",
"Protected - Only owner can edit (forbid guests)": "Protected - Only owner can edit (forbid guests)",
"Private - Only owner can view & edit": "Private - Only owner can view & edit"
"Private - Only owner can view & edit": "Private - Only owner can view & edit",
"changed": "changed",
"created": "created"
}

10
public/js/extra.js
View file

@ -27,6 +27,7 @@ require('prismjs/components/prism-makefile')
require('prismjs/components/prism-gherkin')
require('./lib/common/login')
require('./locale')
require('../vendor/md-toc')
var Viz = require('viz.js')
const ui = getUIElements()
@ -35,7 +36,8 @@ const ui = getUIElements()
window.createtime = null
window.lastchangetime = null
window.lastchangeui = {
status: $('.ui-status-lastchange'),
statusChanged: $('.ui-status-lastchange.changed'),
statusCreated: $('.ui-status-lastchange.created'),
time: $('.ui-lastchange'),
user: $('.ui-lastchangeuser'),
nouser: $('.ui-no-lastchangeuser')
@ -47,9 +49,11 @@ export function updateLastChange () {
if (!window.lastchangeui) return
if (window.createtime) {
if (window.createtime && !window.lastchangetime) {
window.lastchangeui.status.text('created')
window.lastchangeui.statusChanged.hide()
window.lastchangeui.statusCreated.show()
} else {
window.lastchangeui.status.text('changed')
window.lastchangeui.statusChanged.show()
window.lastchangeui.statusCreated.hide()
}
const time = window.lastchangetime || window.createtime
window.lastchangeui.time.html(moment(time).fromNow())

56
public/js/locale.js
View file

@ -1,32 +1,40 @@
/* eslint-env browser, jquery */
/* global Cookies */
var lang = 'en'
var userLang = navigator.language || navigator.userLanguage
var userLangCode = userLang.split('-')[0]
var locale = $('.ui-locale')
var supportLangs = []
$('.ui-locale option').each(function () {
supportLangs.push($(this).val())
})
if (Cookies.get('locale')) {
lang = Cookies.get('locale')
if (lang === 'zh') {
lang = 'zh-TW'
const supported = ['en', 'zh-CN', 'zh-TW', 'fr', 'de', 'ja', 'es', 'ca', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl', 'uk', 'hi', 'sv', 'eo', 'da', 'ko', 'id', 'sr', 'vi', 'ar', 'cs', 'sk']
function detectLang () {
if (Cookies.get('locale')) {
let lang = Cookies.get('locale')
if (lang === 'zh') {
lang = 'zh-TW'
}
return lang
}
} else if (supportLangs.indexOf(userLang) !== -1) {
lang = supportLangs[supportLangs.indexOf(userLang)]
} else if (supportLangs.indexOf(userLangCode) !== -1) {
lang = supportLangs[supportLangs.indexOf(userLangCode)]
const userLang = navigator.language || navigator.userLanguage
const userLangCode = userLang.split('-')[0]
if (supported.includes(userLangCode)) {
return userLangCode
} else if (supported.includes(userLang)) {
return userLang
}
return 'en'
}
locale.val(lang)
$('select.ui-locale option[value="' + lang + '"]').attr('selected', 'selected')
const lang = detectLang()
const localeSelector = $('.ui-locale')
locale.change(function () {
Cookies.set('locale', $(this).val(), {
expires: 365,
sameSite: 'strict'
// the following condition is needed as the selector is only available in the intro/history page
if (localeSelector.length > 0) {
localeSelector.val(lang)
$('select.ui-locale option[value="' + lang + '"]').attr('selected', 'selected')
localeSelector.change(function () {
Cookies.set('locale', $(this).val(), {
expires: 365,
sameSite: 'strict'
})
window.location.reload()
})
window.location.reload()
})
}
window.moment.locale(lang)

5
public/views/codimd/body.ejs
View file

@ -7,8 +7,9 @@
<small>
<span>
<span class="ui-lastchangeuser" style="display: none;">&thinsp;<i class="ui-user-icon small" data-toggle="tooltip" data-placement="right"></i></span>
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>
&nbsp;<span class="text-uppercase ui-status-lastchange"></span>
<span class="ui-no-lastchangeuser">&thinsp;<i class="fa fa-clock-o fa-fw" style="width: 18px;"></i></span>&nbsp;
<span class="text-uppercase ui-status-lastchange changed"><%= __('changed') %></span>
<span class="text-uppercase ui-status-lastchange created"><%= __('created') %></span>
<span class="ui-lastchange text-uppercase"></span>
</span>
<span class="ui-permission dropdown pull-right">