This commit is contained in:
Robin K Wilson 2021-06-02 16:10:44 -07:00
Родитель c29a8dc9e2
Коммит 236ca5d7c1
6 изменённых файлов: 5 добавлений и 38 удалений

Просмотреть файл

@ -39,7 +39,7 @@ In this Privacy Notice, we explain what data may be accessible to Mozilla or oth
- Microsoft Bing Video & Image Search: https://privacy.microsoft.com/en-us/privacystatement
- Tenor: https://tenor.com/legal-privacy
- Sketchfab: https://sketchfab.com/privacy
- Google Poly & YouTube: https://policies.google.com/privacy
- YouTube: https://policies.google.com/privacy
- Twitch: https://www.twitch.tv/p/legal/privacy-policy/
<details open>

2
admin/src/react-components/system-editor.js поставляемый
Просмотреть файл

@ -312,7 +312,7 @@ class SystemEditorComponent extends Component {
<ListItemText
primary={
<span>
Add your API keys for Google Analytics, Sketchfab, Google Poly, Discord, etc. - &nbsp;
Add your API keys for Google Analytics, Sketchfab, Discord, etc. - &nbsp;
<i>Server Settings menu &nbsp;&gt;&nbsp;API Keys tab</i>
</span>
}

18
src/react-components/media-browser.js поставляемый
Просмотреть файл

@ -25,7 +25,6 @@ const PRIVACY_POLICY_LINKS = {
images: "https://privacy.microsoft.com/en-us/privacystatement",
gifs: "https://tenor.com/legal-privacy",
sketchfab: "https://sketchfab.com/privacy",
poly: "https://policies.google.com/privacy",
youtube: "https://policies.google.com/privacy",
twitch: "https://www.twitch.tv/p/legal/privacy-policy/"
};
@ -52,18 +51,6 @@ const DEFAULT_FACETS = {
{ text: "Sports", params: { filter: "sports-fitness" } },
{ text: "Weapons", params: { filter: "weapons-military" } }
],
poly: [
{ text: "Featured", params: { filter: "" } },
{ text: "Animals", params: { filter: "animals" } },
{ text: "Architecture", params: { filter: "architecture" } },
{ text: "Art", params: { filter: "art" } },
{ text: "Food", params: { filter: "food" } },
{ text: "Nature", params: { filter: "nature" } },
{ text: "Objects", params: { filter: "objects" } },
{ text: "People", params: { filter: "people" } },
{ text: "Scenes", params: { filter: "scenes" } },
{ text: "Transport", params: { filter: "transport" } }
],
avatars: [
{ text: "Featured", params: { filter: "featured" } },
{ text: "My Avatars", params: { filter: "my-avatars" } },
@ -94,10 +81,6 @@ const poweredByMessages = defineMessages({
id: "media-browser.powered_by.sketchfab",
defaultMessage: "Search by Sketchfab"
},
poly: {
id: "media-browser.powered_by.poly",
defaultMessage: "Search by Google"
},
twitch: {
id: "media-browser.powered_by.twitch",
defaultMessage: "Search by Twitch"
@ -132,7 +115,6 @@ const searchPlaceholderMessages = defineMessages({
gifs: { id: "media-browser.search-placeholder.gifs", defaultMessage: "Search for GIFs..." },
twitch: { id: "media-browser.search-placeholder.twitch", defaultMessage: "Search for Twitch streams..." },
sketchfab: { id: "media-browser.search-placeholder.sketchfab", defaultMessage: "Search Sketchfab Models..." },
poly: { id: "media-browser.search-placeholder.poly", defaultMessage: "Search Google Poly Models..." },
default: { id: "media-browser.search-placeholder.default", defaultMessage: "Search..." }
});

1
src/react-components/room/MediaTiles.js поставляемый
Просмотреть файл

@ -14,7 +14,6 @@ import { ReactComponent as ExternalLinkIcon } from "../icons/ExternalLink.svg";
const PUBLISHER_FOR_ENTRY_TYPE = {
sketchfab_model: "Sketchfab",
poly_model: "Google Poly",
twitch_stream: "Twitch"
};

16
src/react-components/room/ObjectUrlModal.js поставляемый
Просмотреть файл

@ -62,7 +62,7 @@ export function ObjectUrlModal({ showModelCollectionLink, modelCollectionUrl, on
{showModelCollectionLink ? (
<FormattedMessage
id="object-url-modal.message-with-collection"
defaultMessage="Upload or paste a URL to an image, video, model, or scene. Models can be found on <sketchfablink>Sketchfab</sketchfablink> and <polylink>Google Poly</polylink>, or our <collectionlink>collection</collectionlink>."
defaultMessage="Upload or paste a URL to an image, video, model, or scene. Models can be found on <sketchfablink>Sketchfab</sketchfablink> or our <collectionlink>collection</collectionlink>."
values={{
// eslint-disable-next-line react/display-name
sketchfablink: chunks => (
@ -75,12 +75,6 @@ export function ObjectUrlModal({ showModelCollectionLink, modelCollectionUrl, on
</a>
),
// eslint-disable-next-line react/display-name
polylink: chunks => (
<a href="http://poly.google.com/" target="_blank" rel="noopener noreferrer">
{chunks}
</a>
),
// eslint-disable-next-line react/display-name
collectionlink: chunks => (
<a href={modelCollectionUrl} target="_blank" rel="noopener noreferrer">
{chunks}
@ -91,7 +85,7 @@ export function ObjectUrlModal({ showModelCollectionLink, modelCollectionUrl, on
) : (
<FormattedMessage
id="object-url-modal.message"
defaultMessage="Upload or paste a URL to an image, video, model, or scene. Models can be found on <sketchfablink>Sketchfab</sketchfablink> and <polylink>Google Poly</polylink>."
defaultMessage="Upload or paste a URL to an image, video, model, or scene. Models can be found on <sketchfablink>Sketchfab</sketchfablink>."
values={{
// eslint-disable-next-line react/display-name
sketchfablink: chunks => (
@ -102,12 +96,6 @@ export function ObjectUrlModal({ showModelCollectionLink, modelCollectionUrl, on
>
{chunks}
</a>
),
// eslint-disable-next-line react/display-name
polylink: chunks => (
<a href="http://poly.google.com/" target="_blank" rel="noopener noreferrer">
{chunks}
</a>
)
}}
/>

4
src/react-components/room/RoomSidebar.js поставляемый
Просмотреть файл

@ -20,9 +20,7 @@ function SceneAttribution({ attribution }) {
if (attribution.url) {
const source = attribution.url.includes("sketchfab.com")
? "Sketchfab"
: attribution.url.includes("poly.google.com")
? "Google Poly"
: null;
: null;
return (
<li className={styles.attribution}>