Skip to content

Fix grammar on en & en-us About pages#4450

Merged
Alkarex merged 3 commits intoFreshRSS:edgefrom
DuncanBennie:edge
Jul 17, 2022
Merged

Fix grammar on en & en-us About pages#4450
Alkarex merged 3 commits intoFreshRSS:edgefrom
DuncanBennie:edge

Conversation

@DuncanBennie
Copy link
Copy Markdown
Contributor

Restructure sentences on the en and en-us versions of the About page (index.php) to make them grammatically correct.

Closes #4449

Restructure sentences to make them grammatically correct.
@DuncanBennie
Copy link
Copy Markdown
Contributor Author

DuncanBennie commented Jul 17, 2022

This is my first PR ever so let me know if I've made any mistakes.

Copy link
Copy Markdown
Member

@Frenzie Frenzie left a comment

Choose a reason for hiding this comment

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

Thanks! While we're on the subject, "like Kriss Feed and Leed" seems a bit wordy and unnecessary.

Remove references to Kriss Feed and Leed.
'credits' => 'Credits', // IGNORE
'credits_content' => 'Some design elements come from <a href="http://twitter.github.io/bootstrap/">Bootstrap</a> although FreshRSS doesn’t use this framework. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Icons</a> come from the <a href="https://www.gnome.org/">GNOME project</a>. <em>Open Sans</em> font police has been created by <a href="https://fonts.google.com/specimen/Open+Sans">Steve Matteson</a>. FreshRSS is based on <a href="https://framagit.org/marienfressinaud/MINZ">Minz</a>, a PHP framework.', // IGNORE
'freshrss_description' => 'FreshRSS is a self-hostable RSS feed aggregator like <a href="http://tontof.net/kriss/feed/">Kriss Feed</a> or <a href="https://github.com/LeedRSS/Leed">Leed</a>. It is light and easy to use, whilst being a powerful and configurable tool.', // IGNORE
'freshrss_description' => 'FreshRSS is a self-hostable RSS feed aggregator that is light and easy to use whilst being highly powerful and configurable.', // IGNORE
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Btw, whilst is chiefly British but I don't know if that's worth the effort.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

FreshRSS is a self-hostable RSS aggregator and reader. It allows you to read and follow several news websites at a glance without the need to browse from one website to another. FreshRSS is lightweight, configurable, and easy to use.

How about this? I pulled the first two sentences from the manual.

Otherwise:

FreshRSS is a self-hostable RSS feed aggregator that is light and easy to use while being highly powerful and configurable.

Copy link
Copy Markdown
Member

@Frenzie Frenzie Jul 17, 2022

Choose a reason for hiding this comment

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

How about this? I pulled the first two sentences from the manual.

Yes, I copy edited the manual a bit (fairly superficially, but I smoothed over a fair bit of Frenglish). I completely forgot there even was such a thing as an about page, and that explains my odd feeling that I'd already changed it. ;-)

Otherwise:

I prefer the first suggestion of course. But yes, while would be the usual way to write that for the en-US localization.

@DuncanBennie DuncanBennie requested a review from Frenzie July 17, 2022 07:49
@DuncanBennie
Copy link
Copy Markdown
Contributor Author

DuncanBennie commented Jul 17, 2022

@Frenzie Thanks for your help, I've added another commit. I'm a noob at git and am sure there is a way I could have consolidated the final commit with my two previous commits to make this easier for you, but alas, I don't know how.

@Frenzie
Copy link
Copy Markdown
Member

Frenzie commented Jul 17, 2022

In git, something like git rebase -i, squash them together and then you'd have to git push -f to force update.

However, on platforms like GitHub and GitLab we can easily "squash and merge" into a single commit so it doesn't matter. In fact it makes it easier to look back at the full history that way, which can sometimes be helpful.

@DuncanBennie DuncanBennie reopened this Jul 17, 2022
@Alkarex Alkarex added this to the 1.20.0 milestone Jul 17, 2022
@Alkarex Alkarex added the I18n 🌍 Translations label Jul 17, 2022
@Alkarex Alkarex merged commit 670239b into FreshRSS:edge Jul 17, 2022
@Alkarex
Copy link
Copy Markdown
Member

Alkarex commented Jul 17, 2022

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

I18n 🌍 Translations

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug] Fix grammar on en & en-us About pages

3 participants