From 8e6aab0145019b40cb5517cbb66d2bbe545f0ec9 Mon Sep 17 00:00:00 2001 From: Philip Molares Date: Thu, 11 Mar 2021 12:21:44 +0100 Subject: Templates: Remove lang and add translation parameter Since the interface is not always in english, we mostly removed the lang attribute from all html tags. Since the error messages in error.ejs are not translated, but always in english, there the global lang="en" should be kept. Also in the slide and editor template the div, which contains the user generated text, has the attribute translate="no" now, to avoid unwanted translations. Since on the publish view (pretty.ejs) only the user generated content is shown, we set the lang to the language defined in yaml (or 'en') as a default, but that was also moved to the corresponding markdown div instead of html. Fixes #881 See also #437 Signed-off-by: Philip Molares --- public/views/hedgedoc.ejs | 4 ++-- public/views/html.hbs | 4 ++-- public/views/index.ejs | 2 +- public/views/pretty.ejs | 4 ++-- public/views/slide.ejs | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'public/views') diff --git a/public/views/hedgedoc.ejs b/public/views/hedgedoc.ejs index b4bf816e..725e11c8 100644 --- a/public/views/hedgedoc.ejs +++ b/public/views/hedgedoc.ejs @@ -1,11 +1,11 @@ - + <%- include('hedgedoc/head') %> - + <%- include('hedgedoc/header') %> <%- include('hedgedoc/body') %> <%- include('hedgedoc/footer') %> diff --git a/public/views/html.hbs b/public/views/html.hbs index 7ac97241..7e8268ba 100644 --- a/public/views/html.hbs +++ b/public/views/html.hbs @@ -1,6 +1,6 @@ - + @@ -37,7 +37,7 @@ - + {{{html}}}