diff --git a/src/app/core/components/contact/contact.component.html b/src/app/core/components/contact/contact.component.html index 7ba5c485a69427c652d38003b1c4182dc4dd8e92..26a5b039959685292f084658046f35e5ebf23c46 100644 --- a/src/app/core/components/contact/contact.component.html +++ b/src/app/core/components/contact/contact.component.html @@ -16,7 +16,7 @@ <div class="fields-container"> <div class="field"> - <label class="label" for="lastname"><span i18n="@@contact.lastname">Lastname</span><span + <label class="label" for="lastname"><span i18n="@@contact.lastname">Last name</span><span class="required-field">*</span></label> <p class="control has-icons-right"> <input id="lastname" class="input" type="text" formControlName="lastname" @@ -41,7 +41,7 @@ </div> <div class="field"> - <label class="label" for="firstname"><span i18n="@@contact.firstname">Firstname</span><span + <label class="label" for="firstname"><span i18n="@@contact.firstname">First name</span><span class="required-field">*</span></label> <p class="control has-icons-right"> <input id="firstname" class="input" type="text" (keyup)="toUppercase('firstname')" @@ -205,13 +205,13 @@ </label> <p class="consent-text" i18n="@@consent.text"> Fields with an asterisk (*) are mandatory. Information in these fields will be - processed to enable responding to your request. Recipients of this information - are the community and metropolitan departments in charge of processing your + processed to respond to your request. Recipients of this information + are the metropolitan departments in charge of processing your request. In compliance with the “Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify information that - concerns you. To exercise this right and ascertain the information concerning - you, please contact: Lyon Métropole - Legal Affairs and Public Procurement - Department - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail + concerns you. To exercise this right and be transfered the information concerning + you, please contact: Lyon Métropole - Direction des + Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail or using the appropriate form on this portal. You may also oppose processing of your personal data for a legitimate reason. In this case, we will not be able to process the request submitted using this form. diff --git a/src/app/core/components/contact/contact.component.scss b/src/app/core/components/contact/contact.component.scss index 4460fc378f9b7d1f8835107b49d4d41856058be2..54044c234ac3a4722b48526ff49bee28e3fcc8bc 100644 --- a/src/app/core/components/contact/contact.component.scss +++ b/src/app/core/components/contact/contact.component.scss @@ -14,7 +14,7 @@ h3 { margin-right: 0; } -.contact-form-container { +.contact-form-container { background-color: white; padding: 0 1rem 0 1rem; margin: 1.5rem; @@ -23,18 +23,18 @@ h3 { margin-top: 0; } - @media(max-width: $tablet) { + @media (max-width: $tablet) { .columns { .column:last-of-type { border-top: solid 2px $grey-background-color; } } } - - @media(min-width: $tablet) { + + @media (min-width: $tablet) { .fields-container { width: 66%; - } + } .columns { border-bottom: solid 2px $grey-background-color; @@ -50,7 +50,7 @@ h3 { .is-checkradio[type="checkbox"] + label::before { top: unset; } - + .is-checkradio[type="checkbox"] + label::after { top: unset; } @@ -69,7 +69,7 @@ h3 { } .button-gl { - width:8rem; + width: 8rem; &:first-of-type { margin-right: 1.25rem; @@ -78,8 +78,9 @@ h3 { } .title-label.is-danger { - &:hover, &:focus { - background-color:white; + &:hover, + &:focus { + background-color: white; color: $tomato-color; } -} \ No newline at end of file +} diff --git a/src/app/core/components/cookie-banner/cookie-banner.component.html b/src/app/core/components/cookie-banner/cookie-banner.component.html index 301b824ad1762be91342a17ac4c4872803a27726..140c8f9e6ed4e7e8e925caa2d6e4c447c6af923e 100644 --- a/src/app/core/components/cookie-banner/cookie-banner.component.html +++ b/src/app/core/components/cookie-banner/cookie-banner.component.html @@ -1,6 +1,6 @@ <div class="cookie-baner-container" *ngIf="displayCookieBanner"> <div> - <p><span i18n="@@cookieBanner.message">By continuing to browse this site, you agree to the use of cookies to generate visit statistics. </span> + <p><span i18n="@@cookieBanner.message">By continuing to browse this site, you agree to the use of cookies. </span> <a class="link-without-decoration" [routerLink]="['/', AppRoutes.legalNotices.uri]" i18n="@@cookieBanner.more"> Learn more</a></p> </div> <div> diff --git a/src/app/core/components/cookie-banner/cookie-banner.component.scss b/src/app/core/components/cookie-banner/cookie-banner.component.scss index d77834e5a9c4221e06027955e620cc6ec418010c..24087fb8b3f917fc325bc8422fee84aeff946633 100644 --- a/src/app/core/components/cookie-banner/cookie-banner.component.scss +++ b/src/app/core/components/cookie-banner/cookie-banner.component.scss @@ -9,9 +9,10 @@ display: flex; justify-content: space-between; background-color: $brand-color; - - p, a, span { + p, + a, + span { color: white; font-size: 16px; } @@ -24,9 +25,8 @@ a { color: $tomato-color; - font-weight: 600; + font-weight: 600; display: inline-block; - } button.button { @@ -45,16 +45,16 @@ } @media screen and (max-width: $tablet) { - height: unset; display: block; div { padding: 1rem 2.5rem; + &:last-of-type { justify-content: center; padding-top: 0; } } } -} \ No newline at end of file +} diff --git a/src/app/core/components/error/error.component.scss b/src/app/core/components/error/error.component.scss index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b1942b73d87b26247de75916bfbf2a367896c50 100644 --- a/src/app/core/components/error/error.component.scss +++ b/src/app/core/components/error/error.component.scss @@ -0,0 +1 @@ +/* stylelint-disable-line */ \ No newline at end of file diff --git a/src/app/core/components/feedback/feedback.component.scss b/src/app/core/components/feedback/feedback.component.scss index 7ef5b57eb13fcdee1c59259471bc8c977fc8301c..7db64319ce9987b95782fdf1a724c2f8df014d33 100644 --- a/src/app/core/components/feedback/feedback.component.scss +++ b/src/app/core/components/feedback/feedback.component.scss @@ -4,11 +4,11 @@ $animation-duration: 0.5s; @keyframes header-expended { 0% { - transform: translateX(0px); + transform: translateX(0); } 33% { - transform: translateX(0px); + transform: translateX(0); } 100% { @@ -22,17 +22,17 @@ $animation-duration: 0.5s; } 66% { - transform: translateX(0px); + transform: translateX(0); } 100% { - transform: translateX(0px); + transform: translateX(0); } } @keyframes form-expended { 0% { - transform: translateX(0px); + transform: translateX(0); } 33% { @@ -54,7 +54,7 @@ $animation-duration: 0.5s; } 100% { - transform: translateX(0px); + transform: translateX(0); } } @@ -73,12 +73,11 @@ button.feedback-header { line-height: 1.1; cursor: pointer; border: none; - border-top-left-radius: 4px; border-bottom-left-radius: 4px; height: 2.25rem; width: 6.25rem; - right: 0px; + right: 0; bottom: calc(13.5rem - 2.25rem - 6px); svg { @@ -110,7 +109,6 @@ form { right: -300px; bottom: 0; border-top: 6px solid $tomato-color; - display: flex; flex-flow: column; flex-grow: 1; @@ -147,12 +145,10 @@ form { font-weight: bold; width: 130px; height: 36px; - } } } - button.feedback-header.expended { border-bottom-left-radius: 0; border-top-right-radius: 4px; diff --git a/src/app/core/components/main/footer/footer.component.scss b/src/app/core/components/main/footer/footer.component.scss index 49d722400c8024e02997280cd47cd97a7581743d..8ab7ac28fe372ade59f3312cd501fd00aeafeb40 100644 --- a/src/app/core/components/main/footer/footer.component.scss +++ b/src/app/core/components/main/footer/footer.component.scss @@ -26,6 +26,19 @@ footer.footer { } } +.links-section div { + display: inline-block; + + .bullet { + color: #6b738a; + } + + a { + padding-right: 0.5rem; + padding-left: 0.5rem; + } +} + .links { display: flex; flex-flow: column; @@ -37,21 +50,11 @@ footer.footer { font-size: 14px; font-weight: 600; } - } -} - -.links-section div { - display: inline-block; - .bullet { - color: #6b738a; - } - - a { - padding-right: 0.5rem; - padding-left: 0.5rem; + a:hover { + text-decoration: underline; + } } - } img, @@ -82,7 +85,6 @@ ul { height: 0.875rem; } -.metropolis-website-link:hover, -.links a:hover { +.metropolis-website-link:hover { text-decoration: underline; } diff --git a/src/app/core/components/main/header/header.component.scss b/src/app/core/components/main/header/header.component.scss index 7087ba1fcf521c1028f0a829f4277936f0c3c691..59d0b0f622e2df3b030494281bab80d5b7bfe5ea 100644 --- a/src/app/core/components/main/header/header.component.scss +++ b/src/app/core/components/main/header/header.component.scss @@ -1,7 +1,6 @@ @import '../../../../../scss/variables'; @import '../../../../../../node_modules/bulma/sass/utilities/_all.sass'; - header { height: 100%; } @@ -12,7 +11,6 @@ header { height: 100%; align-items: center; padding: 1rem; - } .text-overflow { @@ -21,10 +19,21 @@ header { } .hamburger { - display:flex; + display: flex; padding: 0.5rem; } +svg { + height: 21px; + stroke: white; + stroke-width: 1px; + flex-shrink: 0; + + .stroke_white { + fill: transparent; + } +} + .connect-button { border-color: white; width: 100%; @@ -48,17 +57,6 @@ header { } } -svg { - height: 21px; - stroke: white; - stroke-width: 1px; - flex-shrink: 0; - - .stroke_white { - fill: transparent; - } -} - svg.is-connected { .stroke_white { fill: white; @@ -95,7 +93,6 @@ svg.is-connected { height: 20px; } - .logo-data { margin-right: auto; margin-left: 1rem; @@ -112,7 +109,7 @@ svg.is-connected { // When mobile, we center the logo @media screen and (max-width: $desktop) { - .icon-hamburger>div { + .icon-hamburger > div { margin-right: auto; } @@ -202,35 +199,6 @@ svg.is-connected { } } -.connect-me, .put-menu-to-right { - margin-right: 1rem; -} - -.is-home { - .put-menu-to-right { - width: 142px; - } - - .put-menu-to-right .user-information { - width: 223px; - top: calc(100% + 0.5rem); - left: -36px; - - &::before { - left: 47%; - } - - // When tablet, change the position to not be cut - @media screen and (max-width: $desktop) { - left: -65px; - - &::before { - left: 60%; - } - } - } -} - .put-menu-to-right { position: relative; z-index: 15; @@ -273,7 +241,6 @@ svg.is-connected { } &.is-active { - .svg-alone, .connect-button { border-color: $tomato-color; @@ -285,6 +252,11 @@ svg.is-connected { } } +.connect-me, +.put-menu-to-right { + margin-right: 1rem; +} + .modal.is-active { align-items: center; display: flex; @@ -297,11 +269,34 @@ svg.is-connected { left: 0; right: 0; top: $header-bar-height; - background-color: rgba(10, 10, 10, .86); + background-color: rgba(10, 10, 10, 0.86); } .is-home { + .put-menu-to-right { + width: 142px; + } + .modal.is-active { top: 0; } + + .put-menu-to-right .user-information { + width: 223px; + top: calc(100% + 0.5rem); + left: -36px; + + &::before { + left: 47%; + } + + // When tablet, change the position to not be cut + @media screen and (max-width: $desktop) { + left: -65px; + + &::before { + left: 60%; + } + } + } } diff --git a/src/app/core/components/main/side-menu/side-menu.component.scss b/src/app/core/components/main/side-menu/side-menu.component.scss index 40951c2b1a18fb833b0702fa0cbba73f464339ea..4190d263b9ea4c8207f9387277af49ca24307d97 100644 --- a/src/app/core/components/main/side-menu/side-menu.component.scss +++ b/src/app/core/components/main/side-menu/side-menu.component.scss @@ -2,7 +2,7 @@ @import '../../../../../../node_modules/bulma/sass/utilities/_all.sass'; .menu { - padding: 0px; + padding: 0; height: 100%; span { @@ -21,7 +21,6 @@ width: 100%; text-align: center; background-color: $brand-color; - display: grid; grid-template-columns: 1fr 1fr; grid-template-rows: 2rem 2.375rem; @@ -64,22 +63,6 @@ } } -.menu.expanded { - a { - white-space: nowrap; - overflow-x: hidden; - overflow-y: hidden; - } - - .label-menu { - padding-left: 1.25rem; - opacity: 1; - width: auto; - height: auto; - transition: opacity 300ms linear; - } -} - .menu-list { text-align: left; @@ -102,6 +85,7 @@ svg { height: 1.2rem; + .main { fill: white; } @@ -129,7 +113,6 @@ } } - &:hover { color: white; background-color: $background-link-hover-color; @@ -139,13 +122,12 @@ border-left: 3px solid $background-link-hover-color; } } - } .search-bar-menu { display: none; - &:hover a { + &:hover a { /* stylelint-disable-line */ background-color: $background-link-hover-color; } diff --git a/src/app/geosource/components/dataset-detail/dataset-detail.component.html b/src/app/geosource/components/dataset-detail/dataset-detail.component.html index ed7db459004034c44638202ad8c845f50c83c2bf..25907ed0f111ceb12e7bc31997a8b03ccf0ef53b 100644 --- a/src/app/geosource/components/dataset-detail/dataset-detail.component.html +++ b/src/app/geosource/components/dataset-detail/dataset-detail.component.html @@ -85,7 +85,7 @@ </svg> <div> <div> - <span class="tab-title tab-title-long" i18n="@@dataset.detail.api">API and downloads</span> + <span class="tab-title tab-title-long" i18n="@@dataset.detail.api">API and download</span> <span class="tab-title tab-title-short">API</span> </div> <div> diff --git a/src/app/geosource/components/dataset-detail/dataset-info/dataset-info.component.html b/src/app/geosource/components/dataset-detail/dataset-info/dataset-info.component.html index f64e53aaf285cca09a245bcc9ca0d3c416a0358b..3fa64996cb51d8ce00e7c05384ca648332ee12bf 100644 --- a/src/app/geosource/components/dataset-detail/dataset-info/dataset-info.component.html +++ b/src/app/geosource/components/dataset-detail/dataset-info/dataset-info.component.html @@ -98,7 +98,7 @@ <div class="info-subsection"> <span class="info-subtitle" i18n="@@dataset.info.spatialExtent"> - Geographical extend + Geographical extent </span> <p> {{ geographicalInfo.geographicalExtend.maxEast }} @@ -179,7 +179,7 @@ <div class="info-section"> <span class="info-title" i18n="@@dataset.info.legalContraints"> - Legal constraints + Terms of use </span> <p *ngFor="let constraint of metadata.legalConstraints"> {{ constraint }} diff --git a/src/app/geosource/services/dataset-research.service.ts b/src/app/geosource/services/dataset-research.service.ts index fa68bed6bade828998b8f98e016dcd3b87732f08..e175ce19aa7a0367d0d2b42ca5d065950c8b29d1 100644 --- a/src/app/geosource/services/dataset-research.service.ts +++ b/src/app/geosource/services/dataset-research.service.ts @@ -245,7 +245,7 @@ export class DatasetResearchService { } aggregations[property]['buckets'].push({ - key: 'Autres', + key: geosource.licence.other, count_per_metadata: { value: countOtherBucket, }, diff --git a/src/app/user/components/auth/login/login.component.html b/src/app/user/components/auth/login/login.component.html index 253420e06d07c2ee837eabc24292d56b8646ce79..0c1dd701f123659199bd90bc4d0d9a7f928a6b24 100644 --- a/src/app/user/components/auth/login/login.component.html +++ b/src/app/user/components/auth/login/login.component.html @@ -60,8 +60,9 @@ <div class="has-text-centered"> <div i18n="@@login.noAccount">Don't have an account yet?</div> - <span i18n="@@login.noAccountInfo" class="no-account-info">Creating an account means giving you access to the data which has restricted access, and, if you wish, - engaging in a dialogue with us in order to continuously improve our services and inform you of developments that may be of your interest. + <span i18n="@@login.noAccountInfo" class="no-account-info">Creating an account allows you to access restricted data and, if you wish, + to engage in a dialogue + with us in order to continuously improve our services and inform you of developments that may be of your interest. Creating an account is free and without obligation. Unsubscription is possible at any time on request.</span> <a class="button button-gl is-outlined" [routerLink]="['/', AppRoutes.signup.uri]" routerLinkActive="active-link"> <span i18n="@@header.signUp">Sign Up</span> diff --git a/src/app/user/components/auth/sign-up/sign-up.component.html b/src/app/user/components/auth/sign-up/sign-up.component.html index 90b7c0481c205cb3beaa355c4875ab6ab1b65d07..2a1c4b0a8a8e9e0ff3826293f92aafb37b6cd312 100644 --- a/src/app/user/components/auth/sign-up/sign-up.component.html +++ b/src/app/user/components/auth/sign-up/sign-up.component.html @@ -268,13 +268,13 @@ </label> <p class="consent-text" i18n="@@consent.text"> Fields with an asterisk (*) are mandatory. Information in these fields will be - processed to enable responding to your request. Recipients of this information - are the community and metropolitan departments in charge of processing your + processed to respond to your request. Recipients of this information + are the metropolitan departments in charge of processing your request. In compliance with the “Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify information that - concerns you. To exercise this right and ascertain the information concerning - you, please contact: Lyon Métropole - Legal Affairs and Public Procurement - Department - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail + concerns you. To exercise this right and be transfered the information concerning + you, please contact: Lyon Métropole - Direction des + Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail or using the appropriate form on this portal. You may also oppose processing of your personal data for a legitimate reason. In this case, we will not be able to process the request submitted using this form. diff --git a/src/app/user/components/user-profil/user-profil.component.html b/src/app/user/components/user-profil/user-profil.component.html index a7b6e10e523156e41622dc98c1d1df79e155f984..cc43f11b7e609fb01eccd23de2ecbafc978a5704 100644 --- a/src/app/user/components/user-profil/user-profil.component.html +++ b/src/app/user/components/user-profil/user-profil.component.html @@ -138,13 +138,13 @@ </label> <p class="consent-text" i18n="@@consent.text"> Fields with an asterisk (*) are mandatory. Information in these fields will be - processed to enable responding to your request. Recipients of this information - are the community and metropolitan departments in charge of processing your + processed to respond to your request. Recipients of this information + are the metropolitan departments in charge of processing your request. In compliance with the “Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify information that - concerns you. To exercise this right and ascertain the information concerning - you, please contact: Lyon Métropole - Legal Affairs and Public Procurement - Department - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail + concerns you. To exercise this right and be transfered the information concerning + you, please contact: Lyon Métropole - Direction des + Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail or using the appropriate form on this portal. You may also oppose processing of your personal data for a legitimate reason. In this case, we will not be able to process the request submitted using this form. diff --git a/src/i18n/messages.en.xlf b/src/i18n/messages.en.xlf index 0aec40f6945290f566499207da56a578f615758f..b0f41a54becf0df08c45d0e2b565d3bea137e356 100644 --- a/src/i18n/messages.en.xlf +++ b/src/i18n/messages.en.xlf @@ -383,8 +383,8 @@ <target>Share the map</target> </trans-unit> <trans-unit id="dataset.detail.api" datatype="html"> - <source>API and downloads</source> - <target>API and downloads</target> + <source>API and download</source> + <target>API and download</target> </trans-unit> <trans-unit id="dataset.detail.info" datatype="html"> <source>This dataset doesn't contain geographical data.</source> @@ -427,8 +427,8 @@ <target>Coordinates system</target> </trans-unit> <trans-unit id="dataset.info.spatialExtent" datatype="html"> - <source>Geographical extend</source> - <target>Geographical extend</target> + <source>Geographical extent</source> + <target>Geographical extent</target> </trans-unit> <trans-unit id="dataset.info.scale" datatype="html"> <source>Scale</source> @@ -455,8 +455,8 @@ <target>Categories</target> </trans-unit> <trans-unit id="dataset.info.legalContraints" datatype="html"> - <source>Legal constraints</source> - <target>Legal constraints</target> + <source>Terms of use</source> + <target>Terms of use</target> </trans-unit> <trans-unit id="dataset.info.consultLicense" datatype="html"> <source>Consult the license</source> @@ -527,8 +527,8 @@ <target>Identity</target> </trans-unit> <trans-unit id="contact.lastname" datatype="html"> - <source>Lastname</source> - <target>Lastname</target> + <source>Last name</source> + <target>Last name</target> </trans-unit> <trans-unit id="contact.errors.missingLastname" datatype="html"> <source>You must indicate your lastname.</source> @@ -539,8 +539,8 @@ <target>Special characters are forbidden.</target> </trans-unit> <trans-unit id="contact.firstname" datatype="html"> - <source>Firstname</source> - <target>Firstname</target> + <source>First name</source> + <target>First name</target> </trans-unit> <trans-unit id="contact.errors.missingFirstname" datatype="html"> <source>You must indicate a firstname.</source> @@ -603,11 +603,13 @@ <target>Sign In</target> </trans-unit> <trans-unit id="login.noAccountInfo" datatype="html"> - <source>Creating an account means giving you access to the data which has restricted access, and, if you wish, - engaging in a dialogue with us in order to continuously improve our services and inform you of developments that may be of your interest. + <source>Creating an account allows you to access restricted data and, if you wish, + to engage in a dialogue + with us in order to continuously improve our services and inform you of developments that may be of your interest. Creating an account is free and without obligation. Unsubscription is possible at any time on request.</source> - <target>Creating an account means giving you access to the data which has restricted access, and, if you wish, - engaging in a dialogue with us in order to continuously improve our services and inform you of developments that may be of your interest. + <target>Creating an account allows you to access restricted data and, if you wish, + to engage in a dialogue + with us in order to continuously improve our services and inform you of developments that may be of your interest. Creating an account is free and without obligation. Unsubscription is possible at any time on request.</target> </trans-unit> <trans-unit id="login.noAccount" datatype="html"> @@ -1050,8 +1052,8 @@ <target>Ouch!</target> </trans-unit> <trans-unit id="cookieBanner.message" datatype="html"> - <source>By continuing to browse this site, you agree to the use of cookies to generate visit statistics. </source> - <target>By continuing to browse this site, you agree to the use of cookies to generate visit statistics. </target> + <source>By continuing to browse this site, you agree to the use of cookies. </source> + <target>By continuing to browse this site, you agree to the use of cookies. </target> </trans-unit> <trans-unit id="cookieBanner.more" datatype="html"> <source>Learn more</source> @@ -1071,24 +1073,24 @@ </trans-unit> <trans-unit id="consent.text" datatype="html"> <source>Fields with an asterisk (*) are mandatory. Information in these fields will be - processed to enable responding to your request. Recipients of this information - are the community and metropolitan departments in charge of processing your + processed to respond to your request. Recipients of this information + are the metropolitan departments in charge of processing your request. In compliance with the “Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify information that - concerns you. To exercise this right and ascertain the information concerning - you, please contact: Lyon Métropole - Legal Affairs and Public Procurement - Department - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail + concerns you. To exercise this right and be transfered the information concerning + you, please contact: Lyon Métropole - Direction des + Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail or using the appropriate form on this portal. You may also oppose processing of your personal data for a legitimate reason. In this case, we will not be able to process the request submitted using this form.</source> <target>Fields with an asterisk (*) are mandatory. Information in these fields will be - processed to enable responding to your request. Recipients of this information - are the community and metropolitan departments in charge of processing your + processed to respond to your request. Recipients of this information + are the metropolitan departments in charge of processing your request. In compliance with the “Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify information that - concerns you. To exercise this right and ascertain the information concerning - you, please contact: Lyon Métropole - Legal Affairs and Public Procurement - Department - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail + concerns you. To exercise this right and be transfered the information concerning + you, please contact: Lyon Métropole - Direction des + Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail or using the appropriate form on this portal. You may also oppose processing of your personal data for a legitimate reason. In this case, we will not be able to process the request submitted using this form.</target> diff --git a/src/i18n/messages.fr.xlf b/src/i18n/messages.fr.xlf index 4d02687a16c26fd40b1ee09ade3ab004d302a151..796b8b0b9f8d5cc5cd54edd2d015d437c3baf3ec 100644 --- a/src/i18n/messages.fr.xlf +++ b/src/i18n/messages.fr.xlf @@ -28,7 +28,7 @@ </trans-unit> <trans-unit id="footer.cgu" datatype="html"> <source>Terms of use</source> - <target>Conditions générales d'utilisation</target> + <target>Conditions d'utilisation</target> </trans-unit> <trans-unit id="menu.actors" datatype="html"> <source>Actors</source> @@ -387,7 +387,7 @@ <target>Partager la carte</target> </trans-unit> <trans-unit id="dataset.detail.api" datatype="html"> - <source>API and downloads</source> + <source>API and download</source> <target>API et téléchargements</target> </trans-unit> <trans-unit id="dataset.detail.info" datatype="html"> @@ -431,7 +431,7 @@ <target>Système de coordonnées</target> </trans-unit> <trans-unit id="dataset.info.spatialExtent" datatype="html"> - <source>Geographical extend</source> + <source>Geographical extent</source> <target>Étendue géographique</target> </trans-unit> <trans-unit id="dataset.info.scale" datatype="html"> @@ -459,7 +459,7 @@ <target>Catégories</target> </trans-unit> <trans-unit id="dataset.info.legalContraints" datatype="html"> - <source>Legal constraints</source> + <source>Terms of use</source> <target>Contraintes légales</target> </trans-unit> <trans-unit id="dataset.info.consultLicense" datatype="html"> @@ -536,7 +536,7 @@ <target>Identité</target> </trans-unit> <trans-unit id="contact.lastname" datatype="html"> - <source>Lastname</source> + <source>Last name</source> <target>Nom de famille</target> </trans-unit> <trans-unit id="contact.errors.missingLastname" datatype="html"> @@ -548,7 +548,7 @@ <target>Les caractères spéciaux sont interdits.</target> </trans-unit> <trans-unit id="contact.firstname" datatype="html"> - <source>Firstname</source> + <source>First name</source> <target>Prénom</target> </trans-unit> <trans-unit id="contact.errors.missingFirstname" datatype="html"> @@ -612,8 +612,9 @@ <target>Connexion</target> </trans-unit> <trans-unit id="login.noAccountInfo" datatype="html"> - <source>Creating an account means giving you access to the data which has restricted access, and, if you wish, - engaging in a dialogue with us in order to continuously improve our services and inform you of developments that may be of your interest. + <source>Creating an account allows you to access restricted data and, if you wish, + to engage in a dialogue + with us in order to continuously improve our services and inform you of developments that may be of your interest. Creating an account is free and without obligation. Unsubscription is possible at any time on request.</source> <target>Créer un compte c'est vous permettre d'accéder aux données dont l'accès est limité, et, si vous le souhaitez, engager un dialogue avec vous afin de nous améliorer en continu et vous prévenir des évolutions pouvant vous intéresser. La création d'un compte est gratuite et sans engagement. La désinscription est possible à tout moment sur demande.</target> @@ -1009,7 +1010,7 @@ La création d'un compte est gratuite et sans engagement. La désinscription est </trans-unit> <trans-unit id="sitemap.cgu" datatype="html"> <source>General conditions of use</source> - <target>Conditions générales d'utilisation</target> + <target>Conditions d'utilisation</target> </trans-unit> <!-- Results page --> @@ -1058,8 +1059,8 @@ La création d'un compte est gratuite et sans engagement. La désinscription est <target>Aïe !</target> </trans-unit> <trans-unit id="cookieBanner.message" datatype="html"> - <source>By continuing to browse this site, you agree to the use of cookies to generate visit statistics. </source> - <target>En poursuivant votre navigation sur ce site, vous acceptez l’utilisation de cookies pour réaliser des statistiques de visites. </target> + <source>By continuing to browse this site, you agree to the use of cookies. </source> + <target>En poursuivant votre navigation sur ce site, vous acceptez l’utilisation de cookies. </target> </trans-unit> <trans-unit id="cookieBanner.more" datatype="html"> <source>Learn more</source> @@ -1079,13 +1080,13 @@ La création d'un compte est gratuite et sans engagement. La désinscription est </trans-unit> <trans-unit id="consent.text" datatype="html"> <source>Fields with an asterisk (*) are mandatory. Information in these fields will be - processed to enable responding to your request. Recipients of this information - are the community and metropolitan departments in charge of processing your + processed to respond to your request. Recipients of this information + are the metropolitan departments in charge of processing your request. In compliance with the “Digital Technology and Freedom” law dated January 6, 1978, you have the right to access and rectify information that - concerns you. To exercise this right and ascertain the information concerning - you, please contact: Lyon Métropole - Legal Affairs and Public Procurement - Department - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail + concerns you. To exercise this right and be transfered the information concerning + you, please contact: Lyon Métropole - Direction des + Affaires Juridiques et de la Commande Publique - 20 Rue du Lac - BP 33569 - 69505 Lyon Cedex 03, by postal mail or using the appropriate form on this portal. You may also oppose processing of your personal data for a legitimate reason. In this case, we will not be able to process the request submitted using this form.</source> diff --git a/src/i18n/traductions.fr.ts b/src/i18n/traductions.fr.ts index cffd91b2a9550e94d98f75850eeebe45a40ad93c..3e448395d6432e0a00510b4dc440cd68a1c491c6 100644 --- a/src/i18n/traductions.fr.ts +++ b/src/i18n/traductions.fr.ts @@ -150,7 +150,7 @@ export const geosource = { formats: 'Formats', services: 'Services', publicationYear: 'Année de publication', - type: 'Type', + type: 'Types', }, button: { more: '+ Voir plus', @@ -190,6 +190,9 @@ export const geosource = { copied: 'Copié !', share: 'Copier le lien', }, + licence: { + other: 'Autre licence', + }, }; export const subjects = [ diff --git a/src/i18n/traductions.ts b/src/i18n/traductions.ts index b070c9372a32f49e170bbf6b0588be68f45ff9b1..2dae299512ec815ff67bbacd76757196531ea627 100644 --- a/src/i18n/traductions.ts +++ b/src/i18n/traductions.ts @@ -147,7 +147,7 @@ export const geosource = { formats: 'Formats', services: 'Services', publicationYear: 'Publication year', - type: 'Type', + type: 'Types', }, button: { more: '+ See more', @@ -188,6 +188,9 @@ export const geosource = { copied: 'Copied !', share: 'Copy the link', }, + licence: { + other: 'Other license', + }, }; export const subjects = [