Skip to content

Implement donation dialog #3056

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Implement donation dialog #3056

wants to merge 4 commits into from

Conversation

Nutomic
Copy link
Member

@Nutomic Nutomic commented Apr 4, 2025

Add donation dialog to main branch (from #3034).

Translations: LemmyNet/lemmy-translations#163
JS client: LemmyNet/lemmy-js-client#547

Currently throws a lot of compile errors, probably requires #2985 to be merged first.

* Implement donation dialog

* lint

* change layout

* update text, add title

* update submodule, fix mobile

* remove "hide permanently"

* update text, change button color, use html for message

* A few fixes to the donation dialog. (#3051)

* fix close button

* color adjustments

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
@dessalines
Copy link
Member

dessalines commented Apr 4, 2025

Yep that's correct, I'll get it merged into my dev branch.

@dessalines dessalines changed the base branch from main to 1.0.0_updates_1 April 4, 2025 12:41
@dessalines dessalines changed the base branch from 1.0.0_updates_1 to main April 4, 2025 12:42
__html: sanitizeHtml(
I18NextService.i18n.t("donation_dialog_message"),
),
}}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should get rid of raw html here similar to joinlemmy pr

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that donation_dialog_message has html in it. It'd be better to remove that entirely and either:

  • Split it into 2 strings, IE donation_dialog_message_1 and donation_dialog_message_2
  • Replace the <br>s with <1> , as the i18next react uses.

The first is probably better and much easier. Really html shouldn't be used for line breaks, but only for within-sentence formatting where you need to use links, italics, etc.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright got it.

@Nutomic
Copy link
Member Author

Nutomic commented Apr 9, 2025

CI is failing because of changes in js-client.

@@ -60,7 +60,7 @@
"inferno-router": "^8.2.3",
"inferno-server": "^9.0.0",
"jwt-decode": "^4.0.0",
"lemmy-js-client": "0.20.0-alpha.17",
"lemmy-js-client": "1.0.0-alpha.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure that we should do this yet, and compeletely break main. Probably safer to do PRs to my 1.0 dev branch until we get everything compiling.

#2985

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree, otherwise it will be impossible to work on lemmy-ui until that PR is merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy