Skip to content

Commit

Permalink
hotkey: Streamline some menu action labels
Browse files Browse the repository at this point in the history
Something that people occasionally miss is that several hotkey actions
double as menu items throughout the UI. Menu items have this particular
quality to them that requires them to be as succinct as possible to make
their meaning apparent without requiring excessive reading and parsing
from users/players. Furthermore, in a UI like ours with large elements
everywhere,  we want to avoid excessively wordy elements that can become
ten times as long when translated into foreign languages.

Commit c42bf11 replaced the Preferences
label with a unnecessarily longer version despite it being pretty
standard among most applications for it to be a single word (either
Preferences or Options or Settings). This commit reverts that.

Clear Chat and Errors (also from the aforementioned commit) is relabeled
Clear Chat rather than Clear Messages so it's clearer that it applies to
chat messages in particular and not anything else. On that note, the
fact that game diagnostics share real estate and infrastructure with
chat is really unfortunate but there's not much that can be done about
it at the moment. At least it is visually obvious that this is the case.
It's also rarely relevant (and most people won't think of entering
"error" into the hotkey filter before reporting the error somewhere).

View Chat Log is relabeled Chat Log since no other option deals with the
Chat *Log* in particular.

Scenario Objectives is relabeled Objectives because there really isn't
anything else that has objectives we can look at in the whole game.

Enter User Command is relabeled Enter Command so as to not sound
superfluous.

Additionally, the Quit to Main Menu action is relabeled just Quit to
Menu, which is closer to what the option actually does in MP games (quit
to lobby) without being inaccurate in either SP or MP (closes #2744).
  • Loading branch information
irydacea committed Feb 20, 2021
1 parent b231306 commit ef1fbed
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/hotkey/hotkey_command.cpp
Expand Up @@ -115,14 +115,14 @@ std::array<hotkey_command_temp, HOTKEY_NULL - 1> master_hotkey_list {{
{ HOTKEY_CREATE_UNIT, "createunit", N_("Create Unit (Debug!)"), false, scope_game, HKCAT_DEBUG, "" },
{ HOTKEY_CHANGE_SIDE, "changeside", N_("Change Side (Debug!)"), false, scope_game, HKCAT_DEBUG, "" },
{ HOTKEY_KILL_UNIT, "killunit", N_("Kill Unit (Debug!)"), false, scope_game, HKCAT_DEBUG, "" },
{ HOTKEY_PREFERENCES, "preferences", N_("Open Preferences Screen"), false, scope_game | scope_editor | scope_main, HKCAT_GENERAL, "" },
{ HOTKEY_OBJECTIVES, "objectives", N_("Scenario Objectives"), false, scope_game, HKCAT_MAP, "" },
{ HOTKEY_PREFERENCES, "preferences", N_("Preferences"), false, scope_game | scope_editor | scope_main, HKCAT_GENERAL, "" },
{ HOTKEY_OBJECTIVES, "objectives", N_("Objectives"), false, scope_game, HKCAT_MAP, "" },
{ HOTKEY_UNIT_LIST, "unitlist", N_("Unit List"), false, scope_game | scope_editor, HKCAT_UNITS, "" },
{ HOTKEY_STATISTICS, "statistics", N_("Statistics"), false, scope_game, HKCAT_GENERAL, "" },
{ HOTKEY_STOP_NETWORK, "stopnetwork", N_("Pause Network Game"), false, scope_game, HKCAT_GENERAL, "" },
{ HOTKEY_START_NETWORK, "startnetwork", N_("Continue Network Game"), false, scope_game, HKCAT_GENERAL, "" },
{ HOTKEY_SURRENDER, "surrender", N_("Surrender Game"), false, scope_game, HKCAT_SCENARIO, "" },
{ HOTKEY_QUIT_GAME, "quit", N_("Quit to Main Menu"), false, scope_game | scope_editor, HKCAT_GENERAL, "" },
{ HOTKEY_QUIT_GAME, "quit", N_("Quit to Menu"), false, scope_game | scope_editor, HKCAT_GENERAL, "" },
{ HOTKEY_LABEL_TEAM_TERRAIN, "labelteamterrain", N_("Set Team Label"), false, scope_game, HKCAT_MAP, "" },
{ HOTKEY_LABEL_TERRAIN, "labelterrain", N_("Set Label"), false, scope_game, HKCAT_MAP, "" },
{ HOTKEY_CLEAR_LABELS, "clearlabels", N_("Clear Labels"), false, scope_game, HKCAT_MAP, "" },
Expand Down Expand Up @@ -272,11 +272,11 @@ std::array<hotkey_command_temp, HOTKEY_NULL - 1> master_hotkey_list {{
{ HOTKEY_SPEAK_ALL, "speaktoall", N_("Speak to All"), false, scope_game, HKCAT_CHAT, "" },
{ HOTKEY_HELP, "help", N_("Help"), false, scope_game | scope_editor | scope_main, HKCAT_GENERAL, "" },
{ HOTKEY_HELP_ABOUT_SAVELOAD, "help-about-saveload", N_("Help about save-loading"), false, scope_game, HKCAT_GENERAL, N_("Hint: save-loading is unnecessary")},
{ HOTKEY_CHAT_LOG, "chatlog", N_("View Chat Log"), false, scope_game, HKCAT_CHAT, "" },
{ HOTKEY_USER_CMD, "command", N_("Enter User Command"), false, scope_game, HKCAT_CHAT, "" },
{ HOTKEY_CHAT_LOG, "chatlog", N_("Chat Log"), false, scope_game, HKCAT_CHAT, "" },
{ HOTKEY_USER_CMD, "command", N_("Enter Command"), false, scope_game, HKCAT_CHAT, "" },
{ HOTKEY_CUSTOM_CMD, "customcommand", N_("Custom Command"), false, scope_game, HKCAT_CHAT, "" },
{ HOTKEY_AI_FORMULA, "aiformula", N_("Run Formula"), false, scope_game, HKCAT_DEBUG, "" },
{ HOTKEY_CLEAR_MSG, "clearmessages", N_("Clear Chat and Errors"), false, scope_game, HKCAT_CHAT, "" },
{ HOTKEY_CLEAR_MSG, "clearmessages", N_("Clear Chat"), false, scope_game, HKCAT_CHAT, "" },

{ HOTKEY_LANGUAGE, "changelanguage", N_("Change Language"), false, scope_main, HKCAT_GENERAL, "" },
{ TITLE_SCREEN__RELOAD_WML, "title_screen__reload_wml", N_("Refresh WML"), true , scope_editor | scope_main, HKCAT_PLACEHOLDER, "" },
Expand Down

0 comments on commit ef1fbed

Please sign in to comment.