search

florence-social / mastodon-fork

Florence's fork of Mastodon
GNU Affero General Public License v3.0
138 stars 15 forks source link

Less obnoxious domain block message #125

Closed ghost closed 5 years ago

ghost commented 5 years ago

Intended to address #61

This looks to be a fairly straightforward change in the English language translation file. Took me a while to find it though, so this was indeed a good first issue. :+1:

ghost commented 5 years ago

Updated as per @mal0ki feedback :)

btw is this something translation team needs to keep an eye on? I'm only making the change for the English language locale, but presumably other locales will have foreign language versions of the old text.

mal0ki commented 5 years ago

Updated as per @mal0ki feedback :)

the (or {domain} ) was supposed to be "pick this or the other option in your edit" :D Not to be included.

ghost commented 5 years ago

Damn it @mal0ki! :stuck_out_tongue_closed_eyes:

I've now amended to "Blocking means you will not see content from {domain} in any public timelines nor your notifications. Any followers from {domain} will also be removed."

clarfonthey commented 5 years ago

Not should be neither, or nor should be or... right now the halfness looks weird.

ghost commented 5 years ago

@clarfon I agree. Technically it's not wrong, but most are used to seeing "nor" with "neither". I went back and forth on it myself, as I liked @ryliejamesthomas suggestion in #61

Have now fixed it to say "or" instead.

ryliejamesthomas commented 5 years ago

Yeah, no worries. I think 'neither' is something we just don't say in Australia?, and I do quite like awkward-sounding-but-correct English, but no problems here with making changes :)

clarfonthey commented 5 years ago

Honestly, "neither...nor" seems grammatically excessive nowadays. it's like saying "the things up with which I put" instead of "the things I put up with."