Skip to content

Adjust wording of sign-in text#10941

Merged
feerrenrut merged 8 commits into
nvaccess:masterfrom
codeofdusk:sign-in
Apr 30, 2020
Merged

Adjust wording of sign-in text#10941
feerrenrut merged 8 commits into
nvaccess:masterfrom
codeofdusk:sign-in

Conversation

@codeofdusk

@codeofdusk codeofdusk commented Apr 5, 2020

Copy link
Copy Markdown
Contributor

Link to issue number:

None.

Summary of the issue:

  • The text used to describe starting NVDA at logon differ in the welcome and settings dialogs.
  • Windows settings generally uses "sign-in" (with a hyphen), but the NVDA string reads "sign in".
  • It may be unclear to new users when settings apply (just for the current user or for everyone).

Description of how this pull request fixes the issue:

Updates the strings, modelling on Narrator's.

Testing performed:

None.

Known issues with pull request:

None.

Change log entry:

None.

@AppVeyorBot

Copy link
Copy Markdown

See test results for failed build of commit 0c6ea584cd

@codeofdusk

Copy link
Copy Markdown
Contributor Author

@michaelDCurran

Copy link
Copy Markdown
Member

I think the user guide will need to be updated also.

@codeofdusk

Copy link
Copy Markdown
Contributor Author

There is no mention of those settings at all in the user guide, so no updates needed.

@codeofdusk

Copy link
Copy Markdown
Contributor Author

Oh wait, it is just with broken formatting.

@codeofdusk

Copy link
Copy Markdown
Contributor Author

OK, user guide now fixed.

@michaelDCurran

Copy link
Copy Markdown
Member

I'd like to get your thoughts on this @Qchristensen .
I agree it is probably a good idea to use the term sign-in rather than logon as this is what Windows itself says these days. However, do you think changing this in NVDA and the user guide would have a major impact on our training material?

@codeofdusk

Copy link
Copy Markdown
Contributor Author

NVDA already says "sign in" (in general settings) and "log on" in other places. This PR just makes things more consistent.

@Qchristensen

Copy link
Copy Markdown
Member

I agree this is a useful change. Re the training material, I will update the Basic Training material. (I am intending to go through all the Basic Training material again soon. In the meantime, I will make an "addendum" to send to anyone who buys the audio or Braille versions for now).

It is also worth noting this change is in line with the Microsoft Style Guide, which advocates using "sign in" and "sign out": https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/s/sign-in-sign-out

Interesting pickup @codeofdusk about the Windows settings hyphenating Sign-in, given their own style guide advises against that.

Comment thread source/gui/settingsDialogs.py Outdated
# Windows (if checked, NVDA will start automatically after logging into Windows; if not, user must
# start NVDA by pressing the shortcut key (CTRL+Alt+N by default).
self.startAfterLogonCheckBox = wx.CheckBox(self, label=_("St&art NVDA after Windows sign in"))
self.startAfterLogonCheckBox = wx.CheckBox(self, label=_("St&art NVDA after Windows sign-in for me"))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We've just tried to shorten this. Instead, can you re-word this to:

`Start NVDA after I sign in"

This intentionally drops the word Windows. What else would this option be related to if not windows sign in. It can be clarified further in the user guide.

Comment thread source/gui/settingsDialogs.py Outdated
self.startOnLogonScreenCheckBox = wx.CheckBox(self, label=_("Use NVDA on the Windows logon screen (requires administrator privileges)"))
self.startOnLogonScreenCheckBox = wx.CheckBox(
self,
label=_("Start NVDA before Windows sign-in for &everyone (requires administrator privileges)")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I don't think "for everyone" is necessary. The sign in screen is inherently for everyone.

Suggested change
label=_("Start NVDA before Windows sign-in for &everyone (requires administrator privileges)")
label=_("Use NVDA at Windows sign-in (requires administrator privileges)")

I also would like to drop the "requires administrator privileges" part. It would be better to explain why it can't be done when trying. For now it's probably enough to explain in the user guide.

Comment thread source/gui/settingsDialogs.py Outdated
self.copySettingsButton = wx.Button(
self,
label=_(
"Use currently saved settings before sign-in and on secure screens (requires administrator privileges)"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The word "before" bothers me.

@feerrenrut feerrenrut added the bug label Apr 8, 2020
@AppVeyorBot

Copy link
Copy Markdown

@codeofdusk

Copy link
Copy Markdown
Contributor Author

@feerrenrut PR updated.

@AppVeyorBot

Copy link
Copy Markdown

Comment thread source/gui/settingsDialogs.py
Comment thread source/gui/settingsDialogs.py Outdated
self.copySettingsButton= wx.Button(self, label=_("Use currently saved settings on the logon and other secure screens (requires administrator privileges)"))
self.copySettingsButton = wx.Button(
self,
label=_(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I suspect that the translator comment for this line won't be picked up either. I have a feeling that checkpot doesn't find this because the parenthesis is not on the same line as the string.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you confirm this ends up in the pot file please? Given the checkPot step didn't complain about this line, it may not be available for translators.

@AppVeyorBot

Copy link
Copy Markdown

See test results for failed build of commit 895246985a

@codeofdusk

Copy link
Copy Markdown
Contributor Author

It seems that the string is picked up, but not the translator comment:

#. Translators: The label for a setting in general settings to
#. allow NVDA to come up in Windows login screen (useful if user
#. needs to enter passwords or if multiple user accounts are present
#. to allow user to choose the correct account).
#: gui\settingsDialogs.py:727
msgid "Start NVDA during sign-in (requires administrator privileges)"
msgstr ""

#: gui\settingsDialogs.py:741
msgid ""
"Use currently saved settings during sign-in and on secure screens (requires "
"administrator privileges)"
msgstr ""

Moving the parenthesis onto the same line as the string gives me a lint error.

@Adriani90

Copy link
Copy Markdown
Collaborator

@josephsl in case this could have to do with WX python but I am not really sure..

@feerrenrut

Copy link
Copy Markdown
Contributor

Moving the parenthesis onto the same line as the string gives me a lint error.

Which lint error?

Assuming it is "line too long", the following should resolve it, except you then get an error ET113 (flake8-tabs) option continuation-style=hanging does not allow use of alignment as indentation

label=(
	# Translators: blah
	_("Use currently saved settings on the logon and other secure screens"
	" (requires administrator privileges)")
)

For now just disable the "line too long" error. EG:

label=(
	# Translators: blah
	_("Use currently saved settings on the logon and other secure screens (requires administrator privileges)")  # noqa: E501 line too long

Really the translation system should handle one of the following, could you raise an issue please?

# Translators: blah
label=_(
		"Use currently saved settings on the logon and other secure screens"
		" (requires administrator privileges)"
	)
label=_( # Translators: blah
		"Use currently saved settings on the logon and other secure screens"
		" (requires administrator privileges)"
	)

@feerrenrut feerrenrut merged commit 5ee03c7 into nvaccess:master Apr 30, 2020
@nvaccessAuto nvaccessAuto added this to the 2020.1 milestone Apr 30, 2020
JulienCochuyt added a commit to accessolutions/nvda that referenced this pull request May 2, 2020
feerrenrut pushed a commit that referenced this pull request May 4, 2020
)

Fix-up of PR #10941

Finding the appropriate code style for a lengthy translatable string along with its required translators comment might not be obvious, even for some of our most seasoned contributors.
This problem has led to discussion about various attempts in PR #10941 and the raise of issue #11071.
PR #10941 finally resigned by disabling line length checks on a line of the patch.

However, as pointed out in a comment on #11071, a styling that complies both with line length and translators comment could finally be found.
feerrenrut pushed a commit that referenced this pull request Jun 3, 2020
PR #10941 brought to light flaws in checkPot regarding handling of long messages - fixed by PR #11093
In #11093 (comment) the creation of unit tests was discussed to help limit occurrence of future regressions.
Discussion: #11093 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants