Skip to content

Commit a8ea96a

Browse files
committed
Add links to english forum in UI and Github repository
1 parent df87bc4 commit a8ea96a

File tree

8 files changed

+24
-17
lines changed

8 files changed

+24
-17
lines changed

.github/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ We use github to host code, to track issues and feature requests, as well as acc
2121

2222
## Before making a Pull Request
2323

24-
Make sure you discussed with the team on [Gladys Community](https://community.gladysassistant.com/) to ensure your pull request goes in the same direction as current developements 🙂
24+
Make sure you discussed with the team on our Gladys [french forum](https://community.gladysassistant.com/) or [english forum](https://en-community.gladysassistant.com/) to ensure your pull request goes in the same direction as current developements 🙂
2525

2626
Then, create a GitHub Issue to indicate that you're working on the topic.
2727

.github/ISSUE_TEMPLATE/bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ about: Report a bug to help us improve Gladys Assistant
55

66
First, are you sure that you found a Gladys bug?
77

8-
If you are not sure, you can come discuss with us on [Gladys Community](http://community.gladysassistant.com/) 🙂
8+
If you are not sure, you can come discuss with us on our community, in [french](http://community.gladysassistant.com/) or [english](https://en-community.gladysassistant.com/) 🙂
99

1010
**Describe the bug**
1111
A clear and concise description of what the bug is.

.github/ISSUE_TEMPLATE/config.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
blank_issues_enabled: true
22
contact_links:
3-
- name: Gladys Assistant Forum
3+
- name: Gladys Assistant english forum
4+
url: https://en-community.gladysassistant.com/
5+
about: We use this forum for questions & support in english.
6+
- name: Gladys Assistant french Forum
47
url: https://community.gladysassistant.com/
5-
about: We use the forum for questions & support.
6-
- name: Feature Requests
8+
about: We use the forum for questions & support in french.
9+
- name: Feature Requests (english)
10+
url: https://en-community.gladysassistant.com/c/feature-requests/7/l/latest?order=votes
11+
about: We use our forum as feature requests. You can create feature requests there, and vote for them.
12+
- name: Feature Requests (french)
713
url: https://community.gladysassistant.com/c/international/feature-requests/53
814
about: We use our forum as feature requests. You can create feature requests there, and vote for them.

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ To ensure your Pull Request can be accepted as fast as possible, make sure to re
77
- [ ] Is the linter passing? (`npm run eslint` on both front/server)
88
- [ ] Did you run prettier? (`npm run prettier` on both front/server)
99
- [ ] If you are adding a new features/services, did you run integration comparator? (`npm run compare-translations` on front)
10-
- [ ] Did you test this pull request in real life? With real devices? If this development is a big feature or a new service, we recommend that you provide a Docker image to [the community](https://community.gladysassistant.com/) for testing before merging.
10+
- [ ] Did you test this pull request in real life? With real devices? If this development is a big feature or a new service, we recommend that you provide a Docker image to the community ([french forum](https://community.gladysassistant.com/)/[english forum](https://en-community.gladysassistant.com/)) for testing before merging.
1111
- [ ] If your changes modify the API (REST or Node.js), did you modify the API documentation? (Documentation is based on comments in code)
1212
- [ ] If you are adding a new features/services which needs explanation, did you modify the user documentation? See [the GitHub repo](https://github.com/GladysAssistant/v4-website) and the [website](https://gladysassistant.com).
1313
- [ ] Did you add fake requests data for the demo mode (`front/src/config/demo.js`) so that the demo website is working without a backend? (if needed) See [https://demo.gladysassistant.com](https://demo.gladysassistant.com).

.github/SUPPORT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
First, thanks for trying out Gladys!
44

5-
The best place to ask for help is our [Gladys Community Forum](https://community.gladysassistant.com/).
5+
The best place to ask for help is our forum, in [french](https://community.gladysassistant.com/) or [english](https://en-community.gladysassistant.com/).
66

77
Please **_do not_** raise an issue on GitHub if it's a support problem!
88

SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Reporting a Vulnerability
44

5-
To report a vulnerability, you can contact us on [Gladys Assistant forum](https://community.gladysassistant.com/) in private, or on the contact form [on our website](https://gladysassistant.com/contact/).
5+
To report a vulnerability, you can contact us on Gladys Assistant [french forum](https://community.gladysassistant.com/) or [english forum](https://en-community.gladysassistant.com/) in private, or on the contact form [on our website](https://gladysassistant.com/contact/).

front/src/components/header/index.jsx

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Text, Localizer } from 'preact-i18n';
22
import cx from 'classnames';
3+
import get from 'get-value';
34
import { Link } from 'preact-router/match';
45
import { isUrlInArray } from '../../utils/url';
56
import { USER_ROLE } from '../../../../server/utils/constants';
@@ -27,6 +28,11 @@ const Header = ({ ...props }) => {
2728
if (isUrlInArray(props.currentUrl, PAGES_WITHOUT_HEADER)) {
2829
return null;
2930
}
31+
// Adapt forum URL to user language
32+
const userLanguage = get(props, 'user.language');
33+
const forumUrl =
34+
userLanguage === 'fr' ? 'https://community.gladysassistant.com/' : 'https://en-community.gladysassistant.com/';
35+
3036
if (props.fullScreen) {
3137
return null;
3238
}
@@ -73,12 +79,7 @@ const Header = ({ ...props }) => {
7379
</a>
7480
)}
7581
<div class="dropdown-divider" />
76-
<a
77-
class="dropdown-item"
78-
href="https://community.gladysassistant.com/"
79-
target="_blank"
80-
rel="noopener noreferrer"
81-
>
82+
<a class="dropdown-item" href={forumUrl} target="_blank" rel="noopener noreferrer">
8283
<i class="dropdown-icon fe fe-help-circle" /> <Text id="header.needHelp" />
8384
</a>
8485
<a class="dropdown-item" href="" onClick={props.logout}>

front/src/config/i18n/en.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"global": {
33
"logoAlt": "Gladys logo",
4-
"needHelpText": "Need help? Join us on <a href=\"https://community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>.",
4+
"needHelpText": "Need help? Join us on <a href=\"https://en-community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>.",
55
"new": "New",
66
"orderDirAsc": "A - Z",
77
"orderDirDesc": "Z - A",
@@ -65,7 +65,7 @@
6565
"loginButtonText": "Log in",
6666
"wrongCredentials": "Wrong email/password.",
6767
"invalidEmail": "Invalid email",
68-
"needHelpText": "Need help? Join us on <a href=\"https://community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>."
68+
"needHelpText": "Need help? Join us on <a href=\"https://en-community.gladysassistant.com/\" target=\"_blank\" rel=\"noopener noreferrer\"> Gladys Community</a>."
6969
},
7070
"signup": {
7171
"welcome": {
@@ -1752,7 +1752,7 @@
17521752
"rateLimitError": "You have tried this form too many time. Please retry in 30 minutes or restart your Gladys instance now.",
17531753
"invalidEmail": "We are unable to verify your email address.",
17541754
"validationLinkConfirmation": "Are you sure you clicked/copied the link correctly?",
1755-
"contactUs": "If it still not working, please contact us on <a href=\"https://twitter.com/gladysassistant\">Twitter</a> or on <a href=\"https://community.gladysassistant.com\">Gladys Community</a>.",
1755+
"contactUs": "If it still not working, please contact us on <a href=\"https://twitter.com/gladysassistant\">Twitter</a> or on <a href=\"https://en-community.gladysassistant.com\">Gladys Community</a>.",
17561756
"emailConfirmed": "Email Confirmed",
17571757
"signIn": "Sign in",
17581758
"confirmationInProgress": "Confirmation in progress..."

0 commit comments

Comments
 (0)