From 716c0a5a4334915c8628cc7c117505e25692c781 Mon Sep 17 00:00:00 2001 From: Andrew Tavis McAllister Date: Mon, 28 Aug 2023 03:03:48 +0200 Subject: [PATCH] #288 #310 update of l10n strings, style guide for l10n and privacy update --- CONTRIBUTING.md | 6 +- PRIVACY.txt | 86 +- STYLEGUIDE.md | 52 +- frontend/components/PageBreadcrumbs.vue | 4 +- frontend/components/SearchBar.vue | 56 +- frontend/components/WebsiteHeader.vue | 44 +- frontend/components/btn/BtnRoadMap.vue | 2 +- frontend/components/card/CardAbout.vue | 9 +- frontend/components/card/CardConnect.vue | 6 +- frontend/components/card/CardDangerZone.vue | 14 +- frontend/components/card/CardGetInvolved.vue | 16 +- .../components/card/CardLegalDisclaimer.vue | 2 +- .../search-result/CardSearchResultEvent.vue | 3 +- .../CardSearchResultOrganization.vue | 6 +- frontend/components/footer/Footer.vue | 22 +- frontend/components/footer/FooterFlex.vue | 20 +- frontend/components/footer/FooterFlexCol.vue | 18 +- .../components/grid/GridGithubShields.vue | 8 +- frontend/components/grid/GridHomeMetrics.vue | 8 +- frontend/components/grid/GridSupporters.vue | 18 +- .../ImageLogo.vue} | 0 .../landing/LandingCommunityBanner.vue | 12 +- frontend/components/landing/LandingSplash.vue | 8 +- .../components/landing/LandingTechBanner.vue | 6 +- frontend/components/menu/MenuMobileNavBar.vue | 19 +- .../components/menu/MenuMobileSelector.vue | 8 +- frontend/components/modal/ModalImage.vue | 4 +- .../components/selector/SelectorTheme.vue | 14 +- .../sidebar/left/SidebarLeftFooter.vue | 70 +- .../sidebar/left/SidebarLeftIndex.vue | 136 +-- .../left/SidebarLeftMainSectionSelectors.vue | 13 +- .../sidebar/left/SidebarLeftSelector.vue | 8 +- frontend/error.vue | 7 +- frontend/i18n/en-US.json | 820 +++++++++--------- frontend/pages/about/activism-network.vue | 3 +- frontend/pages/about/connect.vue | 13 - frontend/pages/about/impress.vue | 23 +- frontend/pages/about/index.vue | 36 +- frontend/pages/about/roadmap.vue | 25 +- frontend/pages/blog/index.vue | 3 +- frontend/pages/careers/index.vue | 4 +- frontend/pages/docs/get-active.vue | 66 +- frontend/pages/docs/get-organized.vue | 30 +- frontend/pages/docs/grow-organization.vue | 49 +- frontend/pages/docs/index.vue | 3 +- frontend/pages/events/[id]/about.vue | 10 +- frontend/pages/events/[id]/resources.vue | 2 +- .../[id]/{settings..vue => settings.vue} | 0 frontend/pages/events/[id]/team.vue | 2 +- frontend/pages/events/index.vue | 4 +- frontend/pages/finances/index.vue | 3 +- frontend/pages/help/contact.vue | 29 +- frontend/pages/help/faq.vue | 28 +- frontend/pages/help/index.vue | 3 +- frontend/pages/help/press.vue | 3 +- frontend/pages/help/status.vue | 3 +- frontend/pages/home/index.vue | 4 +- frontend/pages/index.vue | 3 +- frontend/pages/legal/index.vue | 3 +- frontend/pages/legal/legal-support.vue | 3 +- frontend/pages/legal/privacy-policy.vue | 80 +- frontend/pages/legal/trademark-policy.vue | 72 +- frontend/pages/organizations/[id]/about.vue | 8 +- frontend/pages/organizations/[id]/events.vue | 2 +- frontend/pages/organizations/[id]/faq.vue | 2 +- frontend/pages/organizations/[id]/groups.vue | 2 +- frontend/pages/organizations/index.vue | 4 +- frontend/pages/supporters/index.vue | 39 +- frontend/pages/supporters/join.vue | 67 +- frontend/utils/navMenuItems.ts | 13 +- 70 files changed, 1169 insertions(+), 1000 deletions(-) rename frontend/components/{landing/LandingLogoImage.vue => image/ImageLogo.vue} (100%) delete mode 100644 frontend/pages/about/connect.vue rename frontend/pages/events/[id]/{settings..vue => settings.vue} (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72427c361..7d137666b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -37,7 +37,7 @@ Thank you for your interest in contributing to activist.org! We look forward to - activist would suggest that you use the [Element](https://element.io/) client - The [General](https://matrix.to/#/!uIGQUxlCnEzrPiRsRw:matrix.org?via=matrix.org&via=effektio.org&via=acter.global) and [Development](https://matrix.to/#/!CRgLpGeOBNwxYCtqmK:matrix.org?via=matrix.org&via=acter.global&via=chat.0x7cd.xyz) channels would be great places to start! - Feel free to introduce yourself and tell us what your interests are if you're comfortable :) -- Read through this contributing guide and the [styleguide](https://github.com/activist-org/activist/blob/main/STYLEGUIDE.md) for all the information you need to contribute +- Read through this contributing guide and the [style guide](https://github.com/activist-org/activist/blob/main/STYLEGUIDE.md) for all the information you need to contribute - Look into issues marked [`good first issue`](https://github.com/activist-org/activist/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) and the [Projects board](https://github.com/orgs/activist-org/projects/1) to get a better understanding of what you can work on - Check out our [public designs on Figma](https://www.figma.com/file/I9McFfaLu1RiiWp5IP3YjE/activist_public_designs?type=design&node-id=10%3A18&mode=design&t=tdQyOtl5lU1n7oLN-1) to understand activist's goals and direction - Consider joining our [bi-weekly developers sync](https://etherpad.wikimedia.org/p/activist-dev-sync)! @@ -248,7 +248,9 @@ Thank you in advance for your contributions! ## Localization [`⇧`](#contents) -Those interested in contributing to localization for the app are welcome to check related issues using the [`localization`](https://github.com/activist-org/activist/issues?q=is%3Aopen+is%3Aissue+label%3Alocalization) label in the [issues](https://github.com/activist-org/activist/issues). +Localization for activist happens within our [public localization project on Transifex](https://explore.transifex.com/activist-org/activist). Join us there if you'd like to help bring activist to other languages! + +To find issues related to localization, please see the [`localization`](https://github.com/activist-org/activist/issues?q=is%3Aopen+is%3Aissue+label%3Alocalization) label in the [issues](https://github.com/activist-org/activist/issues), and to report a localization issue use the [localization issue form](https://github.com/activist-org/activist/issues/new?assignees=&labels=localization&projects=activist-org%2F1&template=localization.yml). Please also see the [style guide](https://github.com/activist-org/activist/blob/main/STYLEGUIDE.md) for more information on how to create new localization keys. diff --git a/PRIVACY.txt b/PRIVACY.txt index d02f915c9..dadb8ebf2 100644 --- a/PRIVACY.txt +++ b/PRIVACY.txt @@ -1,4 +1,6 @@ -Effective Date: 11th of April, 2023 +Privacy Policy + +Last updated August 28th, 2023 Introduction @@ -9,69 +11,61 @@ information. By using activist.org, you agree to the provisions of this Privacy Policy. Our primary goal is to provide a platform that allows users to engage in -activism without compromising their privacy. We have implemented various -measures to ensure the privacy and security of our users. If you have any -questions or concerns, please contact us. +activism without compromising their safety. We have and will continue to +implement various measures to ensure the privacy and security of our users. +If you have any questions or concerns, please contact us at +security[at]activist.org. -Information We Collect +We encourage users to contribute to activist.org and participate in discussions +about privacy, security, and other important topics. By engaging with our +community, you can help shape the future of activist.org and ensure that it +remains a safe, inclusive, and empowering platform for all. -activist.org does not collect any personal information from our users at -this time. We do not collect data such as names, email addresses, phone -numbers, or any other information that can be used to identify you personally. -Our platform is designed to provide a safe and private environment for -activism and collaboration. +Information We Collect -As an open-source platform, we prioritize transparency and user control. -We encourage users to contribute to activist.org and share their ideas, -questions, and concerns. We also strive to provide a platform that fosters -inclusivity and support for all users, regardless of their background. +activist.org uses Plausible Analytics for non-identifiable tracking of the +regions from which people visit. The platform does not collect any personally +identifiable information from our users at this time. In the future we will +collect user generated usernames that could be used to identify individuals as +well as email addresses of some users. We will do our best to provide options for +people to use the platform without providing personally identifiable +information wherever possible. How We Use Information -As we do not collect personal information, we do not use any such -information for any purpose. Our goal is to provide a platform that -allows users to engage in activism without compromising their privacy. - -We aim to foster a sense of community and collaboration among users, -allowing them to connect with like-minded individuals and organizations. -We also work to provide resources and tools that enable users to learn -about and engage with important social, political, and environmental -issues. +We use the anonymous location data we collect from Plausible Analytics +to get a better idea of where there's interest in the platform. As we do not +collect personal information at this time, we do not use any such information +for any purpose. Data Sharing and Third-Party Services -We do not share your personal information with any third parties, nor do -we use any third-party services that collect or process personal -information. activist.org is dedicated to ensuring the privacy of our -users and maintaining a secure platform. - -As an open-source platform, we collaborate with various organizations and -individuals who share our values and goals. We strive to build partnerships -that enhance the functionality and reach of activist.org while maintaining -our commitment to user privacy and security. +We do not share your personal information with any third parties. activist.org +is dedicated to ensuring the privacy of our users. The team has no plans to share +data with parties outside of our organization. Data Security and Breaches -We are committed to protecting the security of our platform and the +We are committed to ensuring the security of our platform and the information of our users. In the event of a data breach, we will promptly notify affected users and take appropriate measures to address the situation. -We implement various security measures, such as encryption and secure -connections, to protect the integrity of our platform and the safety of -our users. We also encourage users to practice good security habits, such -as using strong passwords and enabling two-factor authentication when -available. +We plan to implement various security measures to protect the integrity of our +platform and the safety of our users. We also encourage users to practice good +security habits, such as using strong passwords and enabling two-factor +authentication when available. Your Rights -As we do not collect personal information, you do not need to worry about -exercising any rights related to your personal data. However, if you have +As we do not collect personal information at this time, you do not need to worry +about exercising any rights related to your personal data. However, if you have any questions or concerns about this Privacy Policy or our practices, please -feel free to contact us. +feel free to contact us at security[at]activist.org. + +Changes to This Policy -We are committed to transparency and user control. We encourage users to -contribute to activist.org and participate in discussions about privacy, -security, and other important topics. By engaging with our community, you -can help shape the future of activist.org and ensure that it remains a safe, -inclusive, and empowering platform for all. +We may update this Privacy Policy from time to time. If we make significant +changes, we will notify you through the platform or by other means. By continuing +to use activist.org after any changes are in effect, you agree to the updated +Privacy Policy. diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md index 31c7b371f..df5eec4d4 100644 --- a/STYLEGUIDE.md +++ b/STYLEGUIDE.md @@ -18,8 +18,9 @@ If you have questions or would like to communicate with the team, please [join u - [Colors](#colors) - [Font](#font) - [Text size](#text-size) -- [Tab size](#tab-size) +- [Localization](#localization) - [Icons](#icons) +- [Tab size](#tab-size) - [Padding](#padding) @@ -158,11 +159,48 @@ The fonts for activist are [Red Hat Text and Red Hat Display](https://www.redhat

Page Header

``` - + -## Tab size [`⇧`](#contents) +## Localization [`⇧`](#contents) -Codes on the frontend for Vue (` - + diff --git a/frontend/pages/blog/index.vue b/frontend/pages/blog/index.vue index ba7c75a30..e998033b5 100644 --- a/frontend/pages/blog/index.vue +++ b/frontend/pages/blog/index.vue @@ -9,5 +9,4 @@ - + diff --git a/frontend/pages/careers/index.vue b/frontend/pages/careers/index.vue index ebcce35cb..438857904 100644 --- a/frontend/pages/careers/index.vue +++ b/frontend/pages/careers/index.vue @@ -9,6 +9,4 @@ - + diff --git a/frontend/pages/docs/get-active.vue b/frontend/pages/docs/get-active.vue index 233192ff3..e285e694f 100644 --- a/frontend/pages/docs/get-active.vue +++ b/frontend/pages/docs/get-active.vue @@ -30,7 +30,7 @@ class="items-center text-left space-y-4 2xl:col-span-1 2xl:row-start-1 md:items-start" >

- {{ $t("pages.docs.get-active.page-title") }} + {{ $t("pages.docs.get-active.header") }}

- {{ $t("pages.docs.get-active.subtitle-1") }} + {{ $t("pages.docs.get-active.subheader-pt-1") }} - {{ $t("pages.docs.get-active.subtitle-2") }} + {{ $t("pages.docs.get-active.subheader-pt-2") }} - {{ $t("pages.docs.get-active.subtitle-3") }} + {{ $t("pages.docs.get-active.subheader-pt-3") }}

- {{ $t("pages.docs.get-active.paragraph-1-pt1") }} - {{ $t("pages.docs.get-active.paragraph-1-pt2") }} {{ $t("pages.docs.get-active.paragraph-1-pt3") }} {{ $t("pages.docs.get-active.paragraph-1-pt4") }} {{ $t("pages.docs.get-active.paragraph-1-pt5") }} + {{ $t("pages.docs.get-active.section-1-paragraph-1") }}

-

{{ $t("pages.docs.get-active.list") }}:

+

{{ $t("pages.docs.get-active.section-2-paragraph-1") }}:

- {{ $t("pages.docs.get-active.paragraph-2") }} + {{ $t("pages.docs.get-active.section-3-paragraph-1") }}

- {{ $t("pages.docs.get-active.paragraph-3-pt1") }} {{ $t("pages.docs.get-active.paragraph-3-pt2") }} {{ $t("pages.docs.get-active.paragraph-3-pt3") }} + {{ $t("pages.docs.get-active.section-4-paragraph-1-pt-1") }} - {{ $t("pages.docs.get-active.paragraph-3-pt4") }} + {{ $t("pages.docs.get-active.section-4-paragraph-1-pt-2") }} - {{ $t("pages.docs.get-active.paragraph-3-pt5") }} + {{ $t("pages.docs.get-active.section-4-paragraph-1-pt-3") }}

- + diff --git a/frontend/pages/docs/get-organized.vue b/frontend/pages/docs/get-organized.vue index 135481be1..d7a4534e3 100644 --- a/frontend/pages/docs/get-organized.vue +++ b/frontend/pages/docs/get-organized.vue @@ -29,7 +29,9 @@
-

{{ $t("pages.docs.get-organized.page-title") }}

+

+ {{ $t("pages.docs.get-organized.header") }} +

- {{ $t("pages.docs.get-organized.subtitle-1") }} + {{ $t("pages.docs.get-organized.subheader-pt-1") }} - {{ $t("pages.docs.get-organized.subtitle-1") }} + {{ $t("pages.docs.get-organized.subheader-pt-2") }} - {{ $t("pages.docs.get-organized.subtitle-3") }} + {{ $t("pages.docs.get-organized.subheader-pt-3") }}

- {{ $t("pages.docs.get-organized.paragraph-1-pt1") }} {{ $t("pages.docs.get-organized.paragraph-1-pt2") }} {{ $t("pages.docs.get-organized.paragraph-1-pt3") }} + {{ $t("pages.docs.get-organized.section-1-paragraph-1") }}

- {{ $t("pages.docs.get-organized.paragraph-2") }} + {{ $t("pages.docs.get-organized.section-1-paragraph-2") }}

- {{ $t("pages.docs.get-organized.paragraph-3-pt1") }} - {{ $t("pages.docs.get-organized.paragraph-3-pt2") }} {{ $t("pages.docs.get-organized.paragraph-3-pt3") }} + {{ $t("pages.docs.get-organized.section-1-paragraph-3") }}

- {{ $t("pages.docs.get-organized.paragraph-4-pt1") }} {{ $t("pages.docs.get-organized.paragraph-4-pt2") }} {{ $t("pages.docs.get-organized.paragraph-4-pt3") }} + {{ $t("pages.docs.get-organized.section-1-paragraph-4-pt-1") }} - {{ $t("pages.docs.get-organized.paragraph-4-pt4") }} + {{ $t("pages.docs.get-organized.section-1-paragraph-4-pt-4") }} - {{ $t("pages.docs.get-organized.paragraph-4-pt5") }} + {{ $t("pages.docs.get-organized.section-1-paragraph-4-pt-5") }}

- + diff --git a/frontend/pages/docs/grow-organization.vue b/frontend/pages/docs/grow-organization.vue index 120fdcae0..a13e975a7 100644 --- a/frontend/pages/docs/grow-organization.vue +++ b/frontend/pages/docs/grow-organization.vue @@ -29,7 +29,9 @@
-

{{ $t("pages.docs.grow-organization.page-title") }}

+

+ {{ $t("pages.docs.grow-organization.header") }} +

- {{ $t("pages.docs.grow-organization.subtitle-1") }} + {{ $t("pages.docs.grow-organization.subheader-pt-1") }} - {{ $t("pages.docs.grow-organization.subtitle-2") }} + {{ $t("pages.docs.grow-organization.subheader-pt-2") }} - {{ $t("pages.docs.grow-organization.subtitle-3") }} + {{ $t("pages.docs.grow-organization.subheader-pt-3") }}

- {{ $t("pages.docs.grow-organization.paragraph-1-pt1") }} - {{ $t("pages.docs.grow-organization.paragraph-1-pt2") }}, {{ $t("pages.docs.grow-organization.paragraph-1-pt3") }} {{ $t("pages.docs.grow-organization.paragraph-1-pt4") }}, {{ $t("pages.docs.grow-organization.paragraph-1-pt5") }} + {{ $t("pages.docs.grow-organization.section-1-paragraph-1-pt-1") }} + {{ + $t("pages.docs.grow-organization.section-1-paragraph-1-pt-2") + }}, + {{ $t("pages.docs.grow-organization.section-1-paragraph-1-pt-3") }} + {{ + $t("pages.docs.grow-organization.section-1-paragraph-1-pt-4") + }}, + {{ $t("pages.docs.grow-organization.section-1-paragraph-1-pt-5") }}

- {{ $t("pages.docs.grow-organization.paragraph-2") }} + {{ $t("pages.docs.grow-organization.section-1-paragraph-2") }}

- {{ $t("pages.docs.grow-organization.paragraph-3-pt1") }} - {{ $t("pages.docs.grow-organization.paragraph-3-pt2") }} {{ $t("pages.docs.grow-organization.paragraph-3-pt3") }} + {{ $t("pages.docs.grow-organization.section-1-paragraph-3-pt-1") }} + {{ + $t("pages.docs.grow-organization.section-1-paragraph-3-pt-2") + }} + {{ $t("pages.docs.grow-organization.section-1-paragraph-3-pt-3") }}

- {{ $t("pages.docs.grow-organization.paragraph-4") }} + {{ $t("pages.docs.grow-organization.section-1-paragraph-4") }}

- {{ $t("pages.docs.grow-organization.paragraph-5-pt1") }} {{ $t("pages.docs.grow-organization.paragraph-5-pt2") }} {{ $t("pages.docs.grow-organization.paragraph-5-pt3") }} + {{ $t("pages.docs.grow-organization.section-1-paragraph-5-pt-1") }} - {{ $t("pages.docs.grow-organization.paragraph-5-pt4") }} + {{ + $t("pages.docs.grow-organization.section-1-paragraph-5-pt-2") + }} - {{ $t("pages.docs.grow-organization.paragraph-5-pt5") }} + {{ $t("pages.docs.grow-organization.section-1-paragraph-5-pt-3") }}

- + diff --git a/frontend/pages/docs/index.vue b/frontend/pages/docs/index.vue index 22c61feac..f1acf08ca 100644 --- a/frontend/pages/docs/index.vue +++ b/frontend/pages/docs/index.vue @@ -9,5 +9,4 @@
- + diff --git a/frontend/pages/events/[id]/about.vue b/frontend/pages/events/[id]/about.vue index 6f43b38b6..1b2945231 100644 --- a/frontend/pages/events/[id]/about.vue +++ b/frontend/pages/events/[id]/about.vue @@ -22,7 +22,7 @@ + diff --git a/frontend/pages/help/contact.vue b/frontend/pages/help/contact.vue index 2c58f82e0..b882cc2e4 100644 --- a/frontend/pages/help/contact.vue +++ b/frontend/pages/help/contact.vue @@ -14,44 +14,43 @@ >

- {{ $t("pages.help.contact.page-title") }} + {{ $t("pages.help.contact.header") }}

- {{ $t("pages.help.contact.paragraph-1-pt1") }} + {{ $t("pages.help.contact.section-1-paragraph-1-pt-1") }} - {{ $t("pages.help.contact.paragraph-1-pt2") }} + {{ $t("pages.help.contact.section-1-paragraph-1-pt-2") }} - {{ $t("pages.help.contact.paragraph-1-pt3") }} + {{ $t("pages.help.contact.section-1-paragraph-1-pt-3") }} - {{ $t("pages.help.contact.paragraph-1-pt4") }} + {{ $t("pages.help.contact.section-1-paragraph-1-pt-4") }} - — {{ $t("pages.help.contact.paragraph-1-pt5") }} {{ $t("pages.help.contact.paragraph-1-pt6") }} {{ $t("pages.help.contact.paragraph-1-pt7") }} - {{ $t("pages.help.contact.paragraph-1-pt8") }} {{ $t("pages.help.contact.paragraph-1-pt9") }} + {{ $t("pages.help.contact.section-1-paragraph-1-pt-5") }}

- {{ $t("pages.help.contact.paragraph-2-pt1") }} + {{ $t("pages.help.contact.section-1-paragraph-2-pt-1") }} - {{ $t("pages.help.contact.paragraph-2-pt2") }} + {{ $t("pages.help.contact.section-1-paragraph-2-pt-2") }} {{ $t("pages.help.contact.label-name") }} {{ $t("pages.help.contact.error-empty") }}{{ $t("pages.help.contact.label-name") }} + {{ + $t("pages.help.contact.error-empty") + }} {{ $t("pages.help.contact.thanks-2") }}

- +
diff --git a/frontend/pages/help/faq.vue b/frontend/pages/help/faq.vue index 4e10a9da0..cf8152f42 100644 --- a/frontend/pages/help/faq.vue +++ b/frontend/pages/help/faq.vue @@ -37,7 +37,7 @@ class="hidden float-right p-4 h-52 md:block 2xl:hidden lg:h-64" />

- {{ $t("pages.help.faq.page-title") }} + {{ $t("pages.help.faq.header") }}

- {{ $t("pages.help.faq.subtitle-1") }} + {{ $t("pages.help.faq.subheader-pt-1") }} - {{ $t("pages.help.faq.subtitle-2") }} + {{ $t("pages.help.faq.subheader-pt-2") }}

- {{ $t("pages.help.faq.question-1") }} + {{ $t("pages.help.faq.section-1-paragraph-1") }}

- {{ $t("pages.help.faq.answer-1") }} + {{ $t("pages.help.faq.section-1-paragraph-2") }}

- {{ $t("pages.help.faq.question-2") }} + {{ $t("pages.help.faq.section-2-paragraph-1") }}

- {{ $t("pages.help.faq.answer-2") }} + {{ $t("pages.help.faq.section-2-paragraph-2") }} +

+

+ {{ $t("pages.help.faq.section-3-paragraph-1") }}

-

{{ $t("pages.help.faq.question-3") }}

- {{ $t("pages.help.faq.answer-3") }} + {{ $t("pages.help.faq.section-3-paragraph-2") }}

- {{ $t("pages.help.faq.question-4") }} + {{ $t("pages.help.faq.section-4-paragraph-1") }}

- {{ $t("pages.help.faq.answer-4-pt1") }} + {{ $t("pages.help.faq.section-4-paragraph-2-pt-1") }} {{ $t("pages.help.faq.answer-4-pt2") }} + >{{ $t("pages.help.faq.section-4-paragraph-2-pt-2") }} - t{{ $t("pages.help.faq.answer-4-pt3") }} + {{ $t("pages.help.faq.section-4-paragraph-2-pt-3") }}

diff --git a/frontend/pages/help/index.vue b/frontend/pages/help/index.vue index 85409a56a..e754d7140 100644 --- a/frontend/pages/help/index.vue +++ b/frontend/pages/help/index.vue @@ -9,5 +9,4 @@
- + diff --git a/frontend/pages/help/press.vue b/frontend/pages/help/press.vue index dad743f8d..d169b1e54 100644 --- a/frontend/pages/help/press.vue +++ b/frontend/pages/help/press.vue @@ -9,5 +9,4 @@
- + diff --git a/frontend/pages/help/status.vue b/frontend/pages/help/status.vue index 4dbc642c7..d56a48efb 100644 --- a/frontend/pages/help/status.vue +++ b/frontend/pages/help/status.vue @@ -11,5 +11,4 @@ - + diff --git a/frontend/pages/home/index.vue b/frontend/pages/home/index.vue index fcaf9065a..285e5caf6 100644 --- a/frontend/pages/home/index.vue +++ b/frontend/pages/home/index.vue @@ -8,7 +8,7 @@

- {{ $t("pages.home.title-page") }} + {{ $t("pages.home.header") }}

- {{ $t("pages.home.subtitle") }} + {{ $t("pages.home.subheader") }}
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue index fb47a9b04..11c9ae25f 100644 --- a/frontend/pages/index.vue +++ b/frontend/pages/index.vue @@ -70,5 +70,4 @@ - + diff --git a/frontend/pages/legal/index.vue b/frontend/pages/legal/index.vue index 97c327638..f22d94fad 100644 --- a/frontend/pages/legal/index.vue +++ b/frontend/pages/legal/index.vue @@ -9,5 +9,4 @@ - + diff --git a/frontend/pages/legal/legal-support.vue b/frontend/pages/legal/legal-support.vue index dcd607dac..0b43ce70c 100644 --- a/frontend/pages/legal/legal-support.vue +++ b/frontend/pages/legal/legal-support.vue @@ -11,5 +11,4 @@ - + diff --git a/frontend/pages/legal/privacy-policy.vue b/frontend/pages/legal/privacy-policy.vue index ac4150620..9dc4ff95d 100644 --- a/frontend/pages/legal/privacy-policy.vue +++ b/frontend/pages/legal/privacy-policy.vue @@ -36,104 +36,97 @@ alt="A shield with a checkmark in the middle of it to indicate that privacy is protected." class="hidden float-right p-4 h-52 md:block 2xl:hidden lg:h-64" /> -

{{ $t("pages.legal.privacy-policy.title-page") }}

+

+ {{ $t("pages.legal.privacy-policy.header") }} +

{{ $t("pages.legal.privacy-policy.last-updated") }}

- {{ $t("pages.legal.privacy-policy.paragraph-1") }} + {{ $t("pages.legal.privacy-policy.section-1-paragraph-1") }}

- {{ $t("pages.legal.privacy-policy.paragraph-2") }} + {{ $t("pages.legal.privacy-policy.section-1-paragraph-2") }}

-

{{ $t("pages.legal.privacy-policy.subtitle-1") }}

- {{ $t("pages.legal.privacy-policy.paragraph-3") }} -

-

- {{ $t("pages.legal.privacy-policy.paragraph-4") }} -

-

{{ $t("pages.legal.privacy-policy.subtitle-2") }}

-

- {{ $t("pages.legal.privacy-policy.paragraph-5") }} -

-

- {{ $t("pages.legal.privacy-policy.paragraph-6") }} + {{ $t("pages.legal.privacy-policy.section-1-paragraph-3") }}

- {{ $t("pages.legal.privacy-policy.subtitle-3") }} + {{ $t("pages.legal.privacy-policy.section-2-subheader") }}

- {{ $t("pages.legal.privacy-policy.paragraph-7") }} -

-

- {{ $t("pages.legal.privacy-policy.paragraph-8") }} -

-

{{ $t("pages.legal.privacy-policy.subtitle-4") }}

-

- {{ $t("pages.legal.privacy-policy.paragraph-9") }} -

-

- {{ $t("pages.legal.privacy-policy.paragraph-10") }} + {{ $t("pages.legal.privacy-policy.section-2-paragraph-1") }}

-

{{ $t("pages.legal.privacy-policy.subtitle-5") }}

+

+ {{ $t("pages.legal.privacy-policy.section-3-subheader") }} +

- {{ $t("pages.legal.privacy-policy.paragraph-11") }} + {{ $t("pages.legal.privacy-policy.section-3-paragraph-1") }}

+

+ {{ $t("pages.legal.privacy-policy.section-4-subheader") }} +

- {{ $t("pages.legal.privacy-policy.paragraph-12") }} + {{ $t("pages.legal.privacy-policy.section-4-paragraph-1") }}

-

{{ $t("pages.legal.privacy-policy.subtitle-6") }}

+

+ {{ $t("pages.legal.privacy-policy.section-5-subheader") }} +

- {{ $t("pages.legal.privacy-policy.paragraph-13") }} + {{ $t("pages.legal.privacy-policy.section-5-paragraph-1") }}

- {{ $t("pages.legal.privacy-policy.paragraph-14") }} + {{ $t("pages.legal.privacy-policy.section-5-paragraph-2") }}

-

{{ $t("pages.legal.privacy-policy.subtitle-7") }}

+

+ {{ $t("pages.legal.privacy-policy.section-6-subheader") }} +

- {{ $t("pages.legal.privacy-policy.paragraph-15") }} + {{ $t("pages.legal.privacy-policy.section-6-paragraph-1") }}

+

+ {{ $t("pages.legal.privacy-policy.section-7-subheader") }} +

- {{ $t("pages.legal.privacy-policy.paragraph-16") }} + {{ $t("pages.legal.privacy-policy.section-7-paragraph-1") }}

- {{ $t("pages.legal.privacy-policy.paragraph-17-pt1") }} + {{ $t("pages.legal.privacy-policy.section-8-paragraph-1-pt-1") }} - {{ $t("pages.legal.privacy-policy.paragraph-17-pt2") }} + {{ $t("pages.legal.privacy-policy.section-8-paragraph-1-pt-2") }} - {{ $t("pages.legal.privacy-policy.paragraph-17-pt3") }} + {{ $t("pages.legal.privacy-policy.section-8-paragraph-1-pt-3") }} - {{ $t("pages.legal.privacy-policy.paragraph-17-pt4") }} + {{ $t("pages.legal.privacy-policy.section-8-paragraph-1-pt-4") }} - {{ $t("pages.legal.privacy-policy.paragraph-17-pt5") }} + {{ $t("pages.legal.privacy-policy.section-8-paragraph-1-pt-5") }}

@@ -159,5 +152,4 @@
- + diff --git a/frontend/pages/legal/trademark-policy.vue b/frontend/pages/legal/trademark-policy.vue index 5147282ed..e031ef0ac 100644 --- a/frontend/pages/legal/trademark-policy.vue +++ b/frontend/pages/legal/trademark-policy.vue @@ -43,109 +43,120 @@ {{ $t("pages.legal.trademark-policy.last-updated") }}

- {{ $t("pages.legal.trademark-policy.paragraph-1") }} + {{ $t("pages.legal.trademark-policy.section-1-paragraph-1") }}

- {{ $t("pages.legal.trademark-policy.paragraph-2") }} + {{ $t("pages.legal.trademark-policy.section-1-paragraph-2") }}

- {{ $t("pages.legal.trademark-policy.paragraph-3") }} + {{ $t("pages.legal.trademark-policy.section-1-paragraph-3") }}

- {{ $t("pages.legal.trademark-policy.paragraph-4") }} + {{ $t("pages.legal.trademark-policy.section-1-paragraph-4") }}

- {{ $t("pages.legal.trademark-policy.paragraph-5-pt1") }} + {{ $t("pages.legal.trademark-policy.section-1-paragraph-5-pt-1") }} team@activist.org. {{ $t("pages.legal.trademark-policy.paragraph-5-pt2") }} + >. + {{ $t("pages.legal.trademark-policy.section-1-paragraph-5-pt-2") }}

-

{{ $t("pages.legal.trademark-policy.subtitle-1") }}

+

+ {{ $t("pages.legal.trademark-policy.section-2-subheader") }} +

- {{ $t("pages.legal.trademark-policy.subtitle-2") }} + {{ $t("pages.legal.trademark-policy.section-3-subheader") }}

- {{ $t("pages.legal.trademark-policy.paragraph-6") }} + {{ $t("pages.legal.trademark-policy.section-3-paragraph-1") }}

-

{{ $t("pages.legal.trademark-policy.subtitle-3") }}

+

+ {{ $t("pages.legal.trademark-policy.section-4-subheader") }} +

-

{{ $t("pages.legal.trademark-policy.subtitle-4") }}

+

+ {{ $t("pages.legal.trademark-policy.section-5-subheader") }} +

- {{ $t("pages.legal.trademark-policy.paragraph-7") }} + {{ $t("pages.legal.trademark-policy.section-5-paragraph-1") }}

- {{ $t("pages.legal.trademark-policy.paragraph-8-pt1") }} + {{ $t("pages.legal.trademark-policy.section-5-paragraph-2-pt-1") }} - {{ $t("pages.legal.trademark-policy.paragraph-8-pt2") }} + {{ + $t("pages.legal.trademark-policy.section-5-paragraph-2-pt-2") + }} - {{ $t("pages.legal.trademark-policy.paragraph-8-pt3") }} + {{ $t("pages.legal.trademark-policy.section-5-paragraph-2-pt-3") }} - {{ $t("pages.legal.trademark-policy.paragraph-8-pt4") }} + {{ + $t("pages.legal.trademark-policy.section-5-paragraph-2-pt-4") + }} - {{ $t("pages.legal.trademark-policy.paragraph-8-pt5") }} + {{ $t("pages.legal.trademark-policy.section-5-paragraph-2-pt-5") }}

@@ -171,5 +182,4 @@
- + diff --git a/frontend/pages/organizations/[id]/about.vue b/frontend/pages/organizations/[id]/about.vue index 026cb96ec..007e40204 100644 --- a/frontend/pages/organizations/[id]/about.vue +++ b/frontend/pages/organizations/[id]/about.vue @@ -25,7 +25,7 @@ + diff --git a/frontend/pages/supporters/join.vue b/frontend/pages/supporters/join.vue index c22139f00..4567e7fc9 100644 --- a/frontend/pages/supporters/join.vue +++ b/frontend/pages/supporters/join.vue @@ -6,14 +6,22 @@ {{ $t("pages.supporters.join.title") }}
-

{{ $t("pages.supporters.join.title") }}

+

+ {{ $t("pages.supporters.join.title") }} +

- {{ $t("pages.supporters.join.paragraph-1-pt1") }} - {{ $t("pages.supporters.join.paragraph-1-pt1") }}{{ + $t("pages.supporters.join.section-1-paragraph-1-pt-2") + }}.

-

{{ $t("pages.supporters.join.subtitle-1") }}

+

+ {{ $t("pages.supporters.join.section-2-subheader") }} +

{{ $t("pages.supporters.join.paragraph-2-pt1") }} {{ $t("pages.supporters.join.paragraph-2-pt3") }}

-

{{ $t("pages.supporters.join.subtitle-2") }}

+

+ {{ $t("pages.supporters.join.section-3-subheader") }} +

- {{ $t("pages.supporters.join.paragraph-3-pt1") }} + {{ $t("pages.supporters.join.section-3-paragraph-1-pt-1") }} {{ $t("pages.supporters.join.paragraph-3-pt2") }} + >{{ $t("pages.supporters.join.section-3-paragraph-1-pt-2") }} - {{ $t("pages.supporters.join.paragraph-3-pt3") }} + {{ $t("pages.supporters.join.section-3-paragraph-1-pt-3") }}

-

{{ $t("pages.supporters.join.subtitle-3") }}

+

+ {{ $t("pages.supporters.join.section-4-subheader") }} +

- {{ $t("pages.supporters.join.paragraph-4-pt1") }} + {{ $t("pages.supporters.join.section-4-paragraph-1-pt-1") }} {{ $t("pages.supporters.join.paragraph-4-pt2") }}{{ + $t("pages.supporters.join.section-4-paragraph-1-pt-2") + }} - {{ $t("pages.supporters.join.paragraph-4-pt3") }} + {{ $t("pages.supporters.join.section-4-paragraph-1-pt-3") }}

-

{{ $t("pages.supporters.join.subtitle-4") }}

+

+ {{ $t("pages.supporters.join.section-5-subheader") }} +

- {{ $t("pages.supporters.join.paragraph-5-pt1") }} - {{ $t("pages.supporters.join.paragraph-5-pt2") }}{{ + $t("pages.supporters.join.section-5-paragraph-1-pt-2") + }}.

-

{{ $t("pages.supporters.join.subtitle-5") }}

+

+ {{ $t("pages.supporters.join.section-6-subheader") }} +

- {{ $t("pages.supporters.join.paragraph-6-pt1") }} + {{ $t("pages.supporters.join.section-6-paragraph-1-pt-1") }} {{ $t("pages.supporters.join.paragraph-6-pt2") }} + >{{ $t("pages.supporters.join.section-6-paragraph-1-pt-2") }} - {{ $t("pages.supporters.join.paragraph-6-pt3") }} + {{ $t("pages.supporters.join.section-6-paragraph-1-pt-3") }}

- + diff --git a/frontend/utils/navMenuItems.ts b/frontend/utils/navMenuItems.ts index 73ef963d2..3fdd31f25 100644 --- a/frontend/utils/navMenuItems.ts +++ b/frontend/utils/navMenuItems.ts @@ -1,12 +1,17 @@ export const menuItems = [ { + label: "components.menu-mobile-selector.label.home", + routeURL: "/home", + iconURL: "bi:house", + }, + { + label: "components.menu-mobile-selector.label.events", + routeURL: "/events", iconURL: "bi:calendar-check", - btnText: "Events", - btnURL: "/events", }, { + label: "components.menu-mobile-selector.label.organizations", + routeURL: "/organizations", iconURL: "IconOrganization", - btnText: "Organizations", - btnURL: "/organizations", }, ];