Merge branch 'develop' into travis/better-room-sorting
This commit is contained in:
Travis Ralston
commit
da4d1cfed4
31 changed files with 855 additions and 82 deletions
|
|
@ -31,6 +31,7 @@ import sessionStore from '../../stores/SessionStore';
|
|||
import MatrixClientPeg from '../../MatrixClientPeg';
|
||||
import SettingsStore from "../../settings/SettingsStore";
|
||||
import RoomListStore from "../../stores/RoomListStore";
|
||||
import { getHomePageUrl } from '../../utils/pages';
|
||||
|
||||
import TagOrderActions from '../../actions/TagOrderActions';
|
||||
import RoomListActions from '../../actions/RoomListActions';
|
||||
|
|
@ -459,17 +460,7 @@ const LoggedInView = React.createClass({
|
|||
|
||||
case PageTypes.HomePage:
|
||||
{
|
||||
const pagesConfig = this.props.config.embeddedPages;
|
||||
let pageUrl = null;
|
||||
if (pagesConfig) {
|
||||
pageUrl = pagesConfig.homeUrl;
|
||||
}
|
||||
if (!pageUrl) {
|
||||
// This is a deprecated config option for the home page
|
||||
// (despite the name, given we also now have a welcome
|
||||
// page, which is not the same).
|
||||
pageUrl = this.props.config.welcomePageUrl;
|
||||
}
|
||||
const pageUrl = getHomePageUrl(this.props.config);
|
||||
pageElement = <EmbeddedPage className="mx_HomePage"
|
||||
url={pageUrl}
|
||||
scrollbar={true}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import * as Lifecycle from '../../Lifecycle';
|
|||
// LifecycleStore is not used but does listen to and dispatch actions
|
||||
require('../../stores/LifecycleStore');
|
||||
import PageTypes from '../../PageTypes';
|
||||
import { getHomePageUrl } from '../../utils/pages';
|
||||
|
||||
import createRoom from "../../createRoom";
|
||||
import KeyRequestHandler from '../../KeyRequestHandler';
|
||||
|
|
@ -1198,8 +1199,12 @@ export default React.createClass({
|
|||
} else {
|
||||
if (MatrixClientPeg.get().isGuest()) {
|
||||
dis.dispatch({action: 'view_welcome_page'});
|
||||
} else {
|
||||
} else if (getHomePageUrl(this.props.config)) {
|
||||
dis.dispatch({action: 'view_home_page'});
|
||||
} else {
|
||||
this.firstSyncPromise.promise.then(() => {
|
||||
dis.dispatch({action: 'view_next_room'});
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -282,18 +282,10 @@ const RoomSubList = React.createClass({
|
|||
this.setState({scrollTop: this.refs.scroller.getScrollTop()});
|
||||
},
|
||||
|
||||
_getRenderItems: function() {
|
||||
// try our best to not create a new array
|
||||
// because LazyRenderList rerender when the items prop
|
||||
// is not the same object as the previous value
|
||||
const {list, extraTiles} = this.props;
|
||||
if (!extraTiles || !extraTiles.length) {
|
||||
return list;
|
||||
}
|
||||
if (!list || list.length) {
|
||||
return extraTiles;
|
||||
}
|
||||
return list.concat(extraTiles);
|
||||
_canUseLazyListRendering() {
|
||||
// for now disable lazy rendering as they are already rendered tiles
|
||||
// not rooms like props.list we pass to LazyRenderList
|
||||
return !this.props.extraTiles || !this.props.extraTiles.length;
|
||||
},
|
||||
|
||||
render: function() {
|
||||
|
|
@ -310,7 +302,7 @@ const RoomSubList = React.createClass({
|
|||
return <div ref="subList" className={subListClasses}>
|
||||
{this._getHeaderJsx(isCollapsed)}
|
||||
</div>;
|
||||
} else {
|
||||
} else if (this._canUseLazyListRendering()) {
|
||||
return <div ref="subList" className={subListClasses}>
|
||||
{this._getHeaderJsx(isCollapsed)}
|
||||
<IndicatorScrollbar ref="scroller" className="mx_RoomSubList_scroll" onScroll={ this._onScroll }>
|
||||
|
|
@ -319,7 +311,16 @@ const RoomSubList = React.createClass({
|
|||
height={ this.state.scrollerHeight }
|
||||
renderItem={ this.makeRoomTile }
|
||||
itemHeight={34}
|
||||
items={this._getRenderItems()} />
|
||||
items={ this.props.list } />
|
||||
</IndicatorScrollbar>
|
||||
</div>;
|
||||
} else {
|
||||
const roomTiles = this.props.list.map(r => this.makeRoomTile(r));
|
||||
const tiles = roomTiles.concat(this.props.extraTiles);
|
||||
return <div ref="subList" className={subListClasses}>
|
||||
{this._getHeaderJsx(isCollapsed)}
|
||||
<IndicatorScrollbar ref="scroller" className="mx_RoomSubList_scroll" onScroll={ this._onScroll }>
|
||||
{ tiles }
|
||||
</IndicatorScrollbar>
|
||||
</div>;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -211,6 +211,14 @@ module.exports = React.createClass({
|
|||
// forget what we wanted, so don't overwrite the saved state unless
|
||||
// this appears to be a user-initiated scroll.
|
||||
if (sn.scrollTop != this._lastSetScroll) {
|
||||
// when scrolling, we don't care about disappearing typing notifs shrinking the timeline
|
||||
// this might cause the scrollbar to resize in case the max-height was not correct
|
||||
// but that's better than ending up with a lot of whitespace at the bottom of the timeline.
|
||||
// we need to above check because when showing the typing notifs, an onScroll event is also triggered
|
||||
if (!this.isAtBottom()) {
|
||||
this.clearBlockShrinking();
|
||||
}
|
||||
|
||||
this._saveScrollState();
|
||||
} else {
|
||||
debuglog("Ignoring scroll echo");
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ export class TopLeftMenu extends React.Component {
|
|||
constructor() {
|
||||
super();
|
||||
this.viewHomePage = this.viewHomePage.bind(this);
|
||||
this.viewWelcomePage = this.viewWelcomePage.bind(this);
|
||||
this.openSettings = this.openSettings.bind(this);
|
||||
this.signIn = this.signIn.bind(this);
|
||||
this.signOut = this.signOut.bind(this);
|
||||
|
|
@ -67,9 +66,6 @@ export class TopLeftMenu extends React.Component {
|
|||
|
||||
return <div className="mx_TopLeftMenu">
|
||||
{homePageSection}
|
||||
<ul className="mx_TopLeftMenu_section">
|
||||
<li className="mx_TopLeftMenu_icon_welcome" onClick={this.viewWelcomePage}>{_t("Welcome")}</li>
|
||||
</ul>
|
||||
<ul className="mx_TopLeftMenu_section">
|
||||
<li className="mx_TopLeftMenu_icon_settings" onClick={this.openSettings}>{_t("Settings")}</li>
|
||||
</ul>
|
||||
|
|
@ -82,11 +78,6 @@ export class TopLeftMenu extends React.Component {
|
|||
this.closeMenu();
|
||||
}
|
||||
|
||||
viewWelcomePage() {
|
||||
dis.dispatch({action: 'view_welcome_page'});
|
||||
this.closeMenu();
|
||||
}
|
||||
|
||||
openSettings() {
|
||||
dis.dispatch({action: 'view_user_settings'});
|
||||
this.closeMenu();
|
||||
|
|
|
|||
|
|
@ -20,14 +20,12 @@ import { _t } from '../../../languageHandler';
|
|||
|
||||
export default (props) => {
|
||||
const existingIssuesUrl = "https://github.com/vector-im/riot-web/issues" +
|
||||
"?q=is%3Aopen+is%3Aissue+label%3Aredesign+sort%3Areactions-%2B1-desc";
|
||||
const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new" +
|
||||
"?assignees=&labels=redesign&template=redesign_issue.md&title=";
|
||||
"?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc";
|
||||
const newIssueUrl = "https://github.com/vector-im/riot-web/issues/new";
|
||||
|
||||
const description1 =
|
||||
_t("Thanks for testing the Riot Redesign. " +
|
||||
"If you run into any bugs or visual issues, " +
|
||||
"please let us know on GitHub.");
|
||||
_t("If you run into any bugs or have feedback you'd like to share, " +
|
||||
"please let us know on GitHub.");
|
||||
const description2 = _t("To help avoid duplicate issues, " +
|
||||
"please <existingIssuesLink>view existing issues</existingIssuesLink> " +
|
||||
"first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> " +
|
||||
|
|
|
|||
|
|
@ -73,12 +73,6 @@ export default class LazyRenderList extends React.Component {
|
|||
}
|
||||
}
|
||||
|
||||
shouldComponentUpdate(nextProps, nextState) {
|
||||
const itemsChanged = nextProps.items !== this.props.items;
|
||||
const rangeChanged = nextState.renderRange !== this.state.renderRange;
|
||||
return itemsChanged || rangeChanged;
|
||||
}
|
||||
|
||||
render() {
|
||||
const {itemHeight, items, renderItem} = this.props;
|
||||
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ export default React.createClass({
|
|||
const classes = classNames('mx_RoomTile mx_RoomTile_highlight', {
|
||||
'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
|
||||
'mx_RoomTile_selected': this.state.selected,
|
||||
'mx_GroupInviteTile': true,
|
||||
});
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -126,6 +126,26 @@ export default class HelpSettingsTab extends React.Component {
|
|||
);
|
||||
}
|
||||
|
||||
_renderCredits() {
|
||||
// Note: This is not translated because it is legal text.
|
||||
// Also, is ugly but necessary.
|
||||
return (
|
||||
<div className='mx_SettingsTab_section'>
|
||||
<span className='mx_SettingsTab_subheading'>{_t("Credits")}</span>
|
||||
<ul>
|
||||
<li>
|
||||
The <a href="themes/riot/img/backgrounds/valley.jpg" rel="noopener" target="_blank">
|
||||
default cover photo</a> is (C)
|
||||
<a href="https://www.flickr.com/golan" rel="noopener" target="_blank">Jesús Roncero</a>
|
||||
used under the terms of
|
||||
<a href="https://creativecommons.org/licenses/by-sa/4.0/" rel="noopener" target="_blank">
|
||||
CC-BY-SA 4.0</a>. No warranties are given.
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
render() {
|
||||
let faqText = _t('For help with using Riot, click <a>here</a>.', {}, {
|
||||
'a': (sub) => <a href="https://about.riot.im/need-help/" rel='noopener' target='_blank'>{sub}</a>,
|
||||
|
|
@ -211,6 +231,7 @@ export default class HelpSettingsTab extends React.Component {
|
|||
</div>
|
||||
</div>
|
||||
{this._renderLegal()}
|
||||
{this._renderCredits()}
|
||||
<div className='mx_SettingsTab_section mx_HelpSettingsTab_versions'>
|
||||
<span className='mx_SettingsTab_subheading'>{_t("Advanced")}</span>
|
||||
<div className='mx_SettingsTab_subsectionText'>
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ _td("Light bulb");
|
|||
_td("Book");
|
||||
_td("Pencil");
|
||||
_td("Paperclip");
|
||||
_td("Scisors");
|
||||
_td("Scissors");
|
||||
_td("Padlock");
|
||||
_td("Key");
|
||||
_td("Hammer");
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@
|
|||
"This setting cannot be changed later!": "Тази настройка не може да бъде променена по-късно!",
|
||||
"Unknown error": "Неизвестна грешка",
|
||||
"Incorrect password": "Неправилна парола",
|
||||
"Deactivate Account": "Деактивация на профила",
|
||||
"Deactivate Account": "Затвори акаунта",
|
||||
"Deactivate my account": "Деактивирай моя профил",
|
||||
"Device name": "Име на устройство",
|
||||
"Device key": "Ключ на устройство",
|
||||
|
|
@ -1185,7 +1185,7 @@
|
|||
"Encrypting": "Шифроване",
|
||||
"Encrypted, not sent": "Шифровано, неизпратено",
|
||||
"Share Link to User": "Сподели връзка с потребител",
|
||||
"Share room": "Сподели стая",
|
||||
"Share room": "Сподели стаята",
|
||||
"Share Room": "Споделяне на стая",
|
||||
"Link to most recent message": "Създай връзка към най-новото съобщение",
|
||||
"Share User": "Споделяне на потребител",
|
||||
|
|
@ -1515,7 +1515,6 @@
|
|||
"2018 theme": "Тема 2018",
|
||||
"Account management": "Управление на акаунта",
|
||||
"Deactivating your account is a permanent action - be careful!": "Деактивирането на акаунта е необратимо действие - внимавайте!",
|
||||
"Deactivate Account": "Затвори акаунта",
|
||||
"For help with using Riot, click <a>here</a>.": "За помощ при използването на Riot, кликнете <a>тук</a>.",
|
||||
"For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "За помощ при използването на Riot, кликнете <a>тук</a> или започнете чат с бота ни използвайки бутона по-долу.",
|
||||
"Chat with Riot Bot": "Чати с Riot Bot",
|
||||
|
|
@ -1727,5 +1726,42 @@
|
|||
"This homeserver does not support login using email address.": "Този сървър не поддържа влизане в профил посредством имейл адрес.",
|
||||
"Guest access is disabled on this homeserver.": "Достъпът за гости е изключен на този сървър.",
|
||||
"Registration has been disabled on this homeserver.": "Регистрацията е изключена на този сървър.",
|
||||
"Unable to query for supported registration methods.": "Неуспешно взимане на поддържаните методи за регистрация."
|
||||
"Unable to query for supported registration methods.": "Неуспешно взимане на поддържаните методи за регистрация.",
|
||||
"Show recent room avatars above the room list (refresh to apply changes)": "Показвай снимки на скоро-използваните стаи над списъка със стаите (презаредете за да влезе в сила)",
|
||||
"Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Сигурни ли сте? Ако нямате работещо резервно копие на ключовете, ще загубите достъп до шифрованите съобщения.",
|
||||
"Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Шифрованите съобщения са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключове за четенето им.",
|
||||
"Restore from Backup": "Възстанови от резервно копие",
|
||||
"This device is backing up your keys. ": "Това устройство прави резервни копия на ключовете. ",
|
||||
"This device is <b>not backing up your keys</b>.": "Това устройство <b>не прави резервно копия на ключовете</b>.",
|
||||
"Back up your keys before signing out to avoid losing them.": "Направете резервно копие на ключовете преди изход от профила, за да не ги загубите.",
|
||||
"Use key backup": "Използвай резервно копие на ключовете",
|
||||
"Your keys are <b>not being backed up from this device</b>.": "<b>Това устройство не прави резервно копие</b> на ключовете Ви.",
|
||||
"Start using Key Backup": "Започни използване на резервни копия за ключове",
|
||||
"Use Key Backup": "Използвай резервно копие на ключовете",
|
||||
"Never lose encrypted messages": "Никога не губете шифровани съобщения",
|
||||
"Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Съобщенията в тази стая са защитени с шифроване от край до край. Само Вие и получателят (получателите) имате ключове за разчитането им.",
|
||||
"Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Правете защитено резервно копие на ключовете, за да не ги загубите. <a>Научи повече.</a>",
|
||||
"Not now": "Не сега",
|
||||
"Don't ask me again": "Не ме питай пак",
|
||||
"Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Нищо не се появява? Не всички клиенти поддържат интерактивно потвърждение. <button>Използвай стария метод за потвърждение</button>.",
|
||||
"I don't want my encrypted messages": "Не искам шифрованите си съобщения",
|
||||
"Manually export keys": "Експортирай ключове ръчно",
|
||||
"You'll lose access to your encrypted messages": "Ще загубите достъп до шифрованите си съобщения",
|
||||
"Are you sure you want to sign out?": "Сигурни ли сте, че искате да излезете от профила?",
|
||||
"<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Внимание</b>: настройването на резервно копие на ключовете трябва да се прави само от доверен компютър.",
|
||||
"Hide": "Скрий",
|
||||
"We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Ще съхраним шифровано копие на ключовете на сървърът ни. Предпазете резервното копие с парола.",
|
||||
"For maximum security, this should be different from your account password.": "За максимална сигурност, по-добре паролата да е различна от тази за акаунта Ви.",
|
||||
"Set up with a Recovery Key": "Настрой с ключ за възстановяване",
|
||||
"Please enter your passphrase a second time to confirm.": "Въведете паролата отново за потвърждение.",
|
||||
"Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Ключът за възстановяване дава допълнителна сигурност - може да го използвате за да възстановите достъпа до шифрованите съобщения, в случай че забравите паролата.",
|
||||
"Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Пазете ключът за възстановяване на много сигурно място, например в password manager програма или сейф",
|
||||
"Your keys are being backed up (the first backup could take a few minutes).": "Прави се резервно копие на ключовете Ви (първото копие може да отнеме няколко минути).",
|
||||
"Okay": "Добре",
|
||||
"Secure your backup with a passphrase": "Защитете резервното копие с парола",
|
||||
"Confirm your passphrase": "Потвърдете паролата",
|
||||
"Recovery key": "Ключ за възстановяване",
|
||||
"Success!": "Успешно!",
|
||||
"Allow Peer-to-Peer for 1:1 calls": "Позволи използването на директна връзка (P2P) за 1:1 повиквания",
|
||||
"Default theme": "Тема по подразбиране"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@
|
|||
"Book": "Book",
|
||||
"Pencil": "Pencil",
|
||||
"Paperclip": "Paperclip",
|
||||
"Scisors": "Scisors",
|
||||
"Scissors": "Scissors",
|
||||
"Padlock": "Padlock",
|
||||
"Key": "Key",
|
||||
"Hammer": "Hammer",
|
||||
|
|
@ -526,6 +526,7 @@
|
|||
"Deactivating your account is a permanent action - be careful!": "Deactivating your account is a permanent action - be careful!",
|
||||
"Deactivate Account": "Deactivate Account",
|
||||
"Legal": "Legal",
|
||||
"Credits": "Credits",
|
||||
"For help with using Riot, click <a>here</a>.": "For help with using Riot, click <a>here</a>.",
|
||||
"For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.",
|
||||
"Chat with Riot Bot": "Chat with Riot Bot",
|
||||
|
|
@ -1103,7 +1104,7 @@
|
|||
"Manually export keys": "Manually export keys",
|
||||
"You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
|
||||
"Are you sure you want to sign out?": "Are you sure you want to sign out?",
|
||||
"Thanks for testing the Riot Redesign. If you run into any bugs or visual issues, please let us know on GitHub.": "Thanks for testing the Riot Redesign. If you run into any bugs or visual issues, please let us know on GitHub.",
|
||||
"If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
|
||||
"To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
|
||||
"Report bugs & give feedback": "Report bugs & give feedback",
|
||||
"Go back": "Go back",
|
||||
|
|
@ -1218,7 +1219,6 @@
|
|||
"View Community": "View Community",
|
||||
"Hide": "Hide",
|
||||
"Sign in": "Sign in",
|
||||
"Welcome": "Welcome",
|
||||
"Login": "Login",
|
||||
"powered by Matrix": "powered by Matrix",
|
||||
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
|
||||
|
|
|
|||
|
|
@ -1097,11 +1097,11 @@
|
|||
"Username available": "Nombre de usuario disponible",
|
||||
"This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será el nombre de su cuenta en el <span></span> servidor doméstico, o puede elegir un <a>servidor diferente</a>.",
|
||||
"If you already have a Matrix account you can <a>log in</a> instead.": "Si ya tiene una cuenta de Matrix puede conectarse: <a>log in</a>.",
|
||||
"Share Room": "Compartir Sala",
|
||||
"Share Room": "Compartir sala",
|
||||
"Link to most recent message": "Enlazar a mensaje más reciente",
|
||||
"Share User": "Compartir Usuario",
|
||||
"Share User": "Compartir usuario",
|
||||
"Share Community": "Compartir Comunidad",
|
||||
"Share Room Message": "Compartir Mensaje de Sala",
|
||||
"Share Room Message": "Compartir el mensaje de la sala",
|
||||
"Link to selected message": "Enlazar a mensaje seleccionado",
|
||||
"COPY": "COPIAR",
|
||||
"You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Está actualmente prohibiendo dispositivos sin verificar; para enviar mensajes a los mismos deber verificarlos.",
|
||||
|
|
@ -1267,5 +1267,20 @@
|
|||
"%(senderName)s removed the main address for this room.": "%(senderName)s eliminó la dirección principal para esta sala.",
|
||||
"Riot now uses 3-5x less memory, by only loading information about other users when needed. Please wait whilst we resynchronise with the server!": "Riot ahora utiliza de 3 a 5 veces menos memoria, porque solo carga información sobre otros usuarios cuando es necesario. Por favor, ¡aguarda mientras volvemos a sincronizar con el servidor!",
|
||||
"Updating Riot": "Actualizando Riot",
|
||||
"Unable to query for supported registration methods": "No es posible consultar por los métodos de registro compatibles"
|
||||
"Unable to query for supported registration methods": "No es posible consultar por los métodos de registro compatibles",
|
||||
"Room version:": "Versión de la sala:",
|
||||
"Developer options": "Opciones de desarrollador",
|
||||
"Room version": "Versión de la sala",
|
||||
"Room information": "Información de la sala",
|
||||
"Room Topic": "Tema de la sala",
|
||||
"Theme": "Tema",
|
||||
"2018 theme": "Tema 2018",
|
||||
"Voice & Video": "Voz y video",
|
||||
"Gets or sets the room topic": "Obtiene o establece el tema de la sala",
|
||||
"This room has no topic.": "Esta sala no tiene tema.",
|
||||
"Sets the room name": "Establece el nombre de la sala",
|
||||
"Upload profile picture": "Subir imagen de perfil",
|
||||
"Phone numbers": "Números de teléfono",
|
||||
"Email addresses": "Correos electrónicos",
|
||||
"Language and region": "Idioma y región"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1078,5 +1078,6 @@
|
|||
"%(count)s of your messages have not been sent.|one": "Viestiäsi ei lähetetty.",
|
||||
"%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s asetti näyttönimekseen %(displayName)s.",
|
||||
"Learn more about how we use analytics.": "Lue lisää analytiikkakäytännöistämme.",
|
||||
"There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Täällä ei ole muita! Haluaisitko <inviteText>kutsua muita</inviteText> tai <nowarnText>lopettaa tyhjästä huoneesta huomauttamisen</nowarnText>?"
|
||||
"There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Täällä ei ole muita! Haluaisitko <inviteText>kutsua muita</inviteText> tai <nowarnText>lopettaa tyhjästä huoneesta huomauttamisen</nowarnText>?",
|
||||
"The version of Riot.im": "Riot.im:n versio"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@
|
|||
"Current password": "Mot de passe actuel",
|
||||
"Curve25519 identity key": "Clé d’identité Curve25519",
|
||||
"/ddg is not a command": "/ddg n'est pas une commande",
|
||||
"Deactivate Account": "Désactiver le compte",
|
||||
"Deactivate Account": "Fermer le compte",
|
||||
"Deactivate my account": "Désactiver mon compte",
|
||||
"Decrypt %(text)s": "Déchiffrer %(text)s",
|
||||
"Decryption error": "Erreur de déchiffrement",
|
||||
|
|
@ -1526,7 +1526,6 @@
|
|||
"2018 theme": "Thème 2018",
|
||||
"Account management": "Gestion du compte",
|
||||
"Deactivating your account is a permanent action - be careful!": "La désactivation du compte est une action permanente. Soyez prudent !",
|
||||
"Deactivate Account": "Fermer le compte",
|
||||
"For help with using Riot, click <a>here</a>.": "Pour obtenir de l'aide sur l'utilisation de Riot, cliquez <a>ici</a>.",
|
||||
"For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "Pour obtenir de l'aide sur l'utilisation de Riot, cliquez <a>ici</a> ou commencez une discussion avec notre bot en utilisant le bouton ci-dessous.",
|
||||
"Start a chat with Riot Bot": "Commencer une discussion avec le bot Riot",
|
||||
|
|
@ -1738,5 +1737,43 @@
|
|||
"This homeserver does not support login using email address.": "Ce serveur d'accueil ne prend pas en charge la connexion avec une adresse e-mail.",
|
||||
"Guest access is disabled on this homeserver.": "L'accès des invités est désactivé sur ce serveur d'accueil.",
|
||||
"Registration has been disabled on this homeserver.": "L'inscription a été désactivée sur ce serveur d'accueil.",
|
||||
"Unable to query for supported registration methods.": "Impossible de demander les méthodes d'inscription prises en charge."
|
||||
"Unable to query for supported registration methods.": "Impossible de demander les méthodes d'inscription prises en charge.",
|
||||
"Show recent room avatars above the room list (refresh to apply changes)": "Afficher les avatars des salons récents au-dessus de la liste de salons (actualiser pour appliquer les changements)",
|
||||
"Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "En êtes-vous sûr(e) ? Vous perdrez vos messages chiffrés si vos clés ne sont pas sauvegardées correctement.",
|
||||
"Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Les messages chiffrés sont sécurisés avec un chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) ont les clés pour lire ces messages.",
|
||||
"Restore from Backup": "Récupérer depuis la sauvegarde",
|
||||
"This device is backing up your keys. ": "Cet appareil sauvegarde vos clés. ",
|
||||
"This device is <b>not backing up your keys</b>.": "Cet appareil <b>ne sauvegarde pas vos clés</b>.",
|
||||
"Back up your keys before signing out to avoid losing them.": "Sauvegardez vos clés avant de vous déconnecter pour éviter de les perdre.",
|
||||
"Use key backup": "Utiliser la sauvegarde de clés",
|
||||
"Your keys are <b>not being backed up from this device</b>.": "Vos clés <b>ne sont pas sauvegardées depuis cet appareil</b>.",
|
||||
"Start using Key Backup": "Commencer à utiliser la sauvegarde de clés",
|
||||
"Use Key Backup": "Utiliser la sauvegarde de clés",
|
||||
"Never lose encrypted messages": "Ne perdez jamais vos messages chiffrés",
|
||||
"Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Les messages de ce salon sont sécurisés avec le chiffrement de bout en bout. Seuls vous et le(s) destinataire(s) avez les clés pour lire ces messages.",
|
||||
"Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Sauvegardez vos clés de façon sécurisée pour éviter de les perdre. <a>En savoir plus.</a>",
|
||||
"Not now": "Pas maintenant",
|
||||
"Don't ask me again": "Ne plus me demander",
|
||||
"Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Rien n'apparaît ? Certains clients ne prennent pas encore en charge la vérification interactive. <button>Utiliser la vérification traditionnelle</button>.",
|
||||
"I don't want my encrypted messages": "Je ne veux pas de mes messages chiffrés",
|
||||
"Manually export keys": "Exporter manuellement les clés",
|
||||
"You'll lose access to your encrypted messages": "Vous perdrez l’accès à vos messages chiffrés",
|
||||
"Are you sure you want to sign out?": "Voulez-vous vraiment vous déconnecter ?",
|
||||
"<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Attention</b> : vous ne devriez configurer la sauvegarde des clés que depuis un ordinateur de confiance.",
|
||||
"Hide": "Masquer",
|
||||
"We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Nous conserverons une copie chiffrée de vos clés sur notre serveur. Protégez votre sauvegarde avec une phrase de passe pour qu'elle reste sécurisée.",
|
||||
"For maximum security, this should be different from your account password.": "Pour une sécurité maximale, ceci devrait être différent du mot de passe de votre compte.",
|
||||
"Set up with a Recovery Key": "Configurer une clé de récupération",
|
||||
"Please enter your passphrase a second time to confirm.": "Veuillez saisir votre phrase de passe une seconde fois pour la confirmer.",
|
||||
"Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Votre clé de récupération est une mesure de précaution. Vous pouvez l'utiliser pour récupérer l’accès à vos messages chiffrés si vous oubliez votre phrase de passe.",
|
||||
"Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Conservez votre clé de récupération dans un endroit très sécurisé, comme un gestionnaire de mots de passe (ou un coffre-fort)",
|
||||
"Your keys are being backed up (the first backup could take a few minutes).": "Vous clés sont en cours de sauvegarde (la première sauvegarde peut prendre quelques minutes).",
|
||||
"Okay": "OK",
|
||||
"Secure your backup with a passphrase": "Protégez votre sauvegarde avec une phrase de passe",
|
||||
"Confirm your passphrase": "Confirmez votre phrase de passe",
|
||||
"Recovery key": "Clé de récupération",
|
||||
"Success!": "Terminé !",
|
||||
"Allow Peer-to-Peer for 1:1 calls": "Autoriser les connexions pair-à-pair pour les appels individuels",
|
||||
"Default theme": "Thème par défaut",
|
||||
"Welcome": "Bienvenue"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@
|
|||
"Custom": "Egyedi",
|
||||
"Custom level": "Egyedi szint",
|
||||
"/ddg is not a command": "/ddg nem egy parancs",
|
||||
"Deactivate Account": "Fiók zárolása",
|
||||
"Deactivate Account": "Fiók bezárása",
|
||||
"Deactivate my account": "Fiókom felfüggesztése",
|
||||
"Decline": "Elutasít",
|
||||
"Decrypt %(text)s": "%(text)s visszafejtése",
|
||||
|
|
@ -1525,7 +1525,6 @@
|
|||
"2018 theme": "2018-as téma",
|
||||
"Account management": "Fiók menedzsment",
|
||||
"Deactivating your account is a permanent action - be careful!": "A fiók felfüggesztése végleges - légy óvatos!",
|
||||
"Deactivate Account": "Fiók bezárása",
|
||||
"For help with using Riot, click <a>here</a>.": "A Riot használatában való segítséghez kattints <a>ide</a>.",
|
||||
"For help with using Riot, click <a>here</a> or start a chat with our bot using the button below.": "A Riot használatában való segítségér kattints <a>ide</a> vagy kezdj beszélgetni a botunkkal az alábbi gombra kattintva.",
|
||||
"Start a chat with Riot Bot": "Csevegés kezdése a Riot Bottal",
|
||||
|
|
@ -1738,5 +1737,43 @@
|
|||
"This homeserver does not support login using email address.": "Ezen a Matrix szerveren nem tudsz e-mail címmel bejelentkezni.",
|
||||
"Guest access is disabled on this homeserver.": "A vendég felhasználók le vannak tiltva ezen a Matrix szerveren.",
|
||||
"Registration has been disabled on this homeserver.": "A fiókkészítés le van tiltva ezen a Matrix szerveren.",
|
||||
"Unable to query for supported registration methods.": "A támogatott regisztrációs módokat nem lehet lekérdezni."
|
||||
"Unable to query for supported registration methods.": "A támogatott regisztrációs módokat nem lehet lekérdezni.",
|
||||
"Show recent room avatars above the room list (refresh to apply changes)": "Mutasd a legutóbbi szoba profilképét a szobák listája felett (a változtatáshoz frissítsd az oldalt)",
|
||||
"Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Biztos vagy benne? Ha a kulcsaid nincsenek megfelelően elmentve elveszted a titkosított üzeneteidet.",
|
||||
"Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "A titkosított üzenetek végponttól végpontig titkosítással védettek. Csak neked és a címzetteknek lehet meg a kulcs az üzenet visszafejtéséhez.",
|
||||
"Restore from Backup": "Visszaállítás mentésből",
|
||||
"This device is backing up your keys. ": "Ez az eszköz elmenti a kulcsaidat. ",
|
||||
"This device is <b>not backing up your keys</b>.": "Ez az eszköz <b>nem menti el a kulcsaidat</b>.",
|
||||
"Back up your keys before signing out to avoid losing them.": "Ments el a kulcsaidat mielőtt kijelentkezel, hogy ne veszítsd el őket.",
|
||||
"Use key backup": "Kulcs mentés használata",
|
||||
"Your keys are <b>not being backed up from this device</b>.": "A kulcsaid <b>erről az eszközről nem lesznek mentve</b>.",
|
||||
"Start using Key Backup": "Kulcs mentés használatának megkezdése",
|
||||
"Use Key Backup": "Kulcs mentés használata",
|
||||
"Never lose encrypted messages": "Soha ne veszíts el titkosított üzenetet",
|
||||
"Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "A szobában az üzenetek végponttól végpontig titkosítva vannak. Csak neked és a címzetteknek vannak meg a kulcsok az üzenetek visszafejtéséhez.",
|
||||
"Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Mentsd el megfelelően a kulcsaidat, hogy ne vesszenek el. <a>Tudj meg róla többet.</a>",
|
||||
"Not now": "Most nem",
|
||||
"Don't ask me again": "Ne kérdezz többet",
|
||||
"Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "Nem jelent meg semmi? Az interaktív hitelesítést még nem minden kliens támogatja. <button>Használd a hagyományos hitelesítést</button>.",
|
||||
"I don't want my encrypted messages": "Nincs szükségem a titkosított üzeneteimre",
|
||||
"Manually export keys": "Kulcsok kézi mentése",
|
||||
"You'll lose access to your encrypted messages": "Elveszted a hozzáférést a titkosított üzeneteidhez",
|
||||
"Are you sure you want to sign out?": "Biztos, hogy ki akarsz jelentkezni?",
|
||||
"<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Figyelmeztetés</b>: csak biztonságos számítógépről állíts be kulcs mentést.",
|
||||
"Hide": "Eltakar",
|
||||
"We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "A kulcsaid másolatát titkosítva tároljuk a Matrix szerveren. Védd a mentésedet jelmondattal, hogy biztonságban legyen.",
|
||||
"For maximum security, this should be different from your account password.": "A maximális biztonság érdekében ez térjen el a felhasználói fióknál használt jelszótól.",
|
||||
"Set up with a Recovery Key": "Beállítás Visszaállítási Kulccsal",
|
||||
"Please enter your passphrase a second time to confirm.": "Kérlek add meg a jelmondatot másodszor is a biztonság kedvéért.",
|
||||
"Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "A Visszaállítási Kulcs egy olyan biztonsági elem amivel visszaállíthatod a hozzáférésed a titkosított üzenetekhez még akkor is, ha a jelmondatot elfelejtetted.",
|
||||
"Keep your recovery key somewhere very secure, like a password manager (or a safe)": "A Visszaállítási Kulcsot nagyon biztonságos helyen tárold, mint pl. egy jelszókezelőben (vagy széfben)",
|
||||
"Your keys are being backed up (the first backup could take a few minutes).": "A kulcsaid mentése folyamatban van (az első mentés több percig is eltarthat).",
|
||||
"Okay": "Rendben",
|
||||
"Secure your backup with a passphrase": "Védd a mentést egy jelmondattal",
|
||||
"Confirm your passphrase": "Erősítsd meg a jelmondatot",
|
||||
"Recovery key": "Visszaállítási Kulcs",
|
||||
"Success!": "Sikeres!",
|
||||
"Allow Peer-to-Peer for 1:1 calls": "Ponttól-pontig kapcsolat engedélyezése az 1:1 hívásokban",
|
||||
"Default theme": "Alapértelmezett stílus",
|
||||
"Welcome": "Üdvözöllek"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1705,5 +1705,40 @@
|
|||
"No thanks, I'll download a copy of my decryption keys before I log out": "Jo, faleminderit, do të shkarkoj një kopje të kyçeve të mi të shfshehtëzimeve, përpara se të bëj daljen",
|
||||
"Disinvite this user from community?": "T’i hiqet ftesa për në bashkësi këtij përdoruesi?",
|
||||
"The homeserver URL %(hsUrl)s doesn't seem to be valid URL. Please enter a valid URL including the protocol prefix.": "URL-ja e shërbyesit Home %(hsUrl)s s’duket të jetë URL e vlefshme. Ju lutemi, jepni një URL të vlefshme, përfshi prefiksin e protokollit.",
|
||||
"A verification email will be sent to your inbox to confirm setting your new password.": "Te mesazhet tuaj do të dërgohet një email verifikimi, për të ripohuar caktimin e fjalëkalimit tuaj të ri."
|
||||
"A verification email will be sent to your inbox to confirm setting your new password.": "Te mesazhet tuaj do të dërgohet një email verifikimi, për të ripohuar caktimin e fjalëkalimit tuaj të ri.",
|
||||
"Show recent room avatars above the room list (refresh to apply changes)": "Shfaq avatarë dhome së fundi mbi listën e dhomave (që të zbatohen ndryshimet, rifreskojeni)",
|
||||
"Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Jeni i sigurt? Do të humbni mesazhet tuaj të fshehtëzuar, nëse kopjeruajtja për kyçet tuaj nuk bëhet si duhet.",
|
||||
"Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Mesazhet e fshehtëzuar sigurohen me fshehtëzim skaj-më-skaj. Vetëm ju dhe marrësi(t) kanë kyçet për të lexuar këto mesazhe.",
|
||||
"Restore from Backup": "Riktheje prej Kopjeruajtje",
|
||||
"This device is backing up your keys. ": "Kjo pajisje po bën kopjeruajtje të kyçeve tuaja. ",
|
||||
"This device is <b>not backing up your keys</b>.": "Kjo pajisje <b>nuk kopjeruan kyçe tuajt</b>.",
|
||||
"Back up your keys before signing out to avoid losing them.": "Kopjeruajini kyçet tuaj, përpara se të dilni, që të shmangni humbjen e tyre.",
|
||||
"Use key backup": "Përdor kopjeruajtje kyçesh",
|
||||
"Your keys are <b>not being backed up from this device</b>.": "Kyçet tuaj <b>nuk po kopjeruhen nga kjo pajisje</b>.",
|
||||
"Start using Key Backup": "Fillo të përdorësh Kopjeruajtje Kyçesh",
|
||||
"Use Key Backup": "Përdor Kopjeruajtje Kyçesh",
|
||||
"Never lose encrypted messages": "Mos humbni kurrë mesazhe të fshehtëzuar",
|
||||
"Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Mesazhet në këtë dhomë janë të siguruar përmes fshehtëzimi skaj-më-skaj. Vetëm ju dhe marrësi(t) kanë kyçet për të lexuar këto mesazhe.",
|
||||
"Securely back up your keys to avoid losing them. <a>Learn more.</a>": "Kopjeruajini kyçet tuaj në mënyrë të sigurt, për të shmangur humbjen e tyre. <a>Mësoni më tepër.</a>",
|
||||
"Not now": "Jo tani",
|
||||
"Don't ask me again": "Mos më pyet sërish",
|
||||
"Nothing appearing? Not all clients support interactive verification yet. <button>Use legacy verification</button>.": "S’duket gjë? Jo të tërë klientët mbulojnë verifikim ndërveprues ende. <button>Përdorni verifikimin në stil të vjetër</button>.",
|
||||
"I don't want my encrypted messages": "Nuk i dua mesazhet e mia të fshehtëzuar",
|
||||
"Manually export keys": "Eksporto dorazi kyçet",
|
||||
"You'll lose access to your encrypted messages": "Do të humbni hyrje te mesazhet tuaj të fshehtëzuar",
|
||||
"Are you sure you want to sign out?": "Jeni i sigurt se doni të dilni?",
|
||||
"<b>Warning</b>: you should only set up key backup from a trusted computer.": "<b>Kujdes</b>: duhet të ujdisni kopjeruajtje kyçesh vetëm nga një kompjuter i besuar.",
|
||||
"Hide": "Fshihe",
|
||||
"We'll store an encrypted copy of your keys on our server. Protect your backup with a passphrase to keep it secure.": "Do të depozitojmë në shërbyesin tonë një kopje të fshehtëzuar të kyçeve tuaj. Mbrojeni kopjeruajtjen tuaj me një frazëkalim, për ta mbajtur të parrezikuar.",
|
||||
"For maximum security, this should be different from your account password.": "Për maksimumin e sigurisë, ky do të duhej të ishte i ndryshëm nga fjalëkalimi juaj për llogarinë.",
|
||||
"Set up with a Recovery Key": "Rregullojeni me një Kyç Rikthimesh",
|
||||
"Please enter your passphrase a second time to confirm.": "Ju lutemi, që të ripohohet, rijepeni frazëkalimin tuaj.",
|
||||
"Your recovery key is a safety net - you can use it to restore access to your encrypted messages if you forget your passphrase.": "Kyçi juaj i rikthimeve është një rrjet sigurie - mund ta përdorni për rikthim hyrjeje te mesazhet tuaj të fshehtëzuar, nëse harroni frazëkalimin tuaj.",
|
||||
"Keep your recovery key somewhere very secure, like a password manager (or a safe)": "Mbajeni kyçin tuaj të rikthimeve diku në një vend shumë të sigurt, bie fjala, nën një përgjegjës fjalëkalimesh (ose në një kasafortë)",
|
||||
"Your keys are being backed up (the first backup could take a few minutes).": "Kyçet tuaj po kopjeruhen (kopjeruajtja e parë mund të hajë disa minuta).",
|
||||
"Okay": "Në rregull",
|
||||
"Secure your backup with a passphrase": "Sigurojeni kopjeruajtjen tuaj me një frazëkalim",
|
||||
"Confirm your passphrase": "Ripohoni frazëkalimin tuaj",
|
||||
"Recovery key": "Kyç Rikthimesh",
|
||||
"Success!": "Sukses!"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1325,5 +1325,22 @@
|
|||
"Capitalization doesn't help very much": "大写字母并没有很大的作用",
|
||||
"All-uppercase is almost as easy to guess as all-lowercase": "全大写的密码通常比全小写的更容易猜测",
|
||||
"Reversed words aren't much harder to guess": "把单词倒过来不会比原来的难猜很多",
|
||||
"You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "您也可以自定义身份服务器，但是您将不能用电子邮箱地址邀请或被邀请。"
|
||||
"You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "您也可以自定义身份服务器，但是您将不能用电子邮箱地址邀请他人或被邀请。",
|
||||
"Whether or not you're logged in (we don't record your username)": "您是否已经登入（我们不会记录您的用户名）",
|
||||
"The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "文件 %(fileName)s 超过主服务器的文件大小限制",
|
||||
"Upgrades a room to a new version": "将聊天室升级到新版本",
|
||||
"Gets or sets the room topic": "获取或设置聊天室话题",
|
||||
"This room has no topic.": "此聊天室没有话题。",
|
||||
"Sets the room name": "设置聊天室名称",
|
||||
"%(senderDisplayName)s upgraded this room.": "%(senderDisplayName)s 升级了此聊天室。",
|
||||
"%(senderDisplayName)s made the room public to whoever knows the link.": "%(senderDisplayName)s 将此聊天室对知道此聊天室链接的人公开。",
|
||||
"%(senderDisplayName)s made the room invite only.": "%(senderDisplayName)s 将此聊天室改为仅限邀请。",
|
||||
"%(senderDisplayName)s changed the join rule to %(rule)s": "%(senderDisplayName)s 将加入规则改为 %(rule)s",
|
||||
"%(displayName)s is typing …": "%(displayName)s 正在打字…",
|
||||
"%(names)s and %(count)s others are typing …|other": "%(names)s 与其他 %(count)s 位正在打字…",
|
||||
"%(names)s and %(count)s others are typing …|one": "%(names)s 与另一位正在打字…",
|
||||
"%(names)s and %(lastPerson)s are typing …": "%(names)s 和 %(lastPerson)s正在打字…",
|
||||
"Unrecognised address": "无法识别地址",
|
||||
"User %(user_id)s may or may not exist": "用户 %(user_id)s 不一定存在",
|
||||
"Predictable substitutions like '@' instead of 'a' don't help very much": "可预见的替换如将 '@' 替换为 'a' 并不会有太大效果"
|
||||
}
|
||||
|
|
|
|||
31
src/utils/pages.js
Normal file
31
src/utils/pages.js
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
Copyright 2019 New Vector Ltd
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
export function getHomePageUrl(appConfig) {
|
||||
const pagesConfig = appConfig.embeddedPages;
|
||||
let pageUrl = null;
|
||||
if (pagesConfig) {
|
||||
pageUrl = pagesConfig.homeUrl;
|
||||
}
|
||||
if (!pageUrl) {
|
||||
// This is a deprecated config option for the home page
|
||||
// (despite the name, given we also now have a welcome
|
||||
// page, which is not the same).
|
||||
pageUrl = appConfig.welcomePageUrl;
|
||||
}
|
||||
|
||||
return pageUrl;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue