Skip to content

Commit

Permalink
Fix Tchap name in various places, some missing logos
Browse files Browse the repository at this point in the history
  • Loading branch information
celiacheff committed Mar 22, 2022
1 parent a0cb207 commit 33d325d
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 31 deletions.
29 changes: 9 additions & 20 deletions config.sample.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"default_server_config": {
"m.homeserver": {
"base_url": "https://matrix.i.tchap.gouv.fr",
"server_name": "Matrix Internes Preprod"
"server_name": "Internes - Preprod"
},
"m.identity_server": {
"base_url": "https://matrix.i.tchap.gouv.fr"
Expand Down Expand Up @@ -34,12 +34,6 @@
"i.tchap.gouv.fr"
]
},
"piwik": {
"url": "https://piwik.riot.im/",
"whitelistedHSUrls": ["https://matrix.org"],
"whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
"siteId": 1
},
"enable_presence_by_hs_url": {
"https://matrix.org": false,
"https://matrix-client.matrix.org": false
Expand All @@ -53,25 +47,20 @@
"name": "Tchap",
"is_dark": false,
"colors": {
"accent": "#162d58",
"primary": "#368bd6",
"warning": "#ff4b55",
"sidebar-color": "#162d58",
"roomlist-background-color": "#f3f8fd",
"roomlist-text-color": "#2e2f32",
"roomlist-text-secondary-color": "#61708b",
"roomlist-highlights-color": "#ffffff",
"roomlist-separator-color": "#e3e8f0",
"timeline-background-color": "#ffffff",
"timeline-text-color": "#2e2f32",
"timeline-text-secondary-color": "#61708b",
"timeline-highlights-color": "#f3f8fd"
"accent": "#162d58"
}
}
]
},
"branding": {
"authHeaderLogoUrl": "themes/element/img/logos/tchap-logo.svg",
"authFooterLinks": []
},
"jitsi": {
"preferredDomain": "meet.element.io"
},
"desktopBuilds": {
"available": false
},
"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
}
6 changes: 3 additions & 3 deletions res/manifest.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "Element",
"short_name": "Element",
"name": "Tchap",
"short_name": "Tchap",
"display": "standalone",
"theme_color": "#76CFA6",
"theme_color": "#162d58",
"start_url": "index.html",
"icons": [
{
Expand Down
4 changes: 2 additions & 2 deletions res/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@

<div class="mx_Parent">
<a href="https://element.io" target="_blank" rel="noopener">
<img src="welcome/images/logo.svg" alt="" class="mx_Logo"/>
<img src="themes/element/img/logos/tchap-logo.svg" alt="" class="mx_Logo"/>
</a>
<h1 class="mx_Header_title">_t("Welcome to Element")</h1>
<h1 class="mx_Header_title">_t("Welcome to Tchap")</h1>
<h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collaboration powered by [matrix]")</h4>
<div class="mx_ButtonGroup">
<div class="mx_ButtonRow">
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"I understand the risks and wish to continue": "I understand the risks and wish to continue",
"Go to element.io": "Go to element.io",
"Failed to start": "Failed to start",
"Welcome to Element": "Welcome to Element",
"Welcome to Tchap": "Welcome to Tchap",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
"Sign In": "Sign In",
"Create Account": "Create Account",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/strings/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"powered by Matrix": "propulsé par Matrix",
"Unknown device": "Appareil inconnu",
"You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.",
"Welcome to Element": "Bienvenue sur Element",
"Welcome to Tchap": "Bienvenue sur Tchap",
"Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]",
"Sign In": "Se connecter",
"Create Account": "Créer un compte",
Expand Down
8 changes: 4 additions & 4 deletions src/vector/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en" style="height: 100%;">
<head>
<meta charset="utf-8">
<title>Element</title>
<title>Tchap</title>
<link rel="apple-touch-icon" sizes="57x57" href="<%= require('../../res/vector-icons/apple-touch-icon-57.png') %>">
<link rel="apple-touch-icon" sizes="60x60" href="<%= require('../../res/vector-icons/apple-touch-icon-60.png') %>">
<link rel="apple-touch-icon" sizes="72x72" href="<%= require('../../res/vector-icons/apple-touch-icon-72.png') %>">
Expand All @@ -16,8 +16,8 @@
<meta name="referrer" content="no-referrer">
<link rel="shortcut icon" href="<%= require('../../res/vector-icons/favicon.ico') %>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="apple-mobile-web-app-title" content="Element">
<meta name="application-name" content="Element">
<meta name="apple-mobile-web-app-title" content="Tchap">
<meta name="application-name" content="Tchap">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-TileImage" content="<%= require('../../res/vector-icons/mstile-150.png') %>">
<meta name="msapplication-config" content="<%= require('../../res/vector-icons/browserconfig.xml') %>">
Expand Down Expand Up @@ -59,7 +59,7 @@

</head>
<body style="height: 100%; margin: 0;">
<noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
<noscript>Sorry, Tchap requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
<section id="matrixchat" style="height: 100%;" class="notranslate"></section>
<script src="<%= htmlWebpackPlugin.files.js.find(entry => entry.includes("bundle.js")) %>"></script>

Expand Down

0 comments on commit 33d325d

Please sign in to comment.