Skip to content
Commits on Source (7)
......@@ -149,6 +149,11 @@ tag dev:
IMAGE_TAG: dev
## testing images
tag testing prerelease:
extends:
- .docker:image:tag
- .on-testing-tag
tag testing:
extends:
- .docker:image:tag
......
......@@ -30,8 +30,8 @@
"backButtonLabel": "Disconnect"
},
"UserFailed": {
"loginLaboite": "login to LaBoite",
"loginMsg": "Your user has no LaBoite account, please click on the button below to create it, then follow ",
"loginLaboite": "login to {$name}",
"loginMsg": "Your user has no {$name} account, please click on the button below to create it, then follow ",
"loginLink": "this link"
}
}
......
......@@ -31,8 +31,8 @@
}
},
"UserFailed": {
"loginLaboite": "connexion à LaBoite",
"loginMsg": "Votre utilisateur n'a pas de compte LaBoite, veuillez cliquer sur le bouton ci-dessous pour le créer, puis cliquez sur ",
"loginLaboite": "connexion à {$name}",
"loginMsg": "Votre utilisateur n'a pas de compte {$name}, veuillez cliquer sur le bouton ci-dessous pour le créer, puis cliquez sur ",
"loginLink": "ce lien"
}
}
......@@ -22,12 +22,14 @@ const linkStyle = {
padding: 0,
};
const { appName } = Meteor.settings.public;
export default function UserFailed() {
return (
<>
<div style={notFoundStyle}>
<h3 style={notFoundStyle}>
{`${i18n.__('pages.UserFailed.loginMsg')} `}
{`${i18n.__('pages.UserFailed.loginMsg', { name: appName })} `}
<button type="button" style={linkStyle} onClick={() => Meteor.loginWithKeycloak()}>
{i18n.__('pages.UserFailed.loginLink')}
</button>
......@@ -37,7 +39,7 @@ export default function UserFailed() {
style={{ fontStyle: 'WorkSansRegular' }}
onClick={() => window.open(`${Meteor.settings.public.laboiteUrl}/signin`, '_blank')}
>
{i18n.__('pages.UserFailed.loginLaboite')}
{i18n.__('pages.UserFailed.loginLaboite', { name: appName })}
</Button>
</div>
</>
......
{
"name": "frontal-nextcloud",
"version": "1.0.5",
"version": "1.0.6-testing.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "frontal-nextcloud",
"version": "1.0.5",
"version": "1.0.6-testing.1",
"dependencies": {
"@babel/runtime": "^7.16.3",
"@emotion/react": "^11.7.1",
......
{
"name": "frontal-nextcloud",
"version": "1.0.5",
"version": "1.0.6-testing.1",
"private": true,
"scripts": {
"start": "meteor --exclude-archs 'web.browser.legacy, web.cordova' --settings ../config/settings.development.json",
......
{
"public": {
"appName": "",
"keycloakUrl": "",
"keycloakRealm": "",
"laboiteUrl": "",
......