Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TCHAP: update to urls to tchap.numerique.gouv.fr #1198

Merged
merged 2 commits into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Questions & support
url: https://tchap.beta.gouv.fr/#contact
url: https://tchap.numerique.gouv.fr/#contact
about: Please ask and answer questions here.
4 changes: 2 additions & 2 deletions config.dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@
"permalink_prefix": "https://www.tchap.incubateur.net",
"terms_and_conditions_links": [
{
"url": "https://www.tchap.beta.gouv.fr/cgu",
"url": "https://tchap.numerique.gouv.fr/cgu",
"text": "Read the CGU"
},
{
"url": "https://tchap.beta.gouv.fr/politique-de-confidentialite",
"url": "https://tchap.numerique.gouv.fr/politique-de-confidentialite",
"text": "Read the Privacy Policy"
}
],
Expand Down
4 changes: 2 additions & 2 deletions config.preprod.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@
"permalink_prefix": "https://www.beta.tchap.gouv.fr",
"terms_and_conditions_links": [
{
"url": "https://www.tchap.beta.gouv.fr/cgu",
"url": "https://tchap.numerique.gouv.fr/cgu",
"text": "Read the CGU"
},
{
"url": "https://tchap.beta.gouv.fr/politique-de-confidentialite",
"url": "https://tchap.numerique.gouv.fr/politique-de-confidentialite",
"text": "Read the Privacy Policy"
}
],
Expand Down
4 changes: 2 additions & 2 deletions config.prod.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@
"permalink_prefix": "https://tchap.gouv.fr",
"terms_and_conditions_links": [
{
"url": "https://www.tchap.beta.gouv.fr/cgu",
"url": "https://tchap.numerique.gouv.fr/cgu",
"text": "Read the CGU"
},
{
"url": "https://tchap.beta.gouv.fr/politique-de-confidentialite",
"url": "https://tchap.numerique.gouv.fr/politique-de-confidentialite",
"text": "Read the Privacy Policy"
}
],
Expand Down
4 changes: 2 additions & 2 deletions config.prod.lab.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@
"permalink_prefix": "https://tchap.gouv.fr",
"terms_and_conditions_links": [
{
"url": "https://www.tchap.beta.gouv.fr/cgu",
"url": "https://tchap.numerique.gouv.fr/cgu",
"text": "Read the CGU"
},
{
"url": "https://tchap.beta.gouv.fr/politique-de-confidentialite",
"url": "https://tchap.numerique.gouv.fr/politique-de-confidentialite",
"text": "Read the Privacy Policy"
}
],
Expand Down
6 changes: 3 additions & 3 deletions res/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
<img src="$logoUrl" alt="" class="mx_Logo" />
</a>
-->
<a href="https://tchap.beta.gouv.fr?mtm_camapaign=TchapWebConnectLogo" target="_blank" rel="noopener">
<a href="https://tchap.numerique.gouv.fr?mtm_camapaign=TchapWebConnectLogo" target="_blank" rel="noopener">
<img src="$logoUrl" alt="Logo Tchap" class="mx_Logo" />
</a>
<h1 class="mx_Header_title">_t("Welcome to Tchap")<br />
Expand All @@ -287,13 +287,13 @@ <h1 class="mx_Header_title">_t("Welcome to Tchap")<br />
<!-- XXX: Our translations system isn't smart enough to recognize variables in the HTML, so we manually do it -->
<div class="tc_paragraph">
_t("Conçue et gérée par l'Administration française")
<a href="https://tchap.beta.gouv.fr?mtm_campaign=TchapWebConnectLogo" >
<a href="https://tchap.numerique.gouv.fr?mtm_campaign=TchapWebConnectLogo" >
<div>_t("action|learn_more")</div>
</a>
</div>
<div class="mx_ButtonGroup">
<div class="mx_ButtonRow mx_Center_content">
<a href="https://tchap.beta.gouv.fr?mtm_campaign=TchapWebConnectLogo"
<a href="https://tchap.numerique.gouv.fr?mtm_campaign=TchapWebConnectLogo"
class="mx_ButtonParent mx_SecondaryButton ">
<div>_t("action|learn_more")</div>
</a>
Expand Down
4 changes: 2 additions & 2 deletions res/welcome_sso.html
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
</style>

<div class="mx_Parent">
<a href="https://tchap.beta.gouv.fr?mtm_camapaign=TchapWebConnectLogo" target="_blank" rel="noopener">
<a href="https://tchap.numerique.gouv.fr?mtm_camapaign=TchapWebConnectLogo" target="_blank" rel="noopener">
<img src="$logoUrl" alt="Logo Tchap" class="mx_Logo" />
</a>
<h1 class="mx_Header_title">_t("Welcome to Tchap")<br />
Expand All @@ -256,7 +256,7 @@ <h1 class="mx_Header_title">_t("Welcome to Tchap")<br />
<!-- XXX: Our translations system isn't smart enough to recognize variables in the HTML, so we manually do it -->
<div class="tc_paragraph">
_t("Conçue et gérée par l'Administration française")
<a href="https://tchap.beta.gouv.fr?mtm_campaign=TchapWebConnectLogo" >
<a href="https://tchap.numerique.gouv.fr?mtm_campaign=TchapWebConnectLogo" >
<div>_t("action|learn_more")</div>
</a>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/tchap/util/TchapUrls.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export default class TchapUrls {
//tchap status page
public static statusPage = "https://status.tchap.numerique.gouv.fr"

//tchap FAQ page on locked messages. Should redirect to the appropriate crisp page on https://aide.tchap.beta.gouv.fr
public static lockedMessagesPage = "https://tchap.beta.gouv.fr/faq/messages-verrouilles";
//tchap FAQ page on locked messages.
public static lockedMessagesPage = "https://aide.tchap.beta.gouv.fr/fr/article/dechiffrement-en-cours-mes-messages-restent-verrouilles-atnp15/";

// help page to verify decices, used
public static helpVerifyDevicesPage = "https://aide.tchap.beta.gouv.fr/fr/article/comment-verifier-un-nouvel-appareil-sur-tchap-xm0b0y/";
Expand Down
Loading