Plume
/
Plume
8
16
Fork 22
Code Issues 174 Pull Requests 8 Releases 8 Wiki Activity

Labels Milestones

Change title from Edit account to Create account #376

Merged
marek-lach merged 8 commits from patch-2 into master 5 years ago
Conversation 4 Commits 8 Files Changed 1
marek-lach commented 5 years ago (Migrated from github.com)
There is no content yet.
👍 2
elegaanz (Migrated from github.com) reviewed 5 years ago
elegaanz (Migrated from github.com) left a comment

Thank you. You should probably add these messages to po/plume.pot so that will be available for translation, otherwise it looks good. 👌

Thank you. You should probably add these messages to `po/plume.pot` so that will be available for translation, otherwise it looks good. :ok_hand:
templates/users/new.rs.html
elegaanz (Migrated from github.com) commented 5 years ago

It is a good idea to redirect to joinplu.me, but as it is the link won't work. Could you replace it with something like:

<p class="center">@i18n!(ctx.1, "Apologies, but registrations are closed on this instance. Visit joinplu.me/#instances, to find a different one")</p>
<p class="center">
    <a href="https://joinplu.me/#instances">@i18n!(ctx.1, "Find a different one")</a>
</p>

to make it clickable, please? (no problem if you don't, it is still better than before)

It is a good idea to redirect to joinplu.me, but as it is the link won't work. Could you replace it with something like: ```html <p class="center">@i18n!(ctx.1, "Apologies, but registrations are closed on this instance. Visit joinplu.me/#instances, to find a different one")</p> <p class="center"> <a href="https://joinplu.me/#instances">@i18n!(ctx.1, "Find a different one")</a> </p> ``` to make it clickable, please? (no problem if you don't, it is still better than before)
marek-lach commented 5 years ago (Migrated from github.com)

If you sync the English translations from  https://translate.funkwhale.audio/projects/plume/Plume https://translate.funkwhale.audio/projects/plume/Plume/
into the master, I’ve already changed and corrected the English translations there. Although I am not sure if you’re using that, so I can of course change the strings on Github directly as well.

    1. 2018, 15:32 od notifications@github.com:

@BaptisteGelez> commented on this pull request.

Thank you. You should probably add these messages to > po/plume.pot> so that will be available for translation, otherwise it looks good. 👌

In > templates/users/new.rs.html https://github.com/Plume-org/Plume/pull/376#discussion_r243834119> :

     </form>     } else {-        <p class="center">@i18n!(ctx.1, "Sorry, but registrations are closed on this instance. Try to find another one")</p>+<p class="center">@i18n!(ctx.1, "Apologies, but registrations are closed on this instance. Visit joinplu.me/#instances, to find a different one")</p>

It is a good idea to redirect to joinplu.me, but as it is the link won't work. Could you replace it with something like:

<> p> > class> => "> center> "> >@i18n!(ctx.1, "Apologies, but registrations are closed on this instance. Visit joinplu.me/#instances, to find a different one")</> p> ><> p> > class> => "> center> "> > <> a> > href> => "> https://joinplu.me/#instances https://joinplu.me/#instances> "> >@i18n!(ctx.1, "Find a different one")</> a> ></> p> >

to make it clickable, please? (no problem if you don't, it is still better than before)

—
You are receiving this because you authored the thread.
Reply to this email directly, > view it on GitHub https://github.com/Plume-org/Plume/pull/376#pullrequestreview-187703635> , or > mute the thread https://github.com/notifications/unsubscribe-auth/AryXeUx77L8E49HTfmy0rngu74y18knnks5u8OWPgaJpZM4ZgeUY> .

If you sync the English translations from  https://translate.funkwhale.audio/projects/plume/Plume <https://translate.funkwhale.audio/projects/plume/Plume/> into the master, I’ve already changed and corrected the English translations there. Although I am not sure if you’re using that, so I can of course change the strings on Github directly as well. 24. 12. 2018, 15:32 od notifications@github.com: > > @BaptisteGelez> commented on this pull request. > > > Thank you. You should probably add these messages to > po/plume.pot> so that will be available for translation, otherwise it looks good. 👌 > > > > > In > templates/users/new.rs.html <https://github.com/Plume-org/Plume/pull/376#discussion_r243834119>> : > > > </form> } else {- <p class="center">@i18n!(ctx.1, "Sorry, but registrations are closed on this instance. Try to find another one")</p>+<p class="center">@i18n!(ctx.1, "Apologies, but registrations are closed on this instance. Visit joinplu.me/#instances, to find a different one")</p> > > It is a good idea to redirect to joinplu.me, but as it is the link won't work. Could you replace it with something like: > > <> p> > class> => "> center> "> >@i18n!(ctx.1, "Apologies, but registrations are closed on this instance. Visit joinplu.me/#instances, to find a different one")</> p> ><> p> > class> => "> center> "> > <> a> > href> => "> https://joinplu.me/#instances <https://joinplu.me/#instances>> "> >@i18n!(ctx.1, "Find a different one")</> a> ></> p> > > > to make it clickable, please? (no problem if you don't, it is still better than before) > > > — > You are receiving this because you authored the thread. > Reply to this email directly, > view it on GitHub <https://github.com/Plume-org/Plume/pull/376#pullrequestreview-187703635>> , or > mute the thread <https://github.com/notifications/unsubscribe-auth/AryXeUx77L8E49HTfmy0rngu74y18knnks5u8OWPgaJpZM4ZgeUY>> . >
elegaanz commented 5 years ago (Migrated from github.com)

Weblate is not yet synced with this repo, so you'll have to edit it on GitHub for the moment, sorry…

Weblate is not yet synced with this repo, so you'll have to edit it on GitHub for the moment, sorry…
marek-lach commented 5 years ago (Migrated from github.com)

I have now changed the link to instances to be clickable, while keeping it as a one line. Hopefully it works as intended :-)

I have now changed the link to instances to be clickable, while keeping it as a one line. Hopefully it works as intended :-)
codecov[bot] commented 5 years ago (Migrated from github.com)

Codecov Report

Merging #376 into master will decrease coverage by 0.44%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #376      +/-   ##
==========================================
- Coverage    28.3%   27.86%   -0.45%     
==========================================
  Files          63       63              
  Lines        5949     6280     +331     
==========================================
+ Hits         1684     1750      +66     
- Misses       4265     4530     +265
# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/376?src=pr&el=h1) Report > Merging [#376](https://codecov.io/gh/Plume-org/Plume/pull/376?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/fdfeeed6d9fa9dec92862366a8b646eb27d17422?src=pr&el=desc) will **decrease** coverage by `0.44%`. > The diff coverage is `n/a`. ```diff @@ Coverage Diff @@ ## master #376 +/- ## ========================================== - Coverage 28.3% 27.86% -0.45% ========================================== Files 63 63 Lines 5949 6280 +331 ========================================== + Hits 1684 1750 +66 - Misses 4265 4530 +265 ```
elegaanz (Migrated from github.com) reviewed 5 years ago
templates/users/new.rs.html
@ -15,9 +15,9 @@
@input!(ctx.1, password (password), "Password", form, errors.clone(), "minlenght=\"8\"")
@input!(ctx.1, password_confirmation (password), "Password confirmation", form, errors, "minlenght=\"8\"")
elegaanz (Migrated from github.com) commented 5 years ago

The link should be outside of the i18n! call (after the <p>, ideally wrapped in another one to make it centered too), otherwise we will probably end with something really weird (I didn't tested, but it will at least be hard for translators to read, and could result in rendering issue).

The link should be outside of the `i18n!` call (after the `<p>`, ideally wrapped in another one to make it centered too), otherwise we will probably end with something really weird (I didn't tested, but it will at least be hard for translators to read, and could result in rendering issue).
trinity-1686a reviewed 5 years ago
templates/users/new.rs.html
trinity-1686a commented 5 years ago
Owner

The closing parenthesis for this i18n call should be at the end of this line, not before the closing </p>, nested call won't compile

The closing parenthesis for this i18n call should be at the end of this line, not before the closing `</p>`, nested call won't compile
marek-lach (Migrated from github.com) reviewed 5 years ago
marek-lach (Migrated from github.com) left a comment

Weblate is not yet synced with this repo, so you'll have to edit it on GitHub for the moment, sorry…

I have now created another pull request where I corrected and expanded many English strings, so that they are now in unision with the Weblate English translation. You can review #377 and merge it if you think it's fine. Then there would no longer be any need to merge English from Weblate.

> > > Weblate is not yet synced with this repo, so you'll have to edit it on GitHub for the moment, sorry… I have now created another pull request where I corrected and expanded many English strings, so that they are now in unision with the Weblate English translation. You can review #377 and merge it if you think it's fine. Then there would no longer be any need to merge English from Weblate.
templates/users/new.rs.html
marek-lach (Migrated from github.com) commented 5 years ago

Right, thanks! Should be fixed now.

Right, thanks! Should be fixed now.
marek-lach (Migrated from github.com) reviewed 5 years ago
templates/users/new.rs.html
@ -15,9 +15,9 @@
@input!(ctx.1, password (password), "Password", form, errors.clone(), "minlenght=\"8\"")
@input!(ctx.1, password_confirmation (password), "Password confirmation", form, errors, "minlenght=\"8\"")
marek-lach (Migrated from github.com) commented 5 years ago

Ahh, I think I understand now, sorry 👍
Just pushed another commit to fix this, hopefully a final one for this pull request.

Ahh, I think I understand now, sorry 👍 Just pushed another commit to fix this, hopefully a final one for this pull request.
elegaanz (Migrated from github.com) approved these changes 5 years ago
elegaanz (Migrated from github.com) left a comment

It should be good now! Thank you. 😊

It should be good now! Thank you. :blush:

Reviewers

elegaanz
The pull request has been merged as aa6c1ffd64.
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b patch-2 master
git pull origin patch-2

Step 2:

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff patch-2
git push origin master
Sign in to join this conversation.
Reviewers
Request review
No reviewers
elegaanz
Labels
Apply labels
Clear labels   
A: API

Related to the REST API   
A: Backend

Code running on the server   
A: Federation

Stuff related to Federation   
A: Front-End

Related to the front-end   
A: I18N

Translations, and related code   
A: Meta

More about project management or code than the project itself   
A: Security
   
Build

The building, or installation process of Plume   
C: Bug

Something isn't working   
C: Discussion

We need to talk   
C: Enhancement

New feature or request   
C: Feature

This is a new feature   
Compatibility

Compatibility with different browsers, readers and OS   
Dependency

Related to an external package that Plume uses   
Design

UI/UX related issues and PRs   
Documentation
   
Good first issue

Good for newcomers   
Help welcome

Extra attention is needed   
Mobile

Issues affecting only mobile UX   
Rendering

How elements're rendered out for the end user   
S: Blocked

Something else needs to be fixed first   
S: Duplicate

This issue or pull request already exists   
S: Incomplete

This PR is not complete yet   
S: Instance specific

Issues concern a limited number of instances   
S: Invalid

This doesn't seem right   
S: Needs Voting/Discussion

Need to be discussed by the community (on Loomio)   
S: Ready for review

This PR is ready to be reviewed   
Suggestion

Proposed ideas worth considering   
S: Voted on Loomio

This is issue has been created after a vote on Loomio   
S: Wontfix

This will not be worked on
No Label
A: API
A: Backend
A: Federation
A: Front-End
A: I18N
A: Meta
A: Security
Build
C: Bug
C: Discussion
C: Enhancement
C: Feature
Compatibility
Dependency
Design
Documentation
Good first issue
Help welcome
Mobile
Rendering
S: Blocked
S: Duplicate
S: Incomplete
S: Instance specific
S: Invalid
S: Needs Voting/Discussion
S: Ready for review
Suggestion
S: Voted on Loomio
S: Wontfix
Milestone
Set milestone
Clear milestone
No items
No Milestone
Assignees
Assign users
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Plume/Plume#376
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'patch-2'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes