From 001dcb5159191dd0fb5d29688fe44cb4406c2ec9 Mon Sep 17 00:00:00 2001 From: ppoffice Date: Wed, 14 Dec 2022 12:34:16 -0500 Subject: [PATCH] fix(view): use correct moment.js language name --- layout/archive.jsx | 3 ++- layout/common/article.jsx | 5 +++-- layout/common/scripts.jsx | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/layout/archive.jsx b/layout/archive.jsx index 6af952b..b7ce994 100644 --- a/layout/archive.jsx +++ b/layout/archive.jsx @@ -1,5 +1,6 @@ const moment = require('moment'); const { Component, Fragment } = require('inferno'); +const { toMomentLocale } = require('hexo/lib/plugins/helper/date'); const Paginator = require('hexo-component-inferno/lib/view/misc/paginator'); const ArticleMedia = require('hexo-component-inferno/lib/view/common/article_media'); @@ -8,7 +9,7 @@ module.exports = class extends Component { const { config, page, helper } = this.props; const { url_for, __, date_xml, date } = helper; - const language = page.lang || page.language || config.language; + const language = toMomentLocale(page.lang || page.language || config.language); function renderArticleList(posts, year, month = null) { const time = moment([page.year, page.month ? page.month - 1 : null].filter(i => i !== null)); diff --git a/layout/common/article.jsx b/layout/common/article.jsx index 8ae58a3..28d48a9 100644 --- a/layout/common/article.jsx +++ b/layout/common/article.jsx @@ -1,5 +1,6 @@ const moment = require('moment'); const { Component, Fragment } = require('inferno'); +const { toMomentLocale } = require('hexo/lib/plugins/helper/date'); const Share = require('./share'); const Donates = require('./donates'); const Comment = require('./comment'); @@ -23,8 +24,8 @@ module.exports = class extends Component { const { article, plugins } = config; const { url_for, date, date_xml, __, _p } = helper; - const indexLaunguage = config.language || 'en'; - const language = page.lang || page.language || config.language || 'en'; + const indexLaunguage = toMomentLocale(config.language || 'en'); + const language = toMomentLocale(page.lang || page.language || config.language || 'en'); const cover = page.cover ? url_for(page.cover) : null; const updateTime = article && article.update_time !== undefined ? article.update_time : true; const isUpdated = page.updated && !moment(page.date).isSame(moment(page.updated)); diff --git a/layout/common/scripts.jsx b/layout/common/scripts.jsx index e7f6c83..98a85c4 100644 --- a/layout/common/scripts.jsx +++ b/layout/common/scripts.jsx @@ -1,4 +1,5 @@ const { Component, Fragment } = require('inferno'); +const { toMomentLocale } = require('hexo/lib/plugins/helper/date'); const Plugins = require('./plugins'); module.exports = class extends Component { @@ -6,7 +7,7 @@ module.exports = class extends Component { const { site, config, helper, page } = this.props; const { url_for, cdn } = helper; const { article } = config; - const language = page.lang || page.language || config.language || 'en'; + const language = toMomentLocale(page.lang || page.language || config.language || 'en'); let fold = 'unfolded'; let clipboard = true;