fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-12-29 12:04:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into avatar-aspect-ratio-fix

Browse source
This commit is contained in:
Alec Armbruster 2023-06-12 13:10:25 -04:00 committed by GitHub
parent 0d868d9005 b0b3d526cf
commit 636d87e4cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/server/index.tsx
View file

@ -346,7 +346,7 @@ async function createSsrHtml(root: string, isoData: IsoDataOptionalSite) {
return ` return `
<!DOCTYPE html> <!DOCTYPE html>
<html ${helmet.htmlAttributes.toString()} lang="en"> <html ${helmet.htmlAttributes.toString()}>
<head> <head>
<script>window.isoData = ${sanitize(JSON.stringify(isoData))}</script> <script>window.isoData = ${sanitize(JSON.stringify(isoData))}</script>
<script>window.lemmyConfig = ${serialize(config)}</script> <script>window.lemmyConfig = ${serialize(config)}</script>

5
src/shared/components/common/html-tags.tsx
View file

@ -2,7 +2,7 @@ import { htmlToText } from "html-to-text";
import { Component } from "inferno"; import { Component } from "inferno";
import { Helmet } from "inferno-helmet"; import { Helmet } from "inferno-helmet";
import { httpExternalPath } from "../../env"; import { httpExternalPath } from "../../env";
import { md } from "../../utils"; import { getLanguages, md } from "../../utils";
interface HtmlTagsProps { interface HtmlTagsProps {
title: string; title: string;
@ -17,9 +17,12 @@ export class HtmlTags extends Component<HtmlTagsProps, any> {
const url = httpExternalPath(this.props.path); const url = httpExternalPath(this.props.path);
const desc = this.props.description; const desc = this.props.description;
const image = this.props.image; const image = this.props.image;
const lang = getLanguages()[0];
return ( return (
<Helmet title={this.props.title}> <Helmet title={this.props.title}>
<html lang={lang == "browser" ? "en" : lang} />
{["title", "og:title", "twitter:title"].map(t => ( {["title", "og:title", "twitter:title"].map(t => (
<meta key={t} property={t} content={this.props.title} /> <meta key={t} property={t} content={this.props.title} />
))} ))}

2
src/shared/components/post/post-listing.tsx
View file

@ -1421,7 +1421,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
this.setState({ showEdit: false }); this.setState({ showEdit: false });
} }
// The actual editing is done in the recieve for post // The actual editing is done in the receive for post
handleEditPost() { handleEditPost() {
this.setState({ showEdit: false }); this.setState({ showEdit: false });
} }