Skip to content
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

substitue aircraft for craft, drone, or quad #4232

Merged
merged 5 commits into from
Nov 4, 2024

Conversation

nerdCopter
Copy link
Member

@nerdCopter nerdCopter commented Oct 29, 2024

  • replace [Dd]rone, [Qq]uad, [Cc]raft with [Aa]ircraft
  • messages only, not variables.

Copy link

netlify bot commented Oct 29, 2024

Deploy Preview for origin-betaflight-app ready!

Name Link
🔨 Latest commit 42d2176
🔍 Latest deploy log https://app.netlify.com/sites/origin-betaflight-app/deploys/67292fac025ba20008b25063
😎 Deploy Preview https://deploy-preview-4232.dev.app.betaflight.com
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Member

@haslinghuis haslinghuis left a comment

Choose a reason for hiding this comment

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

  • unmanned aerial vehicle
  • rotorcraft
  • multirotor

@nerdCopter
Copy link
Member Author

nerdCopter commented Oct 29, 2024

  • i never see the term rotorcraft, IRL.
  • wing might not be multirotor (single prop)
  • UAV maybe usable, but existing language uses [Cc]raft often, and thus was open to [Aa]ircraft.

I'm thinking remain [Cc]raft for now, kick the can down the road (for alternative word).

@ctzsnooze
Copy link
Member

I tend to prefer 'aircraft' as an abbreviation for 'model aircraft', rather than 'craft'. Never liked 'craft' much. No-one calls our quads 'craft', not in the real world. We have 'wings' and we have 'quads'. True, we have some hexacopter, tricopters and so on, but they are rare. And we don't want to use 'copter' since 'quads' are not 'helis'.

I appreciate that we are also supporting wings much more, but personally unless the tip needs it, I'd say 'quad' still.

Some tooltips may have little or no relevance to wings; those that do should speak explicitly about wings.

I'd prefer that a general tooltip spoke about 'quads', and if there was no need to change the content, say the same about was the same for wings, then leave it at that.

If however a wing has some special requirement or note, eg the new special CLI options for wings, then we speak about 'wings' in that tooltip.

Alternatively, if we get very clever, then maybe if the user chooses 'wing' for the mixer type, or the USE_WING DEFINE is included, then all instances of 'craft' or 'quad' become 'wing'. That would be the 'right' way to go :-)

PS - when used in the form "to improve the craft's responsiveness', we need an apostrophe before the 's'.

@nerdCopter
Copy link
Member Author

nerdCopter commented Oct 30, 2024

updated.

  • fixed single possessive
  • replaced [Cc]raft with [Aa]ircraft while removing plural s
  • skipped language variable names.

if this PR is not important or undesired, happy to close it.

the following force-pushes were simply commit message amend.

@nerdCopter nerdCopter force-pushed the 20241029_craft_verbiage branch 2 times, most recently from fa0d8b4 to c522a4d Compare October 30, 2024 13:34
@nerdCopter nerdCopter changed the title substitue craft for drone and quad substitue arircraft for craft, drone, or quad Oct 31, 2024
@nerdCopter nerdCopter marked this pull request as ready for review October 31, 2024 13:04
@nerdCopter nerdCopter changed the title substitue arircraft for craft, drone, or quad substitue aircraft for craft, drone, or quad Oct 31, 2024
@nerdCopter nerdCopter changed the title substitue aircraft for craft, drone, or quad substitue aircraft for craft, drone, or quad Oct 31, 2024
@nerdCopter nerdCopter force-pushed the 20241029_craft_verbiage branch from c522a4d to c63de5e Compare October 31, 2024 14:58
@nerdCopter
Copy link
Member Author

nerdCopter commented Nov 1, 2024 via email

@nerdCopter nerdCopter closed this Nov 1, 2024
@ctzsnooze
Copy link
Member

Why closing?

@nerdCopter
Copy link
Member Author

Why closing?

  • please click the 3-dots on my prior comment. closed based on feedback.
  • i personally do like aircraft, but if others have difference of opinion, i'll respect such.
  • dynamic drone/quad/wing/aircraft, might be too cumbersome to code. (personally choose not to implement)

@haslinghuis
Copy link
Member

haslinghuis commented Nov 1, 2024

IMO nothing wrong using quad as we could use UAV as general term. Think aircraft is used for real planes. But perhaps we do a poll on discord to get more opinions :)
Think some messages would only apply to quads as we do not account for wings yet (PIDs)

@ctzsnooze
Copy link
Member

Our local regulators refer to all the things we fly, whether wings, quads, multi-rotors, helis - as 'model aircraft'.

I agree with nerdCopter that the term aircraft is a very good generic term. It truly covers all of the 'craft' that we fly, and makes it clear that we are dealing with air-craft, not boats or cars, which are also 'craft'.

UAV is a good alternative generic term, as an acronym for Unmanned Aerial Vehicle. It has the advantage of brevity, and means 'unmanned', whereas aircraft does not. It has the disadvantage that it has military implications, in the sense that a 'vehicle' is a machine that is self-propelled and is designed to transport people or cargo, whereas most Betaflight users do not fly to transport people or cargo. So UAV to me strongly implies drones used either to transport merchandise or to drop bombs. And that's not what we are about, primarily.

Hence, of the two, I prefer aircraft over UAV.

My take on aeroplane or plane is that those terms are specific to a form of aircraft that has wings. The plane part refers to the planar aspect of the wing surface that generates lift. And that we can call these wings.

My preference therefore would be:

  • aircraft for generic statements that apply to all kinds of model aircraft, and for general use, in place of quad or quadcopter or UAV.
  • multirotor aircraft or multirotor for statements applicable only to quadcopters and the like
  • wing for winged aircraft.

@nerdCopter nerdCopter reopened this Nov 4, 2024
Co-authored-by: Mark Haslinghuis <[email protected]>
Copy link

sonarqubecloud bot commented Nov 4, 2024

@haslinghuis haslinghuis merged commit b06c516 into betaflight:master Nov 4, 2024
8 checks passed
@McGiverGim
Copy link
Member

I'm late to that PR, sorry...
This automatic replacement in one language, has invalidated the 18% of translations... A lot of work for translators.
Please take this into account before any other bulk change in the messages file

demvlad pushed a commit to demvlad/betaflight-configurator that referenced this pull request Nov 14, 2024
* substitue `craft` for `drone` and `quad`

* revert `biquad`

* possessive

* substitue `aircraft` with `craft`; skip languageVariables

* Update locales/en/messages.json

Co-authored-by: Mark Haslinghuis <[email protected]>

---------

Co-authored-by: Mark Haslinghuis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

5 participants