From 0266ad7250b0c54fed7e077f333bd0ef82ca4234 Mon Sep 17 00:00:00 2001 From: Simon Lecoq <22963968+lowlighter@users.noreply.github.com> Date: Tue, 10 May 2022 00:50:52 +0200 Subject: [PATCH] fix(plugins/languages): recent languages description says `NaN` when no commits found (#1038) [skip ci] --- source/templates/classic/partials/languages.ejs | 5 ++++- source/templates/repository/partials/languages.ejs | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/templates/classic/partials/languages.ejs b/source/templates/classic/partials/languages.ejs index eff6e8f9..dbe3aa59 100644 --- a/source/templates/classic/partials/languages.ejs +++ b/source/templates/classic/partials/languages.ejs @@ -23,7 +23,10 @@ <% if (languages.length) { %> estimation from <%= f(plugins.languages["stats.recent"]?.total) %>b of code in <%= plugins.languages["stats.recent"]?.files %> edited file<%= s(plugins.languages["stats.recent"]?.files) %> across <%= plugins.languages["stats.recent"]?.commits %> commit<%= s(plugins.languages["stats.recent"]?.commits) %> over last <%= plugins.languages["stats.recent"]?.latest ?? plugins.languages["stats.recent"]?.days %> day<%= s(plugins.languages["stats.recent"]?.latest ?? plugins.languages["stats.recent"]?.days) %> <% } else { %> - No recent push activity found over last <%= plugins.languages["stats.recent"]?.latest ?? plugins.languages["stats.recent"]?.days %> day<%= s(plugins.languages["stats.recent"]?.latest ?? plugins.languages["stats.recent"]?.days) %> + No recent push activity found + <% { const days = plugins.languages["stats.recent"]?.latest ?? plugins.languages["stats.recent"]?.days; if (days) { %> + over last <%= days %> day<%= s(days) %> + <% } } %> <% } %> <% } else if ((section === "most-used")&&(plugins.languages.indepth)) { %> diff --git a/source/templates/repository/partials/languages.ejs b/source/templates/repository/partials/languages.ejs index 0a5a77cf..14f7c0d5 100644 --- a/source/templates/repository/partials/languages.ejs +++ b/source/templates/repository/partials/languages.ejs @@ -20,7 +20,10 @@ <% } else { const width = 460 * (1 + large) %> <% if (section === "recently-used") { %> - estimation from <%= plugins.languages["stats.recent"]?.files %> edited file<%= s(plugins.languages["stats.recent"]?.files) %> from <%= plugins.languages["stats.recent"]?.commits %> commit<%= s(plugins.languages["stats.recent"]?.commits) %> over last <%= plugins.languages["stats.recent"]?.days %> day<%= s(plugins.languages["stats.recent"]?.days) %> + estimation from <%= plugins.languages["stats.recent"]?.files %> edited file<%= s(plugins.languages["stats.recent"]?.files) %> from <%= plugins.languages["stats.recent"]?.commits %> commit<%= s(plugins.languages["stats.recent"]?.commits) %> + <% { const days = plugins.languages["stats.recent"]?.latest ?? plugins.languages["stats.recent"]?.days; if (days) { %> + over last <%= days %> day<%= s(days) %> + <% } } %> <% } %>